diff --git a/doc/meta.xml b/doc/meta.xml index 774ed2db750..ccbc812a862 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -150,6 +150,19 @@ hello-2.3 A program that produces a familiar, friendly greeting + + + changelog + + + + A link or a list of links to the location of Changelog for a package. + A link may use expansion to refer to the correct changelog version. + Example: + "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}" + + + license diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 0435362306b..63e6450860a 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -2643,9 +2643,7 @@ addEnvHooks "$hostOffset" myBashFunction At /var/lib/cntr the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec - subcommand. Note that cntr also needs to be executed - on the machine that is doing the build, which might not be the case when - remote builders are enabled. cntr is only supported + subcommand. cntr is only supported on Linux-based platforms. To use it first add cntr to your environment.systemPackages on NixOS or alternatively to the root user on non-NixOS systems. Then in the package @@ -2657,6 +2655,16 @@ addEnvHooks "$hostOffset" myBashFunction When a build failure happens there will be an instruction printed that shows how to attach with cntr to the build sandbox. + + Caution with remote builds + + This won't work with remote builds as the build environment is on + a different machine and can't be accessed by cntr. + Remote builds can be turned off by setting --option builders '' + for nix-build or --builders '' for + nix build. + + diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 94c7cfd7570..d17af9fcc14 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -88,6 +88,9 @@ rec { config = "aarch64-unknown-linux-musl"; }; + gnu64 = { config = "x86_64-unknown-linux-gnu"; }; + gnu32 = { config = "i686-unknown-linux-gnu"; }; + musl64 = { config = "x86_64-unknown-linux-musl"; }; musl32 = { config = "i686-unknown-linux-musl"; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d0f25ce2478..fdf5f7dedd5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1100,6 +1100,11 @@ github = "cwoac"; name = "Oliver Matthews"; }; + dalance = { + email = "dalance@gmail.com"; + github = "dalance"; + name = "Naoya Hatta"; + }; DamienCassou = { email = "damien@cassou.me"; github = "DamienCassou"; @@ -1164,6 +1169,11 @@ github = "davorb"; name = "Davor Babic"; }; + dawidsowa = { + email = "dawid_sowa@posteo.net"; + github = "dawidsowa"; + name = "Dawid Sowa"; + }; dbohdan = { email = "dbohdan@dbohdan.com"; github = "dbohdan"; @@ -1531,6 +1541,11 @@ github = "eqyiel"; name = "Ruben Maher"; }; + eraserhd = { + email = "jason.m.felice@gmail.com"; + github = "eraserhd"; + name = "Jason Felice"; + }; ericbmerritt = { email = "eric@afiniate.com"; github = "ericbmerritt"; @@ -2588,6 +2603,11 @@ github = "knl"; name = "Nikola Knežević"; }; + kolaente = { + email = "k@knt.li"; + github = "kolaente"; + name = "Konrad Langenberg"; + }; konimex = { email = "herdiansyah@netc.eu"; github = "konimex"; @@ -4111,6 +4131,11 @@ github = "retrry"; name = "Tadas Barzdžius"; }; + rexim = { + email = "reximkut@gmail.com"; + github = "rexim"; + name = "Alexey Kutepov"; + }; rht = { email = "rhtbot@protonmail.com"; github = "rht"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index c51c663a541..7074a650e06 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -5,6 +5,7 @@ basexx, dkjson fifo inspect +ldoc lgi lpeg_patterns lpty @@ -22,6 +23,7 @@ luaevent, luacheck luaffi,,http://luarocks.org/dev, luuid, +markdown, penlight, rapidjson, say, diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index aee74dae10c..e7ab61b1a9c 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -76,11 +76,7 @@ FOOTER=" function convert_pkg () { nix_pkg_name="$1" lua_pkg_name="$2" - server="" - if [ ! -z "$3" ]; then - server=" --server=$3" - fi - + server="${3:+--server=$3}" version="${4:-}" echo "looking at $lua_pkg_name (version $version) from server [$server]" >&2 @@ -101,15 +97,15 @@ echo "$HEADER" | tee "$TMP_FILE" # name,server,version while IFS=, read -r nix_pkg_name lua_pkg_name server version do - if [ "${nix_pkg_name:0:1}" == "#" ]; then - echo "Skipping comment ${nix_pkg_name}" >&2 - continue - fi - if [ -z "$lua_pkg_name" ]; then - echo "Using nix_name as lua_pkg_name" >&2 - lua_pkg_name="$nix_pkg_name" - fi - convert_pkg "$nix_pkg_name" "$lua_pkg_name" "$server" "$version" + if [ "${nix_pkg_name:0:1}" == "#" ]; then + echo "Skipping comment ${nix_pkg_name}" >&2 + continue + fi + if [ -z "$lua_pkg_name" ]; then + echo "Using nix_name as lua_pkg_name" >&2 + lua_pkg_name="$nix_pkg_name" + fi + convert_pkg "$nix_pkg_name" "$lua_pkg_name" "$server" "$version" done < "$CSV_FILE" # close the set diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index cd6bb9019b1..5198bedc138 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -339,6 +339,7 @@ rss2email = 312; cockroachdb = 313; zoneminder = 314; + paperless = 315; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -638,6 +639,7 @@ rss2email = 312; cockroachdb = 313; zoneminder = 314; + paperless = 315; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a07461022a3..dee850f47f2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -144,6 +144,7 @@ ./programs/xonsh.nix ./programs/xss-lock.nix ./programs/yabar.nix + ./programs/zmap.nix ./programs/zsh/oh-my-zsh.nix ./programs/zsh/zsh.nix ./programs/zsh/zsh-autoenv.nix @@ -435,6 +436,7 @@ ./services/misc/octoprint.nix ./services/misc/osrm.nix ./services/misc/packagekit.nix + ./services/misc/paperless.nix ./services/misc/parsoid.nix ./services/misc/phd.nix ./services/misc/plex.nix diff --git a/nixos/modules/programs/zmap.nix b/nixos/modules/programs/zmap.nix new file mode 100644 index 00000000000..2e27fce4d7c --- /dev/null +++ b/nixos/modules/programs/zmap.nix @@ -0,0 +1,18 @@ +{ pkgs, config, lib, ... }: + +with lib; + +let + cfg = config.programs.zmap; +in { + options.programs.zmap = { + enable = mkEnableOption "ZMap"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.zmap ]; + + environment.etc."zmap/blacklist.conf".source = "${pkgs.zmap}/etc/zmap/blacklist.conf"; + environment.etc."zmap/zmap.conf".source = "${pkgs.zmap}/etc/zmap.conf"; + }; +} diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix index a54ef2e6fca..60361d9960e 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -2,20 +2,30 @@ with lib; +let + cfg = config.security.rngd; +in { options = { - security.rngd.enable = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable the rng daemon, which adds entropy from - hardware sources of randomness to the kernel entropy pool when - available. - ''; + security.rngd = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable the rng daemon, which adds entropy from + hardware sources of randomness to the kernel entropy pool when + available. + ''; + }; + debug = mkOption { + type = types.bool; + default = false; + description = "Whether to enable debug output (-d)."; + }; }; }; - config = mkIf config.security.rngd.enable { + config = mkIf cfg.enable { services.udev.extraRules = '' KERNEL=="random", TAG+="systemd" SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" @@ -29,7 +39,10 @@ with lib; description = "Hardware RNG Entropy Gatherer Daemon"; - serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f"; + serviceConfig = { + ExecStart = "${pkgs.rng-tools}/sbin/rngd -f" + + optionalString cfg.debug " -d"; + }; }; }; } diff --git a/nixos/modules/services/logging/journalbeat.nix b/nixos/modules/services/logging/journalbeat.nix index 8186a3b02c3..89f53b1b245 100644 --- a/nixos/modules/services/logging/journalbeat.nix +++ b/nixos/modules/services/logging/journalbeat.nix @@ -5,11 +5,13 @@ with lib; let cfg = config.services.journalbeat; + lt6 = builtins.compareVersions cfg.package.version "6" < 0; + journalbeatYml = pkgs.writeText "journalbeat.yml" '' name: ${cfg.name} tags: ${builtins.toJSON cfg.tags} - journalbeat.cursor_state_file: ${cfg.stateDir}/cursor-state + ${optionalString lt6 "journalbeat.cursor_state_file: /var/lib/${cfg.stateDir}/cursor-state"} ${cfg.extraConfig} ''; @@ -22,6 +24,16 @@ in enable = mkEnableOption "journalbeat"; + package = mkOption { + type = types.package; + default = pkgs.journalbeat; + defaultText = "pkgs.journalbeat"; + example = literalExample "pkgs.journalbeat7"; + description = '' + The journalbeat package to use + ''; + }; + name = mkOption { type = types.str; default = "journalbeat"; @@ -36,13 +48,17 @@ in stateDir = mkOption { type = types.str; - default = "/var/lib/journalbeat"; - description = "The state directory. Journalbeat's own logs and other data are stored here."; + default = "journalbeat"; + description = '' + Directory below /var/lib/ to store journalbeat's + own logs and other data. This directory will be created automatically + using systemd's StateDirectory mechanism. + ''; }; extraConfig = mkOption { type = types.lines; - default = '' + default = optionalString lt6 '' journalbeat: seek_position: cursor cursor_seek_fallback: tail @@ -61,7 +77,16 @@ in config = mkIf cfg.enable { - systemd.services.journalbeat = with pkgs; { + assertions = [ + { + assertion = !hasPrefix "/" cfg.stateDir; + message = + "The option services.journalbeat.stateDir shouldn't be an absolute directory." + + " It should be a directory relative to /var/lib/."; + } + ]; + + systemd.services.journalbeat = { description = "Journalbeat log shipper"; wantedBy = [ "multi-user.target" ]; preStart = '' @@ -69,7 +94,13 @@ in mkdir -p ${cfg.stateDir}/logs ''; serviceConfig = { - ExecStart = "${pkgs.journalbeat}/bin/journalbeat -c ${journalbeatYml} -path.data ${cfg.stateDir}/data -path.logs ${cfg.stateDir}/logs"; + StateDirectory = cfg.stateDir; + ExecStart = '' + ${cfg.package}/bin/journalbeat \ + -c ${journalbeatYml} \ + -path.data /var/lib/${cfg.stateDir}/data \ + -path.logs /var/lib/${cfg.stateDir}/logs''; + Restart = "always"; }; }; }; diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix new file mode 100644 index 00000000000..4e6cd80e242 --- /dev/null +++ b/nixos/modules/services/misc/paperless.nix @@ -0,0 +1,185 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.services.paperless; + + defaultUser = "paperless"; + + manage = cfg.package.withConfig { + config = { + PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir; + PAPERLESS_INLINE_DOC = "true"; + PAPERLESS_DISABLE_LOGIN = "true"; + } // cfg.extraConfig; + inherit (cfg) dataDir ocrLanguages; + paperlessPkg = cfg.package; + }; +in +{ + options.services.paperless = { + enable = mkOption { + type = lib.types.bool; + default = false; + description = '' + Enable Paperless. + + When started, the Paperless database is automatically created if it doesn't + exist and updated if the Paperless package has changed. + Both tasks are achieved by running a Django migration. + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/paperless"; + description = "Directory to store the Paperless data."; + }; + + consumptionDir = mkOption { + type = types.str; + default = "${cfg.dataDir}/consume"; + defaultText = "\${dataDir}/consume"; + description = "Directory from which new documents are imported."; + }; + + consumptionDirIsPublic = mkOption { + type = types.bool; + default = false; + description = "Whether all users can write to the consumption dir."; + }; + + ocrLanguages = mkOption { + type = with types; nullOr (listOf string); + default = null; + description = '' + Languages available for OCR via Tesseract, specified as + ISO 639-2/T language codes. + If unset, defaults to all available languages. + ''; + example = [ "eng" "spa" "jpn" ]; + }; + + address = mkOption { + type = types.str; + default = "localhost"; + description = "Server listening address."; + }; + + port = mkOption { + type = types.int; + default = 28981; + description = "Server port to listen on."; + }; + + extraConfig = mkOption { + type = types.attrs; + default = {}; + description = '' + Extra paperless config options. + + The config values are evaluated as double-quoted Bash string literals. + + See paperless-src/paperless.conf.example for available options. + + To enable user authentication, set PAPERLESS_DISABLE_LOGIN = "false" + and run the shell command $dataDir/paperless-manage createsuperuser. + + To define secret options without storing them in /nix/store, use the following pattern: + PAPERLESS_PASSPHRASE = "$(< /etc/my_passphrase_file)" + ''; + example = literalExample '' + { + PAPERLESS_OCR_LANGUAGE = "deu"; + } + ''; + }; + + user = mkOption { + type = types.str; + default = defaultUser; + description = "User under which Paperless runs."; + }; + + package = mkOption { + type = types.package; + default = pkgs.paperless; + defaultText = "pkgs.paperless"; + description = "The Paperless package to use."; + }; + + manage = mkOption { + type = types.package; + readOnly = true; + default = manage; + description = '' + A script to manage the Paperless instance. + It wraps Django's manage.py and is also available at + $dataDir/manage-paperless + ''; + }; + }; + + config = mkIf cfg.enable { + + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - ${cfg.user} ${cfg.user} - -" + ] ++ (optional cfg.consumptionDirIsPublic + "d '${cfg.consumptionDir}' 777 ${cfg.user} ${cfg.user} - -" + # If the consumption dir is not created here, it's automatically created by + # 'manage' with the default permissions. + ); + + systemd.services.paperless-consumer = { + description = "Paperless document consumer"; + serviceConfig = { + User = cfg.user; + ExecStart = "${manage} document_consumer"; + Restart = "always"; + }; + after = [ "systemd-tmpfiles-setup.service" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + if [[ $(readlink ${cfg.dataDir}/paperless-manage) != ${manage} ]]; then + ln -sf ${manage} ${cfg.dataDir}/paperless-manage + fi + + ${manage.setupEnv} + # Auto-migrate on first run or if the package has changed + versionFile="$PAPERLESS_DBDIR/src-version" + if [[ $(cat "$versionFile" 2>/dev/null) != ${cfg.package} ]]; then + python $paperlessSrc/manage.py migrate + echo ${cfg.package} > "$versionFile" + fi + ''; + }; + + systemd.services.paperless-server = { + description = "Paperless document server"; + serviceConfig = { + User = cfg.user; + ExecStart = "${manage} runserver --noreload ${cfg.address}:${toString cfg.port}"; + Restart = "always"; + }; + # Bind to `paperless-consumer` so that the server never runs + # during migrations + bindsTo = [ "paperless-consumer.service" ]; + after = [ "paperless-consumer.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + + users = optionalAttrs (cfg.user == defaultUser) { + users = [{ + name = defaultUser; + group = defaultUser; + uid = config.ids.uids.paperless; + home = cfg.dataDir; + }]; + + groups = [{ + name = defaultUser; + gid = config.ids.gids.paperless; + }]; + }; + }; +} diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix index cb2f8c07edb..e9bedb704a4 100644 --- a/nixos/modules/services/monitoring/vnstat.nix +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -28,14 +28,29 @@ in { path = [ pkgs.coreutils ]; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - unitConfig.documentation = "man:vnstatd(1) man:vnstat(1) man:vnstat.conf(5)"; + documentation = [ + "man:vnstatd(1)" + "man:vnstat(1)" + "man:vnstat.conf(5)" + ]; preStart = "chmod 755 /var/lib/vnstat"; serviceConfig = { ExecStart = "${pkgs.vnstat}/bin/vnstatd -n"; ExecReload = "${pkgs.procps}/bin/kill -HUP $MAINPID"; - ProtectHome = true; + + # Hardening (from upstream example service) + ProtectSystem = "strict"; + StateDirectory = "vnstat"; PrivateDevices = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelModules = true; PrivateTmp = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictNamespaces = true; + User = "vnstatd"; }; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 3ab4f26399f..afa0cebbc52 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -189,6 +189,11 @@ in config = mkIf cfg.enable { assertions = [ + { assertion = xcfg.enable; + message = '' + LightDM requires services.xserver.enable to be true + ''; + } { assertion = cfg.autoLogin.enable -> cfg.autoLogin.user != null; message = '' LightDM auto-login requires services.xserver.displayManager.lightdm.autoLogin.user to be set diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 05830e325d5..d1ed345ac57 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -195,6 +195,11 @@ in config = mkIf cfg.enable { assertions = [ + { assertion = xcfg.enable; + message = '' + SDDM requires services.xserver.enable to be true + ''; + } { assertion = cfg.autoLogin.enable -> cfg.autoLogin.user != null; message = '' SDDM auto-login requires services.xserver.displayManager.sddm.autoLogin.user to be set @@ -264,8 +269,8 @@ in }; environment.etc."sddm.conf".source = cfgFile; - environment.pathsToLink = [ - "/share/sddm" + environment.pathsToLink = [ + "/share/sddm" ]; users.groups.sddm.gid = config.ids.gids.sddm; diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 6f737018174..41bcb909fb5 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -104,7 +104,7 @@ in "VBoxNetNAT" "VBoxSDL" "VBoxVolInfo" - "VirtualBox" + "VirtualBoxVM" ])); users.groups.vboxusers.gid = config.ids.gids.vboxusers; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 95654b67960..d495b2fa633 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -189,6 +189,7 @@ in pam-oath-login = handleTest ./pam-oath-login.nix {}; pam-u2f = handleTest ./pam-u2f.nix {}; pantheon = handleTest ./pantheon.nix {}; + paperless = handleTest ./paperless.nix {}; peerflix = handleTest ./peerflix.nix {}; pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 3b3fbd73dd5..95371ef4443 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -12,6 +12,11 @@ with pkgs.lib; let esUrl = "http://localhost:9200"; + totalHits = message : + "curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' " + + ''-d '{\"query\" : { \"match\" : { \"message\" : \"${message}\"}}}' '' + + "| jq .hits.total"; + mkElkTest = name : elk : let elasticsearchGe7 = builtins.compareVersions elk.elasticsearch.version "7" >= 0; in makeTest { @@ -21,7 +26,7 @@ let }; nodes = { one = - { pkgs, ... }: { + { pkgs, lib, ... }: { # Not giving the machine at least 2060MB results in elasticsearch failing with the following error: # # OpenJDK 64-Bit Server VM warning: @@ -40,6 +45,26 @@ let environment.systemPackages = [ pkgs.jq ]; services = { + + journalbeat = let lt6 = builtins.compareVersions + elk.journalbeat.version "6" < 0; in { + enable = true; + package = elk.journalbeat; + extraConfig = mkOptionDefault ('' + logging: + to_syslog: true + level: warning + metrics.enabled: false + output.elasticsearch: + hosts: [ "127.0.0.1:9200" ] + ${optionalString lt6 "template.enabled: false"} + '' + optionalString (!lt6) '' + journalbeat.inputs: + - paths: [] + seek: cursor + ''); + }; + logstash = { enable = true; package = elk.logstash; @@ -107,14 +132,19 @@ let testScript = '' startAll; + # Wait until elasticsearch is listening for connections. $one->waitForUnit("elasticsearch.service"); + $one->waitForOpenPort(9200); # Continue as long as the status is not "red". The status is probably # "yellow" instead of "green" because we are using a single elasticsearch # node which elasticsearch considers risky. # - # TODO: extend this test with multiple elasticsearch nodes and see if the status turns "green". - $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_cluster/health' | jq .status | grep -v red"); + # TODO: extend this test with multiple elasticsearch nodes + # and see if the status turns "green". + $one->waitUntilSucceeds( + "curl --silent --show-error '${esUrl}/_cluster/health' " . + "| jq .status | grep -v red"); # Perform some simple logstash tests. $one->waitForUnit("logstash.service"); @@ -123,16 +153,28 @@ let # See if kibana is healthy. $one->waitForUnit("kibana.service"); - $one->waitUntilSucceeds("curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green"); + $one->waitUntilSucceeds( + "curl --silent --show-error 'http://localhost:5601/api/status' " . + "| jq .status.overall.state | grep green"); # See if logstash messages arive in elasticsearch. - $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); - $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); + $one->waitUntilSucceeds("${totalHits "flowers"} | grep -v 0"); + $one->waitUntilSucceeds("${totalHits "dragons"} | grep 0"); + + # Test if a message logged to the journal + # is ingested by elasticsearch via journalbeat. + $one->waitForUnit("journalbeat.service"); + $one->execute("echo 'Supercalifragilisticexpialidocious' | systemd-cat"); + $one->waitUntilSucceeds( + "${totalHits "Supercalifragilisticexpialidocious"} | grep -v 0"); + '' + optionalString (!elasticsearchGe7) '' # Test elasticsearch-curator. $one->systemctl("stop logstash"); $one->systemctl("start elasticsearch-curator"); - $one->waitUntilSucceeds("! curl --silent --show-error '${esUrl}/_cat/indices' | grep logstash | grep -q ^$1"); + $one->waitUntilSucceeds( + "! curl --silent --show-error '${esUrl}/_cat/indices' " . + "| grep logstash | grep -q ^$1"); ''; }; in mapAttrs mkElkTest { @@ -140,6 +182,7 @@ in mapAttrs mkElkTest { elasticsearch = pkgs.elasticsearch5; logstash = pkgs.logstash5; kibana = pkgs.kibana5; + journalbeat = pkgs.journalbeat5; }; "ELK-6" = if enableUnfree @@ -147,11 +190,13 @@ in mapAttrs mkElkTest { elasticsearch = pkgs.elasticsearch6; logstash = pkgs.logstash6; kibana = pkgs.kibana6; + journalbeat = pkgs.journalbeat6; } else { elasticsearch = pkgs.elasticsearch6-oss; logstash = pkgs.logstash6-oss; kibana = pkgs.kibana6-oss; + journalbeat = pkgs.journalbeat6; }; "ELK-7" = if enableUnfree @@ -159,10 +204,12 @@ in mapAttrs mkElkTest { elasticsearch = pkgs.elasticsearch7; logstash = pkgs.logstash7; kibana = pkgs.kibana7; + journalbeat = pkgs.journalbeat7; } else { elasticsearch = pkgs.elasticsearch7-oss; logstash = pkgs.logstash7-oss; kibana = pkgs.kibana7-oss; + journalbeat = pkgs.journalbeat7; }; } diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index d43efc3687a..cccf8c7cd44 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -9,7 +9,7 @@ with pkgs.lib; { mysql = makeTest { name = "gitea-mysql"; - meta.maintainers = [ maintainers.aanderse ]; + meta.maintainers = with maintainers; [ aanderse kolaente ]; machine = { config, pkgs, ... }: diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix new file mode 100644 index 00000000000..860ad0a6218 --- /dev/null +++ b/nixos/tests/paperless.nix @@ -0,0 +1,29 @@ +import ./make-test.nix ({ lib, ... } : { + name = "paperless"; + meta = with lib.maintainers; { + maintainers = [ earvstedt ]; + }; + + machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ imagemagick jq ]; + services.paperless = { + enable = true; + ocrLanguages = [ "eng" ]; + }; + }; + + testScript = '' + $machine->waitForUnit("paperless-consumer.service"); + # Create test doc + $machine->succeed('convert -size 400x40 xc:white -font "DejaVu-Sans" -pointsize 20 -fill black \ + -annotate +5+20 "hello world 16-10-2005" /var/lib/paperless/consume/doc.png'); + + $machine->waitForUnit("paperless-server.service"); + # Wait until server accepts connections + $machine->waitUntilSucceeds("curl -s localhost:28981"); + # Wait until document is consumed + $machine->waitUntilSucceeds('(($(curl -s localhost:28981/api/documents/ | jq .count) == 1))'); + $machine->succeed("curl -s localhost:28981/api/documents/ | jq '.results | .[0] | .created'") + =~ /2005-10-16/ or die; + ''; +}) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 84d5f3e1530..844ce47d743 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -2,9 +2,26 @@ config ? {}, pkgs ? import ../.. { inherit system config; }, debug ? false, - enableUnfree ? false + enableUnfree ? false, + # Nested KVM virtualization (https://www.linux-kvm.org/page/Nested_Guests) + # requires a modprobe flag on the build machine: (kvm-amd for AMD CPUs) + # boot.extraModprobeConfig = "options kvm-intel nested=Y"; + # Without this VirtualBox will use SW virtualization and will only be able + # to run 32-bit guests. + useKvmNestedVirt ? false, + # Whether to run 64-bit guests instead of 32-bit. Requires nested KVM. + use64bitGuest ? false, + # Whether to enable the virtual UART in VirtualBox guests, allowing to see + # the guest console. There is currently a bug in VirtualBox where this will + # cause a crash if running with SW virtualization + # (https://www.virtualbox.org/ticket/18632). If you need to debug the tests + # then enable this and nested KVM to work around the crash (see above). + enableVBoxUART ? false }: +assert use64bitGuest -> useKvmNestedVirt; +assert enableVBoxUART -> useKvmNestedVirt; # VirtualBox bug, see above + with import ../lib/testing.nix { inherit system pkgs; }; with pkgs.lib; @@ -94,7 +111,7 @@ let testVM = vmName: vmScript: let cfg = (import ../lib/eval-config.nix { - system = "i686-linux"; + system = if use64bitGuest then "x86_64-linux" else "i686-linux"; modules = [ ../modules/profiles/minimal.nix (testVMConfig vmName vmScript) @@ -141,13 +158,15 @@ let sharePath = "/home/alice/vboxshare-${name}"; createFlags = mkFlags [ - "--ostype Linux26" + "--ostype ${if use64bitGuest then "Linux26_64" else "Linux26"}" "--register" ]; - vmFlags = mkFlags ([ - "--uart1 0x3F8 4" - "--uartmode1 client /run/virtualbox-log-${name}.sock" + vmFlags = mkFlags ( + (optionals enableVBoxUART [ + "--uart1 0x3F8 4" + "--uartmode1 client /run/virtualbox-log-${name}.sock" + ]) ++ [ "--memory 768" "--audio none" ] ++ (attrs.vmFlags or [])); @@ -180,7 +199,7 @@ let ]; in { machine = { - systemd.sockets."vboxtestlog-${name}" = { + systemd.sockets."vboxtestlog-${name}" = mkIf enableVBoxUART { description = "VirtualBox Test Machine Log Socket For ${name}"; wantedBy = [ "sockets.target" ]; before = [ "multi-user.target" ]; @@ -188,7 +207,7 @@ let socketConfig.Accept = true; }; - systemd.services."vboxtestlog-${name}@" = { + systemd.services."vboxtestlog-${name}@" = mkIf enableVBoxUART { description = "VirtualBox Test Machine Log For ${name}"; serviceConfig.StandardInput = "socket"; serviceConfig.StandardOutput = "syslog"; @@ -346,6 +365,8 @@ let vmConfigs = mapAttrsToList mkVMConf vms; in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs; virtualisation.memorySize = 2048; + virtualisation.qemu.options = + if useKvmNestedVirt then ["-cpu" "kvm64,vmx=on"] else []; virtualisation.virtualbox.host.enable = true; services.xserver.displayManager.auto.user = "alice"; users.users.alice.extraGroups = let @@ -412,9 +433,14 @@ in mapAttrs (mkVBoxTest false vboxVMs) { ); $machine->sleep(5); $machine->screenshot("gui_manager_started"); + # Home to select Tools, down to move to the VM, enter to start it. + $machine->sendKeys("home"); + $machine->sendKeys("down"); $machine->sendKeys("ret"); $machine->screenshot("gui_manager_sent_startup"); waitForStartup_simple (sub { + $machine->sendKeys("home"); + $machine->sendKeys("down"); $machine->sendKeys("ret"); }); $machine->screenshot("gui_started"); diff --git a/pkgs/applications/audio/freewheeling/am_path_sdl.patch b/pkgs/applications/audio/freewheeling/am_path_sdl.patch deleted file mode 100644 index 2bc3b4f45ac..00000000000 --- a/pkgs/applications/audio/freewheeling/am_path_sdl.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- code-r100/configure.ac 2014-09-25 23:44:41.059174904 +0200 -+++ code-r100.new/configure.ac 2014-09-26 01:37:18.507017390 +0200 -@@ -44,6 +44,8 @@ - [AC_MSG_ERROR(CONFIG: You need libxml2-dev installed. - http://www.xmlsoft.org/)]) - -+PKG_CHECK_MODULES([libxml], [libxml-2.0]) -+ - AC_CHECK_LIB([m], [sqrt], , [AC_MSG_ERROR(CORE: You need libm installed)]) - AC_CHECK_LIB([pthread], [pthread_self], , [AC_MSG_ERROR(CORE: You need libpthread installed)]) - -@@ -79,12 +81,12 @@ - echo "--- Enabling USB LCD display --"; - fi - --#SDL_VERSION=1.2.4 --#AM_PATH_SDL($SDL_VERSION, --# :, --# AC_MSG_ERROR([VIDEO: *** SDL version $SDL_VERSION not found! --# http://www.libsdl.org/]) --#) -+SDL_VERSION=1.2.4 -+AM_PATH_SDL($SDL_VERSION, -+ :, -+ AC_MSG_ERROR([VIDEO: *** SDL version $SDL_VERSION not found! -+ http://www.libsdl.org/]) -+) - - AC_CHECK_LIB([vorbis], [main], , - [AC_MSG_ERROR(AUDIO: You need libvorbis-dev installed. -@@ -95,6 +97,9 @@ - AC_CHECK_LIB([vorbisenc], [main], , - [AC_MSG_ERROR(AUDIO: You need libvorbis-dev installed. - http://www.xiph.org/ogg/vorbis/)]) -+AC_CHECK_LIB([ogg], [main], , -+ [AC_MSG_ERROR(AUDIO: You need libogg-dev installed. -+ http://www.xiph.org/ogg/)]) - - AC_CHECK_LIB([sndfile], [main], , - [AC_MSG_ERROR(AUDIO: you need libsndfile installed. diff --git a/pkgs/applications/audio/freewheeling/xml.patch b/pkgs/applications/audio/freewheeling/xml.patch deleted file mode 100644 index fd9d4fb39fe..00000000000 --- a/pkgs/applications/audio/freewheeling/xml.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- code-r100/src/Makefile.am 2014-09-25 23:44:41.043174832 +0200 -+++ code-r100.new/src/Makefile.am 2014-09-26 01:21:03.750015888 +0200 -@@ -24,7 +24,8 @@ - - fweelindir = $(datadir)/fweelin - --FWEELIN_CFLAGS = -I. -g -Wall -Wno-write-strings -Wno-non-virtual-dtor -D_REENTRANT -DPTHREADS -DNDEBUG -DVERSION=\"$(VERSION)\" -DFWEELIN_DATADIR=\"$(fweelindir)\" -DADDON_DIR=\"/usr/local/lib/jack\" -I/usr/include/freetype2 -I/usr/include/libxml2 -funroll-loops -finline-functions -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing -falign-loops=2 -falign-jumps=2 -falign-functions=2 -O9 -+XML_CFLAGS = `xml2-config --cflags` -+FWEELIN_CFLAGS = -I. -g -Wall -Wno-write-strings -Wno-non-virtual-dtor -D_REENTRANT -DPTHREADS -DNDEBUG -DVERSION=\"$(VERSION)\" -DFWEELIN_DATADIR=\"$(fweelindir)\" -DADDON_DIR=\"/usr/local/lib/jack\" -I/usr/include/freetype2 $(XML_CFLAGS) -funroll-loops -finline-functions -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing -falign-loops=2 -falign-jumps=2 -falign-functions=2 -O9 - - AM_CFLAGS = $(CFLAGS) $(FWEELIN_CFLAGS) --AM_CXXFLAGS = $(CFLAGS) $(CXXFLAGS) $(FWEELIN_CFLAGS) -+AM_CXXFLAGS = $(CFLAGS) $(CXXFLAGS) $(FWEELIN_CFLAGS) ${libxml2_CFLAGS} diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index d190fa1b729..41fc148e32d 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.37.0"; + version = "3.37.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1fy802jx3817ldrm3g5inrfjbi7s8xcx96pnglbq54nvp41lzyh5"; + sha256 = "0qcg456k7av0anymmmnlcn0v4642gbgk0nhic6w9bg9v5m0nj9ll"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 714daa3649c..8af0a647561 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -12,11 +12,11 @@ let build = "183.5452501"; sha256Hash = "0i8wz9v6nxzr27a07cv2330i84v94pcl13gjwvpglp55hyzd8axd"; }; - betaVersion = stableVersion; + betaVersion = latestVersion; latestVersion = { # canary & dev - version = "3.5.0.12"; # "Android Studio 3.5 Canary 13" - build = "191.5487692"; - sha256Hash = "0iwd2qa551rs9b0w4rs7wmzdbh3r4j76xvs815l6i5pilk0s47gz"; + version = "3.5.0.13"; # "Android Studio 3.5 Beta 1" + build = "191.5529924"; + sha256Hash = "0i710n2wr0a8lvxf1mg6a5pmdh1l72wa0hwyricyixi0mylwwc6l"; }; in rec { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index 8f75eda7ef7..e7f200a4c07 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "howl-${version}"; - version = "0.5.3"; + version = "0.6"; # Use the release tarball containing pre-downloaded dependencies sources src = fetchurl { - url = "https://github.com/howl-editor/howl/releases/download/0.5.3/howl-0.5.3.tgz"; - sha256 = "0gnc8vr5h8mwapbcqc1zr9la62rb633awyqgy8q7pwjpiy85a03v"; + url = "https://github.com/howl-editor/howl/releases/download/${version}/howl-${version}.tgz"; + sha256 = "1qc58l3rkr37cj6vhf8c7bnwbz93nscyraz7jxqwjq6k4gj0cjw3"; }; sourceRoot = "./howl-${version}/src"; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index ba3958a43d1..335a62bb170 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0w6hasb8vcbxdqmb0pngwr2jg0w14prqb4v7blraa5jf1xyyiayd"; /* updated by script */ + sha256 = "0157ccc94pwk4a8r1pvvjzd0g4liqqns6b0cmimfjhxsh6bnarww"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.1.1"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1klmg8wgj3shp4s0n2nn7n39zsk1mch6g9ifhwn5cgywpbzgam4p"; /* updated by script */ + sha256 = "0441y92b3xqf7xh8k4vc0m7dfm91psnrwlv3mjzbsv09jrk1kbq7"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index ee7a7951785..a53c499fe5c 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { name = "neovim-unwrapped-${version}"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "07ncvgp6xfhiwc6hd7qf7zk28n3yj47p26qj1ji29vqkwnk28y3s"; + sha256 = "113lrr9gwimvvzlkwlishm4cjqcf30xq9jfxn7vh41ckgnbiwf3w"; }; patches = [ diff --git a/pkgs/applications/editors/rstudio/fix-cmake.patch b/pkgs/applications/editors/rstudio/fix-cmake.patch deleted file mode 100644 index 3effc0eaa32..00000000000 --- a/pkgs/applications/editors/rstudio/fix-cmake.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt -index f5701bf735..27af4148ff 100644 ---- a/src/cpp/desktop/CMakeLists.txt -+++ b/src/cpp/desktop/CMakeLists.txt -@@ -112,6 +112,7 @@ find_package(Qt5WebEngine REQUIRED) - find_package(Qt5WebEngineWidgets REQUIRED) - find_package(Qt5PrintSupport REQUIRED) - find_package(Qt5Quick REQUIRED) -+find_package(Qt5QuickWidgets REQUIRED) - find_package(Qt5Positioning REQUIRED) - find_package(Qt5Sensors REQUIRED) - find_package(Qt5Svg REQUIRED) --- -2.17.1 - diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index cc2b955fcc2..cf2376b3733 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -8,6 +8,7 @@ , qtsvg , qtwebengine +, akonadi-contacts , kcalcore , kconfigwidgets , kcoreaddons @@ -50,14 +51,14 @@ }: mkDerivation rec { - name = "digikam-${version}"; - version = "6.0.0"; + pname = "digikam"; + version = "6.1.0"; src = fetchFromGitHub { owner = "KDE"; repo = "digikam"; rev = "v${version}"; - sha256 = "1ifvrn0bm7fp07d059rl4dy146qzdxafl36ipxg1fg00dkv95hh4"; + sha256 = "0h0jqfgpanhxfi3r7cgip58ppypqx79z6c5jj7i7f19hp2zziip8"; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; @@ -88,6 +89,7 @@ mkDerivation rec { qtsvg qtwebengine + akonadi-contacts kcalcore kconfigwidgets kcoreaddons @@ -112,6 +114,7 @@ mkDerivation rec { preFixup = '' gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) + gappsWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname}) substituteInPlace $out/bin/digitaglinktree \ --replace "/usr/bin/perl" "${perl}/bin/perl" \ --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index ec529519159..11c1e9ada93 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, plugins ? null}: +{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: let allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation" && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); @@ -17,6 +17,7 @@ in symlinkJoin { for each in gimp-${versionBranch} gimp-console-${versionBranch}; do wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ + --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done set +x diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 89828ff45d7..3fd4521d7cd 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -12,14 +12,14 @@ let }; in stdenv.mkDerivation rec { - version = "1.2"; + version = "1.4"; name = "renderdoc-${version}"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "0s1q5d58x18yz3nf94pv5i1qd2hc0a4gdj4qkpcn8s6ms2x05pz4"; + sha256 = "1iann73r4yzkwnm13h4zqipqrp5i5cnkv27yyap0axz6h3npw94r"; }; buildInputs = [ diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index a598ec1caca..622e7169fae 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,9 +1,10 @@ -{ config, lib, stdenv, fetchurl, CoreAudio +{ config, lib, stdenv, fetchurl, pkgconfig, CoreAudio , enableAlsa ? true, alsaLib ? null , enableLibao ? true, libao ? null , enableLame ? config.sox.enableLame or false, lame ? null , enableLibmad ? true, libmad ? null , enableLibogg ? true, libogg ? null, libvorbis ? null +, enableOpusfile ? true, opusfile ? null , enableFLAC ? true, flac ? null , enablePNG ? true, libpng ? null , enableLibsndfile ? true, libsndfile ? null @@ -22,12 +23,16 @@ stdenv.mkDerivation rec { sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl"; }; + # configure.ac uses pkg-config only to locate libopusfile + nativeBuildInputs = optional enableOpusfile pkgconfig; + buildInputs = optional (enableAlsa && stdenv.isLinux) alsaLib ++ optional enableLibao libao ++ optional enableLame lame ++ optional enableLibmad libmad ++ optionals enableLibogg [ libogg libvorbis ] ++ + optional enableOpusfile opusfile ++ optional enableFLAC flac ++ optional enablePNG libpng ++ optional enableLibsndfile libsndfile ++ diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix new file mode 100644 index 00000000000..4b2bcde04a4 --- /dev/null +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -0,0 +1,21 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "gallery_dl"; + version = "1.8.3"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "671ee6ff7baa3d63393d9856686313b4e0146f875dd937326942dd2fff605a72"; + }; + + doCheck = false; + propagatedBuildInputs = with python3Packages; [ requests ]; + + meta = { + description = "Command-line program to download image-galleries and -collections from several image hosting sites"; + homepage = https://github.com/mikf/gallery-dl; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ dawidsowa ]; + }; +} diff --git a/pkgs/applications/misc/gpsbabel/clang-4.patch b/pkgs/applications/misc/gpsbabel/clang-4.patch deleted file mode 100644 index 6bd19ae6044..00000000000 --- a/pkgs/applications/misc/gpsbabel/clang-4.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/bushnell.cc b/bushnell.cc -index 8fa844d..40707c4 100644 ---- a/bushnell.cc -+++ b/bushnell.cc -@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name) - name = "Waypoint"; - } - -- for (t = bushnell_icons; t->icon > 0; t++) { -+ for (t = bushnell_icons; t->icon != 0; t++) { - if (0 == name.compare(t->icon, Qt::CaseInsensitive)) { - return t->symbol; - } -@@ -147,7 +147,7 @@ static const char* - bushnell_get_name_from_symbol(signed int s) - { - icon_mapping_t* t; -- for (t = bushnell_icons; t->icon > 0; t++) { -+ for (t = bushnell_icons; t->icon != 0; t++) { - if (s == t->symbol) { - return t->icon; - } diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 0911fbace44..aa0ed5f6463 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec { name = "gpsbabel-${version}"; - version = "1.5.4"; + version = "1.6.0"; src = fetchFromGitHub { owner = "gpsbabel"; repo = "gpsbabel"; rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0v6wpp14zkfbarmksf9dn3wmpj1araxd7xi5xp7gpl7kafb9aiwi"; + sha256 = "0q17jhmaf7z5lld2ff7h6jb3v1yz8hbwd2rmaq2dsamc53dls8iw"; }; patches = [ - ./clang-4.patch (fetchpatch { url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip; sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr"; diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index c0a39d2d91d..63a8af99f7c 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { It is fully customizable. ''; homepage = https://www.gnu.org/software/hello/manual/; + changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"; license = licenses.gpl3Plus; maintainers = [ maintainers.eelco ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 2b6e58a6ab3..46f50e2fd99 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -5,7 +5,9 @@ let - version = "1.3.1-ff75f26"; + data = builtins.fromJSON (builtins.readFile ./revision.json); + + inherit (data) version url sha256; rpath = stdenv.lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft @@ -17,10 +19,7 @@ in stdenv.mkDerivation { name = "hubstaff-${version}"; - src = fetchurl { - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh"; - sha256 = "0jm5l34r6lkfkg8vsdfqbr0axngxznhagwcl9y184lnyji91fmdl"; - }; + src = fetchurl { inherit sha256 url; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json new file mode 100644 index 00000000000..85126a496c6 --- /dev/null +++ b/pkgs/applications/misc/hubstaff/revision.json @@ -0,0 +1,5 @@ +{ + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.5-c5b459ea/Hubstaff-1.4.5-c5b459ea.sh", + "version": "1.4.5-c5b459ea", + "sha256": "180qglbj175wln0kh8d5czhjvy7z503zxn4w6522hkz4ddz201nz" +} diff --git a/pkgs/applications/misc/hubstaff/update.sh b/pkgs/applications/misc/hubstaff/update.sh new file mode 100755 index 00000000000..c4c1caf55db --- /dev/null +++ b/pkgs/applications/misc/hubstaff/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-git curl + +SCRIPT_DIR=$(dirname "$(readlink -f "$BASH_SOURCE")") + +installation_script_url=$(curl --fail --head --location --silent --output /dev/null --write-out %{url_effective} https://app.hubstaff.com/download/linux) + +version=$(echo "$installation_script_url" | sed -r 's/^https:\/\/hubstaff\-production\.s3\.amazonaws\.com\/downloads\/HubstaffClient\/Builds\/Release\/([^\/]+)\/Hubstaff.+$/\1/') + +sha256=$(nix-prefetch-url "$installation_script_url") + +cat < $SCRIPT_DIR/revision.json +{ + "url": "$installation_script_url", + "version": "$version", + "sha256": "$sha256" +} +EOT diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix deleted file mode 100644 index 3cd52af6d32..00000000000 --- a/pkgs/applications/misc/pstree/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "pstree-2.39"; - - src = fetchurl { - urls = [ - "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" - "https://distfiles.macports.org/pstree/${name}.tar.gz" - ]; - sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw"; - }; - - unpackPhase = "unpackFile \$src; sourceRoot=."; - - buildPhase = "pwd; $CC -o pstree pstree.c"; - installPhase = "mkdir -p \$out/bin; cp pstree \$out/bin"; - - meta = { - description = "Show the set of running processes as a tree"; - license = "GPL"; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix index 6cb78e6d6bd..6d31b49743a 100644 --- a/pkgs/applications/misc/taskell/default.nix +++ b/pkgs/applications/misc/taskell/default.nix @@ -1,8 +1,8 @@ { haskell, lib, haskellPackages, fetchFromGitHub }: let - version = "1.3.2"; - sha256 = "0cyysvkl8m1ldlprmw9mpvch3r244nl25yv74dwcykga3g5mw4aa"; + version = "1.4.2"; + sha256 = "1kpzjsbx2xbp43hd62nq03jcknp0dqvdlxjc9gc3fagaqfbfzny2"; in (haskellPackages.mkDerivation { pname = "taskell"; @@ -35,10 +35,12 @@ in (haskellPackages.mkDerivation { # containers # directory file-embed + fold-debounce http-conduit http-client http-types lens + raw-strings-qq # mtl # template-haskell # text diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 8cdd6a030be..2181292131d 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 = "67.0b17"; + version = "67.0b18"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ach/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ach/firefox-67.0b18.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "d972df8e4c40b1d14c0b72fed8c9d70bf426f753ee83cefb7eae6178c0e0c381eb09e427165f70ad2193af8570f5a1f8388e6934708703e4c3fc568b5a3d067f"; + sha512 = "0769bc01b1178b1f86d87f6486a0c1131146675ec24d30d8f17ea907302e773addfa0f6e8ea97d753cddc82a9f301ae54d517e0a2327cfa2afc133f93cbe85b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/af/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/af/firefox-67.0b18.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "5ad9a1a9b11159609f2825ffab6d399e9bfa8e357ddc30080e77016392d8c48af6745d82d20acfa4405ab234b0b1a031ca3f044583089f8c4b128cc9ad5c2403"; + sha512 = "7fddbc2f09bd49d3617f2226afba0dcb67fc0b15f7e9263940d54fb0c7421917e9a2891da698cb0be9f76402873592975813aec10b7d23c757e7f6d49c495d4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/an/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/an/firefox-67.0b18.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "48ce5fa046f0a51c117f4b2ac10918daf64f5dc94ab1d920f8e3347b026be9a8ff3d995f4a5483ebce6bd39428de1447f4688794fd742d909f92a6fc1e6bbeac"; + sha512 = "07e7ce1a59d563dc001672b14d0e0b47f500bba00616482c4b205fe354bd5e7adf3129f33bc8a158a0e6d806c697b7b62828b5bb53c3c16375c123ae0af91944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ar/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ar/firefox-67.0b18.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "724762f7601f9767ecf778c2a59e9d3aa752b6b03b97efbc04db423702e101629f7fc131d499e363e47a831003be4d068ea01712584fd0f698e06d28eebb71b8"; + sha512 = "8f167e9b15b365941c0b07e0ebc2764a32ca5b593801c0c63bcb29d8c62a917d6e8574d3a8749920de4d522ed9a9f8bf248700711008e753d6fe24e12bf4910d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/as/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/as/firefox-67.0b18.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "5326404fa9ddda83b241a9ef58c53537c099202d8a928037e1f6e332982ef8b94c50d6fdb0f447ceeb3e332f0e45172948af35ef91332783ccbd107e0a6e6d72"; + sha512 = "3294af7acdcc50fab8632b957ef98536912b2e13a97427e3f3172871873ae992868ede0fb99d795ec4f989058639b0f848998c49bec12668fd187cc364b532b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ast/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ast/firefox-67.0b18.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "bec65c571d211fdfe474bd1e9e18a9b77ba25ee3de940cbc2f605fec1942f8db864b889725bc08f71ebceafc066a6e3c652e81e2d2d79ca53714b0dc53afb12a"; + sha512 = "27c2f368178e41e3c86ed31a588b6e71eac08ee69c91ff841d2b7e0b7a14547a011a47f7b86113cfa0bc74981310797ba46a1a59095c575a45380f6ac9cc5061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/az/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/az/firefox-67.0b18.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "433efa4f25262a1ebc64fd30f1cad3f85f05f83448d8ca9900fca4bc0d4344fec0aef54bdc6deed3717c0f32a28f2c5ac4570b9c75c30754dd300f36d298ec0e"; + sha512 = "f1f23c600e0fe98949e6b23493adb74f2d16bbd107c1b2b9b3e6f639d2148b6782f8599f5516481b432e551867a5de0fdf417f2d6ebd9a537a8408d1bcc418d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/be/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/be/firefox-67.0b18.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "8aed8545ab84fa77fbb25b7ab1090b5b758a1ebc18e4a2e112cf5e0a063ee6160103a017fd8457b3d90a08648e372037b7cb0699efdee5294b6c233ef8bc0150"; + sha512 = "ed79c5ea368d3ba5c6a29169c0d4c4070cd2f045db9c8ef5151d8c489a9099baf74346bbf45806b06afa2034647803df8eddd1bdfcbf7bd4afd44ae42c902913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/bg/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/bg/firefox-67.0b18.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "eb6d929f343ef270d5e46499bcb3180ffe3a110509e5beb6b4d5219dd1031da931a0952a5ae311844a36d637b76f51a5ffdc1486c0ec9ff75015467c5644c6cf"; + sha512 = "13069aff98bf87c9ee445e4b46d4a43d5f00fd1db13e7ee76863146b90730a644d9beba59df183083ac1b2b7460cbe907d0a13ca5c7d2ef018d9ef41b3058467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/bn-BD/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/bn-BD/firefox-67.0b18.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "43e5ae1a8e80c6dabc5d39511c8e063b0f05679b9ba45639a6f92faaa6693b1486318275885d7d1b88ca4fa4c21cb82e15ba842a65e2ffdd7b9aca8fae0c1212"; + sha512 = "b48e45d9591162ef472018895a84633555dc85f6ae9f6920a32668323ebf76b109b4fac04ecaf8852e7b198257b515212a08c3214bfb06ad62d05c59a8ba91b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/bn-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/bn-IN/firefox-67.0b18.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "1031278c8243faf19ea043ac3c6f7752391d32e09ddc3a7f6e9a0fe15ef6b59446ba4ccfaeadd4bfe3640996692cb1a9478ecfad39790f4b2e85449bf30873b2"; + sha512 = "6d25c4ce44528e2f3129005e50cd02613b0204769aea79bf7c99a2fe9842e0a935dea26b98df833374041827906742fdc0ce3ae9b73fc80f3dde0987f4bc6c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/br/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/br/firefox-67.0b18.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "6f13c2b96a8e2f39cdeda79b15d7a7ed9cd79c51f3a704a377c41facdd697d60ef7f9e204b6f551b9e674b15badf2f46e7e262e63333c29caeac13661e72ebbb"; + sha512 = "db331005453e21f24453a1bebed498ea78d2399f4122bdf0ff543a1fb1545067de1016b1edcd19a24749e7d21596b8e27141634da19774d192cb477216fe23e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/bs/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/bs/firefox-67.0b18.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "8d575ff30881e0c88e8f3e2838a3517001aee4f282e9301312e105759112eeff1807da8cb13590e3f9ca73aea79ccc7e1ae68cc7b082a10c382fa0a1a9adae3b"; + sha512 = "e46cc4f4eb0f4573185cf1bd76e609e733e3edccddb73746bfa9a6a8c769f6de2a95bcce00212dd25f1b99051d2607cdb7bf568060cf623ca3c5798aa90d0543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ca/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ca/firefox-67.0b18.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "ff303ab168d45abae0cb3096a02b5c1bc4911e9cf95929541a400e05791a75a3ee6a812c0cc41ae541b6507bf20d6e852d40c16c68aaa3708f972d018cc16c26"; + sha512 = "7bbad716a551a8629bc75d703ec6b3e6cc2f95c0a5514b5d2fb73dbdd8c392a22505425a9b6c24cac8a55fc020803ad31626c68d84d8c5f550bfbfefb0630352"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/cak/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/cak/firefox-67.0b18.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "af88063c276af628561dad2fb65e7466d37e9746d68883a57d1ca212de999b4a11c3836432d1c2fbbff35395c626d922ef6bbb9e9f59e994ba089b182d592daf"; + sha512 = "4be1b384584b2f8a8a6f4fee65921497def09a554f4d77f50b8ca6b105c3cb17c5601016955bd4c53e7a3fc296572ce144e05eed588ee23d63f667819a88eb92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/cs/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/cs/firefox-67.0b18.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "0a86c553dc8788f2c04a386db2f76dbe22145ae116020cb7a48b22d89b34d697273c72234fae2674e8614f4ae268839d2e2f4e94a158cb5ebeb2ee303dbe29d1"; + sha512 = "ecfad56ed401b66ff33461bf47c7fc6901b6373eb8f2c4234d281d19bee9c9fa1fbff6fd4da6e39aeb1f75352db5a256f8b8b0085ee43ae33d609a01a5c0447b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/cy/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/cy/firefox-67.0b18.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "eb73a0889b7398ddcb61314ef82d5b425c7ba3b5d1219b31db7ac6ca138de08eed8814fc9bdbc02dd3029bfbff82d8fdc0b088c5c8bffed7ecb2a62bad2bb586"; + sha512 = "b23fd53e4d78a75507c86c9de91defdff4726c6a80b0cb9f936afa6005f07bea7bca72b2218f58308b6d8ba2dcc3d9d57a70cea8fcd466671121fea5ea6dc89f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/da/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/da/firefox-67.0b18.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "52c7c6fa1ef0ae41ef17d852e97424783f9683e3d1cc8581cdcfd009fa5be9ece873ca5a7c01ec2690e259109e27adebf8870679f1042261cd6b482e21c61ae4"; + sha512 = "c0da4c254247e98ef5715f8af5bf63a1b245001f2ecfb86e87698cf97e44e5272c9c8a05d0390c0c82c93789f08204eebd8a56b5cbbc8a2757949088dd53e2b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/de/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/de/firefox-67.0b18.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "345198ef7025c0dea849a42202d7eb3dbf381eed4735c55a8b08b125afd30a63134999fa62f270d3332bbe3d0c6bf9e201a323f9d67d27616f349b61ef02f33b"; + sha512 = "5f87241024593383d139a109c3ddd58b59e4ddd94cc86fb6b4d437c2d8005b4c4306b0854260bf0af594c87c990c2e6c9141ee2a3b6dc7f03460aa2e588ee827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/dsb/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/dsb/firefox-67.0b18.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "d9d704f11e49ddd0f8aa27c596bf41fb14d71884424939b7cd1ba97667adeb9fe14001e89de64b78eeba4837fa06c6b5ede7fdc361bcb97a3a69ffcd71e5ed21"; + sha512 = "847a524b6f97cca3ced60765b6b7099604e53ef38ee05306479dd692ba7c44a52bfe2192b45b7fcbae741f541d3c3c1c5d0a325f43db5377e9e33b74dda13f82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/el/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/el/firefox-67.0b18.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "282c08354850521581e234a4b9fdb854549447f837f3fbcffc18153433904f8cd1f9c48b44c3b9d55c5c58d69776e062bdb4abaf30f4a503d8ef80ad4d7b65b4"; + sha512 = "d3d56f8a43b023dab34672d19fcb4e87ac5d38e325b889c92b44d83bccc89e27ec2db7b99dde400f06b5a3249cf25c253ca16ab2529d0336ff0fde002973982f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/en-CA/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/en-CA/firefox-67.0b18.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "27a8f4aba3de26de293034a3a8df3d51ade8ce9e873477e3594f512749336c0684493e6d71b0d89793387571cb39b18dc1502c773a9b2e4ee8d0463f1f89dfc9"; + sha512 = "7908a54de36bb5e846efaae0c767309991aa9767e52b08fbed7ab0dbc63615e54bb9be8ab6c93e62f269641dfbf8e9ca14763db70d0c7a91072c950b9469f7b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/en-GB/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/en-GB/firefox-67.0b18.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "732b08849d49e82ca94fae502f72401e6ad99d5278412fd8d57917fc09a306b1ee89ac7bf081f6f1354dc412fcd652dd571a082fab60870bb068770b87166964"; + sha512 = "cfbab51c622b687f7772c3f5532bde334d70714f8917b8dd75f0d4050cf666e506382b758242a7e75eac436b84f77afb98cc7fb32e8f7da5cf55abf32bb7e1e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/en-US/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/en-US/firefox-67.0b18.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "f7da3e20f0261dcaaff354de5dbc736d1234ee025b7f9bce38738c5b441ac92fb1f237128cc018efb6df3332d691234b63f1f49d0fce420f715c5c2d7e0aa8f9"; + sha512 = "e49eeba70ff6962f36df3d9c717a2d050d5b3be52d1d859be00f2d2bdeb97568e8c180b82e9d449f159b1da71b6d7d592e4df57b84b199d08807ce11b76c4ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/en-ZA/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/en-ZA/firefox-67.0b18.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "8db395cead672345072a21fd6443fff92c402b697a0456fc2ff486dadc50093721e0123842384d286fb44f3d676fbc2f3ffee4ddbb345b2802bdbf99c542d2b7"; + sha512 = "5dc8904bef3fd67f1c42467a773061d33de09716751f1d5402872d44c9d7e1a8a65b59ec170cfc769a116bba320a5da71d90e9d0382cdc42fd50e23d09f39806"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/eo/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/eo/firefox-67.0b18.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "a5f7c94f82ce7036b2b2a5c93c292d89c3d85fa0e3f2cadab6b84d44df3002f26028c2a2e2500e2f8c4a172aba031be1326defcfd8240895bcbd2592531a075c"; + sha512 = "c4d5124e969ba0586e7b3a03786ed662055824548fbbdae70d902086ad4c07634e592813bc6c9de2c160e6a7b7f934b08879507658f4a77b1d92ce59c2ba7def"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/es-AR/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/es-AR/firefox-67.0b18.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "2856e12987c1c381acaa0068fe2bb406485167e6b6021c433db48368cc1e538d09db4bbea0e780ba9cd8991c8167ae0e8c828f2d60b243a62a6ec4fb48d4414a"; + sha512 = "f9ab7f316f7f1effbe6629251c948a4310a9a4598ceae03b935ca27750d6c70bc9a1302c2eba35a193bd0256ad89724b51a6c5b1ab2782927d96c1ebc7f0e84b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/es-CL/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/es-CL/firefox-67.0b18.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "3a9e01d17859a87e3fa8c2802397a2c79f00cabc5d0d7477f8a8ad0313cf54081612dfca5b8f46193fbd0c6de3dba2981f3c5625c59dc5fbddfe2b9f8f599ffe"; + sha512 = "563ecffa8ab710b178e853581b09f8c624b7dfaeaf3aff40e46a3a224030691db20cfc58f7d914fea45a4c38136919cb6238b1e9a11351825f427191deb1f665"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/es-ES/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/es-ES/firefox-67.0b18.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "061527b0429505e3137a7e2edeb287a778d5caa03cfbb1f45747625f3d028a09aed5531bef05efebedb8aa7f6812914aad8f2626210d382bf5d8408f932b4505"; + sha512 = "b8a6958a4aa86961e02f803c3a590bcbdd4d34963ab0afc0f21b42fd28607b654c2d7a9f0bef2723e5ae54b68b0ea4c52fb79c06c4996d06700091da5a759788"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/es-MX/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/es-MX/firefox-67.0b18.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "396003a3c3bf5beced73622df527110b075f715cf33a32b67da96df5d4f1c45276e3bbda4ef9e788c14e425f985594df6621217a245efa2f8c6a0e14e2430a01"; + sha512 = "a0b5c8250832f4333d437082b7af0ec25fbcd604d863e3c402156a298903a88daed24a99e2ff2298da6dd038d41c46045413dbd9a0ec2c1436036f8b7ed767e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/et/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/et/firefox-67.0b18.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "6a51caaebf3775ca9749849dd8f21052d5eacdfa4f2f46c52d1a8326584c045c33c61b0c987e6727bbdd8a7e0f7674ec8de471c558d505105fc81b6f70b75631"; + sha512 = "7d75d902c248ba18ec5ed6d83c54a4ed118e8fc07597609401ca6a7807c45de3c4fc423b1076000d4123990ed845a9f3c2acba619563adb62418f7b1360c248f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/eu/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/eu/firefox-67.0b18.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "2429b5b862c6cacf4153f3893cc3a6a56aa598be27946c73dfc40dc93f03730a91e2cffe0a38a0eb6a82c4a93d5d768f79e3c6ba143c0d2028c0638cd6d15044"; + sha512 = "e64584b603c6b169f148600d1ff8761bde688eb7159854cd62d684a1764cf14e021f9883540121be31ffd1496eb232a3067e28952f013cba27fbc53bd75769c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/fa/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/fa/firefox-67.0b18.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "f9a174603892fdda1f003b16dba38cc281ac894fc9de22683184343b12e0813b37ee836b074fb0dd62a9d2a232016d667199a6ae3e8ded72ba8c23ed97e52c63"; + sha512 = "5c5006a0c43f8f8bf32a08497187e506c8c86454551f78f190014d9b1e63353cacb0de9176b2ef2ee285607eebafa6325a2d3b2ee0a69cf4b3b1f3c940b871e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ff/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ff/firefox-67.0b18.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4529a6dd05a9c9eb21cbf7f1147e9be52ba4d08d20ad6d3f94c46db8d2195550d31590b617e3f693f181012c1bdc5b6522ec124ea81066361147cd08b9baa06f"; + sha512 = "ecec561181bd2132d1bcec62fac6571c56028d3a780789c75bde79e18da09a46fa2fcaf6d5066cb0052fefd3a7a7e189a18238896303065034981ba9eb8bf82f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/fi/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/fi/firefox-67.0b18.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "da132dbf65133700558a0d9edbcb2d425120131ce77449914dbbd0785e433ce11f044ac8cd15054f20352716ace145587789433287b9d0249aaaa2216d0be812"; + sha512 = "39ae1dec658a8acb20110bcfcfdc0ae36918387b49fc2a746ada7318ebdce380de8cf857241af4a4c4114fa8dc9467eccbccaadfd67e9b9ff1ce67959ec69767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/fr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/fr/firefox-67.0b18.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a094a9165c30e0535b1802fd7b7bcd2fd6b11a08e2f27fd9297a327ad37fbbf62f99d614c66b2855e0e64a06355f3239af158115cadab6de548b9bf15498bc25"; + sha512 = "75319e1be73306b18114df1afe1f6d5c7fcad6a540c253cdadb4e0cd63b03aeba2a0d9eafc06b68ada3cc96b2c515cda6877aa78e0a6534c17fb3c892233bfcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/fy-NL/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/fy-NL/firefox-67.0b18.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "1d49e5ed376fc526bb71918b94a6abaf25b7661d6209ef09c5a9eb08ff1c2075f2b1a46a8ea7ee8d8b65b6537c0f2aa4edb7ecdffd28180f1f77320a0ab7b541"; + sha512 = "a6ca5052394d1faf664b664fb06684423831f2eb7b9adaea3cbea0c7e4cd96eb78b3946c00f881ba4e859f12bebbf8f0c6caabd1e128a13b0fc34e7189de8103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ga-IE/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ga-IE/firefox-67.0b18.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "24ea4488586c533afe36676bc674d491c5af2493de722d14bd05882a9af9487916bd45bad83993d2f52cd69085a88b534ce79279ae5163b114ba12b2a248aaf8"; + sha512 = "c99ee94de278b0cd4b336337888f054d67f009e421008f4ac8232e6ba9376d3e30c56990f78c9da9843f5d3b3319b002a9c0da7711867ac6b9b44f3dc3008adf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/gd/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/gd/firefox-67.0b18.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "614ebe6292caccfd897e53f0397ae4008a26bfc36b11ddee38539073439a7f4fb1d49852afa094d34ef745a91fe7dc7246f09593438803e9f3b8cff7df1434ea"; + sha512 = "f43331474f95ef8630e0caf2232ffd2cf42191ce5a15afa1edbd983765a1a6bde830ac499e98ae027936019294e5c0a0af1bba85d7f8efb8c280ec3f7a17f10f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/gl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/gl/firefox-67.0b18.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "2b093e1ba9f07e1dee3d0adb480e96aedd5695e5d9736a1d63f3893bdbfd98037fabe80711b4ebc389331cece2d3b324c802453a5ea049b8fe89499668903527"; + sha512 = "efdfaa97dac023f99f2adebc2415a8c499f6588ee2282aa57c11f4fda90a50c77dc99f0f3e69be81ef84a7273fe667a034f9d3568713533eddde0747490e5695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/gn/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/gn/firefox-67.0b18.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "6c6fdc4a10c1c1704bee1b7c014177cac8445813ecb156fd6d9e581ef08d75537f067a61a996a445ca37d10c8fc8b957953ca9f056846c71251f4cd3f4d8c902"; + sha512 = "98d54c94bec9de4ed3f9a017edfcca02b4c7553991c3e1316f111d29ef541cf92e455197064f83201808ce3c81566189b7d8d8c38bac635c8d41b26bd517f42a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/gu-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/gu-IN/firefox-67.0b18.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8e4a8f3846edfc12142a7408d9b39e22a5df389c69b3393f9f5a016cf42eaedd687dcda74573f66ef8cfe31ce0b906f32301843053d34b559bd300af5ab51738"; + sha512 = "aea28693b577eba529100044ba78cc23b560339092262d20422da75def30819dccddf7a129f0f4a51dd2a8af4fd8a8568f0da9be0c9ddef9dfb691cd9680a351"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/he/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/he/firefox-67.0b18.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "dec44691741558f18bac80ae045aa01659d4a08ab43be0a566787cde56fc8f94008a38396633a85aba2c690de21ee26fd4d67ce195fab97b0c988d5950085664"; + sha512 = "865ce6baf7d69fa366fa809221b981d28600985f21445f4d6bc3061c3de9c04a49bd33dd7551f73faf9e5631f3990f87e834954f08876783e3b35cfe2296dbf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/hi-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/hi-IN/firefox-67.0b18.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "e774dfeacca10137c074c0b3373992c576cbda7cd6a343b30b454f1cb53cfe946576f9e49901766944d9b8866ced6a17fb694c212dab2b36cf4975a3904bff2f"; + sha512 = "eb7b15bb932a59eb588976c07316d0541317993b9c7f328b4ff20380ab8dd08d9195a33b34cdca0102ef1e43f71f91b63886ec876f20ce81da9746e5b097942d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/hr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/hr/firefox-67.0b18.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6bf935257121d3269ed20e57c7b5f716c0f5c8f139c23dd3297014759a78dcce79655e9f6f15ee23e3d71f28c3fc526412854c0de4ebc7631b9dddd2fa37fc08"; + sha512 = "15deedecdb9529a8aafcbba5d1db62ee59eacd70828f9af1466c484e0ddffb90a95321efff3ba16eedd3d342e30a215d70ad869f7c21bb95e99629164c6adf78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/hsb/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/hsb/firefox-67.0b18.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "cebc838cb4462f44af601e3074a28bd284a07d87b7f82a5d10d5a5c244353453fcc76c2eb45433421c1d854d198f4cc8dba48e36b5e681ff84b89b0fb051c37d"; + sha512 = "ed1d678797765d3927ab7c059a203ec054355f49f805af367e8dad4b5ab2e969f3834f339b8b181d380900bb5f67aedbb5d5fd760a5622372468a848ef04dd06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/hu/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/hu/firefox-67.0b18.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d930ab76cf92ebd83cac0a18686aeee759cd30404e8ce9e4a06bf51894accfef67fffe4bf7e9cb6b5fbcbc3c8afcd18f6dcbaaf3c067eb091569081986d41314"; + sha512 = "d2e4c41799bbdcee19de3c1d8b01998ce025f64987cee56ce6e5382da65a4c2bcdb4699d6c959991fde1e151a76465af2e2ab6d5aae7701c647712ccd5fd4caf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/hy-AM/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/hy-AM/firefox-67.0b18.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "73aa0a4ab5057a3bdafffb8909879fd4eccbc2530f60a31e9e3847b886c47210c981c9896d890925c62cdda2c047e7e5b1553c0d357217d07bfa9ae7d1be9cc8"; + sha512 = "1bf60d4c87e8a74013620c06e0d9101f968b73300b3a00a146c7d46ca4c161a05e91255e569ec88bff90828b54a95eba27b9a776cb510fa7b45f7e763b2e5aa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ia/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ia/firefox-67.0b18.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "0e7dbd8d5aab8e5fd797ab2703ada2c4a3f81020c56a3d8d929a390248e863cd3601c828e0da3be6174ab7ce1acd5303d176688e9e6496b51188932ad2a779b1"; + sha512 = "ae06a4321985fa2c733e49121c936bfdabdbabf31eeb70c03f9c261413613729c28bfa68c39d4a153e3e543348e605ea05efe76c7c0c0d5c3579316a33fe2077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/id/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/id/firefox-67.0b18.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a3578b1c7849dae63892020595705e4e70d29bffd4923519084eec702aa143e01a05294d94467a82265c02f811611f36f4ed204ccd3d0c827665076b43fde481"; + sha512 = "5039ec6545708bb227e0d0ce3d3220c378ee4522969bbf7d2213bb50de8d1ffbbbb21c169acd9187c7dbb5c398466732889a616afcdb9644b5492cbb139f8180"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/is/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/is/firefox-67.0b18.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "aee9291395f1684b71e8053e48650d4357180b269704a09cab7cde819f14a93f7bd4d04844e4170838929e56c0dd6282b2eed37265ba9ada700c83d9300b79e8"; + sha512 = "254e8b9009ec4573fc49e2725112637e62e9fe5c85861b3f183da39fe20ef8dec8e8c6d3db69f777d0ac587eaecf43e5aad5e76066b36427805bf1c250e12427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/it/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/it/firefox-67.0b18.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a06ae957abb7f0bb5a7314a43e0849c4f5cf8520cf4bea2ddc8cfa2d7fbe110c456d6c2a5663726b03ba4a7209e66c18810c8692272d40578ef84aaa14d5d30d"; + sha512 = "b985e79f40b896ed9544c2a46383286a6b4938363ceb8e58e89afc74f7e35e7c5e6e97abf0582cb6a06a21222b8a6617e3b1a762e71f2ce0bb0bc385bc1a53a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ja/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ja/firefox-67.0b18.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "13ddded4e2449f3c49c249fa123099d34167f5d0caaac13f6f193ceb2625a4d1466b5a31e12c5347a240f84d3672ec17e9d09d9dc9aab317a5eadb15a52892c7"; + sha512 = "adcd758688288004178f4da7a99511a97f9b71bb8a8721c40b283b50f640e1e0941a7a5e89d5435e3e437a99ab02ad46e0426364637cb28165b5ee953565d11c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ka/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ka/firefox-67.0b18.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4471813a2d15051a87b32f76eafcf5febd0852b7ea009c2ab714d4bc30e2a0882b6d20857db1f339b759b62cb85d211447be0f5981b95edeaa1f250a824c3cb5"; + sha512 = "9982f01bab9ae08f08faad3e51d3b1f036ae8de41ec3389e6a499d6cd592376844a133a2c847164cfc0044840a5a433115c113b6e9785a6da997172e342c5afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/kab/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/kab/firefox-67.0b18.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "508166b1d711b0c6106aba0997e13998abeae1b4dec8736c08d86bc1ccf5824d2b097e77890a3219315e99fe544314fc12a5289466f9db5268857f328f339b5e"; + sha512 = "0f93718bd714a4d72b74442e7429605ccc2fc7dc92c20b9520eb6348b93944401a1541a311779ed6f745aaf57e2b4093fd73c4c0c2546045c7a16a8235fadaad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/kk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/kk/firefox-67.0b18.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "e5ac50c7fcb57927fd423029916b50af10b69e0e7810f93d08bab2f3cb5e7d31eed98f82ff74b8319048a491a8dde81d07e77e5a8e66fad2d77b1173db643d4a"; + sha512 = "032ee445d82cb90afcab1d6c0ae694b6c68c6472ee540fefeff397c8ed27d0e06324d7daf56015dbdbbaca6b0ff850868ede9faaeb7c49958175463dd6c40820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/km/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/km/firefox-67.0b18.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2ed715bb8604af685a131bf2950fbdaeb7a1b1dc29444273a0b57dce213cdffe398acc8eebdff124c23068fb553e14e95990ed05253d2dd553e7f4c0facb5444"; + sha512 = "19cc0593436ebc13da5cb8ca9353855c85feb7d7e8eb62b8b0f8afe9abee757ab19eb85ee78df7b1e608629138712a83d8cf794299dd073ecab5c5baeedac7c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/kn/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/kn/firefox-67.0b18.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "7c052bd8a16208f485bed9b0e57c31733250208f16845cfb84c4e77a4c491e4e1dbd3ab11e47ebadc18bf00c8fe5a52c596bf858709eb2baf3b79409d8420019"; + sha512 = "f111dce7f3f7eaf59358e0ad139449d022aa48131a1237806fcff8fa50181ffd8beed9ead2f1a706a99b34ba579e5251a62291b25bf4a05536208b4f5309e86b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ko/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ko/firefox-67.0b18.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d1b5db7b7c1850a9f0ea53fa123a3d5f5d6326e4cb2ea9993d283c6f5a3e372782348a007bbaee5de5793c3434701b7ae3db7796e82a10012a9834cc229fe0e1"; + sha512 = "7a66013ad733ddde776adde6a0213c5065545d310862c8e1ac9c30ef488689dbd5897bfdbbe25d33acf598e44bd82ba53ecb5f94d0b343a9308f00011f78370d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/lij/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/lij/firefox-67.0b18.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "ef2a3fcbd87cdc10e276981cd1d437863c275e965a659d848e6b8e64586af8d899dc1ea2f77d5ca0fc17805a53727471f4dfaee6fba71c1ec6768217c76129af"; + sha512 = "8740aeec08ed4d69c95e561a072843fb97c95f14c1d1aaa5dca67c7e5e5e126db33b2d81efdd8b6bcdb373efda4fb3db660aa84bf080f017a7aeb57ecbc46d9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/lt/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/lt/firefox-67.0b18.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "851e47f24aa4f183629f31263a206fd8ad3eaeb012abcb6fb52a072af5c12023a2097c982968d32772424af53198dc019c82f4db608ef9509855f83313c86223"; + sha512 = "140e2978c80a3a54295d7235d90f50935df8820cdea9e90283efe9c6e8f028e401e9c51c9111475d08b96c2b25bc359828d7ff13c8f8e4dbbcc914edbfcd548d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/lv/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/lv/firefox-67.0b18.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "ebc5ff84fa5b04b6786b885e12b59b3da1933d53bdb86f5d6dba4cd4b10da4727da1f680e34640b47beb1bc78c50480cdc597ba4be7583be3d378844098b6145"; + sha512 = "4ef8038cfdfa5b94900a7b9d003f66685250dc2d414ed3ac3b107aa4f93ef75e486cd8918bde06f546a259d317be6a1d21a7d7604410e817aca94a8d5c6026bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/mai/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/mai/firefox-67.0b18.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "9f8a4fdebf27122efa3fc4e0a2696805d8a6c57766045cbdb83b976962c407b8bd4011227e4df587b21645549b88357e15e6c63bb62ae6f127e98736444f0bcf"; + sha512 = "111e20a61d66f2ae901badc6ca60f57214b0bac6dd6e7d962059eb2c0e0fc136f140546f7def96aa7fb36b8bd870a751edf721b0fac4e8af66bc0fa502b91d0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/mk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/mk/firefox-67.0b18.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "8b0c2383278098f4bff948a91731e0d547324bd06623a58e7239514322d0a607d6bcd89a50afae72e2c3609cfac08c7276209779992310f21aaaa7cd21a87408"; + sha512 = "9104e981c567d62f158de38c9eb5a6dd9608482ffff04f203a5d8992ecaddae3bafd7a626fb6dbd46c877717bd7be6330a33b6b59c81d231686346cfc43c1810"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ml/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ml/firefox-67.0b18.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "4b81cbf8f25a51f0812953f2c9b5523c9f18a91e6008c9169e1eb55222f03435be47e5cbfc45ce6707f4ebbcf705d7a283d0fcae3cf42c38c4ed469f0a4a6f59"; + sha512 = "4cc80a6160b033b5c1aa85961e2a3a26c0f970bc1cebeca3cd75766e4adb70f88be729ca2b95ce32650eefcf993a95a73b47370324aad26c2d6c15904bdc3bd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/mr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/mr/firefox-67.0b18.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "bcbb37e15d0474eb591a5d1b3e8821e32e7700462ef50dbe106d4a729ce272d41f2afaa33a8cdc4cff4a6abee5637d72b4e57869f7799c54f1f7d42cb5ea499e"; + sha512 = "2798883732aecc034228fc44023e0bc4877817c1886ed5bf383cdb70bf57499116b4d7c33b2d04f472d545fb4bb58f0bb870d5ea31ee1eaf556803c90833aaa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ms/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ms/firefox-67.0b18.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a7e350967cf7d3c884920ff0bd49175727b165cda7f506f16efbd4b6b77f8af92b0861d293a74d008db71c9354c1fe661d081ecc646995f1c594dcc5afc373e5"; + sha512 = "214adc95917428fd59df2f92e58eae7dd933ae00100ddfcc7a1bfb0beb943531473de19e95c51d37f42f10003abdd438db61bc5ede062300bd58feb493c90b8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/my/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/my/firefox-67.0b18.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a616c86801f0aaf348263d38b9b42836fc39e1f33d1447eb99c834937b0c8af570894577e29b4629e7036282607d42c9c0201607387cd0c4ac4c403fd38e3221"; + sha512 = "586747badd496571e1260e194d0028596cf535deb1bc2ccb90abf8e38a3ea1b204caeb78704ff3f09dab01a8c2fce656a170e9c281ff661535b5dd2a73920e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/nb-NO/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/nb-NO/firefox-67.0b18.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "5e6d123acd2c3779762eea9166dc08a21969d46c454503d7fa1638ec8f2c38f179a430af225d97119049ec318726f0a4950ccc1f81c039d2aac92ea7d0d6ba08"; + sha512 = "a9e0c2981212d9086c735a1e26aa8dc8b8ab8336742b0dcb55760141cebc60cd69e08f4140f3fa4dd7dc8e6b215fa9e6b822a8f1c02749d84baf33e8797ee2f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ne-NP/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ne-NP/firefox-67.0b18.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "ff65559f40eb01c7744daef562aaaa9b6f2c12b1b4f76bf8930f4c840eb1bd6802713e04ea3131d20ce9e3b0e8466bebb67b1062a759d03528e54785d8c06a06"; + sha512 = "b6e5fb0ffdb34eb3e626d83890d447c2948cf9a3f7bacc1d85c25aec2af50cf92c82f09f292c6b48bdd8d181c0855cf0476769d213a5f56b95a00f15a98f65cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/nl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/nl/firefox-67.0b18.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "0b0fdab60471cc02f241ae07103c7c18e21708d13911f91f7388f4b71803ebc1e6e7a0db509d06a0523c6e9f775e954955a5d3dc674e2f4ed6f2e294e5c73e48"; + sha512 = "93abbcb8032f4f8a24a02e41542165cc22c897d8dd83ecf60fe8e6dec88037e2c3fe70756fe45394fc8064275c9adad55c66c2dac2fc3ecff18184c4638def0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/nn-NO/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/nn-NO/firefox-67.0b18.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "393adf5b39ab77382ddce7bb2b38b87c7c1fa86d9f666c961b9695266a932097316848ebf6ce46847bc8bc2aa05a8cab0ba01f568c31cef33675ffd32fd279d0"; + sha512 = "61e5fb53bd02424e85d9cfff876cb9159d6f2e2ab24c9d8eb80c0a5ea32214eb6d9c0d7206a343ffd959a785050a3d7ef6918ebd6c31c51cc2bd6a8b275a42c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/oc/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/oc/firefox-67.0b18.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "308025f320dcf0d359020cb2b9b560f40a74d6bd167322d1a92bb23c9c17ab9c9f9a07a9df9c1ceb2f7593184ec97234ccec8ee5b51e6979cb8ae90ccae3ae9e"; + sha512 = "8e0dbe72fcdc44af79d4585120c6db0e7c8dff6f5d44a937cdda99d0f846ec9c0cae770f455295c11c3c9e42affdb725839abc8b62399f925761e6e0808c779d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/or/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/or/firefox-67.0b18.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "12bf952a51a789ca0aaf31dab2f37b3165abb9682e7b4c0629f8afb89b4a97bd02b37757cb9d6d64fccb86fd7dd2a3b6240bf73dde54516372c597024c2048a4"; + sha512 = "be4c49933b81201de3eccccf1976c3ad19eecf4b6296b78ac13636259cb35c94b6788aba2217924ad7249bf5b879c0fb53ae4ee401595a42321582c81e77b305"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/pa-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/pa-IN/firefox-67.0b18.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "3935ec90834f6b595dcdf16b67b67e98d1698480418dc3e4e7cbff36c7ee3ca67a114f20c1b74d046d3d23466b0a608bbe336998bcaa67e04282b5abc70cce4e"; + sha512 = "614e98f7ce0b0fafefd2f78585b6a760591b1c30c97301f9b2021450678b0995fa2436dc9e848d869198b8497eea0f5a061ed1cf6c0ce81c3de30e0c2ee9499a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/pl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/pl/firefox-67.0b18.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "fa7fcafe51a046b19a1de49610d0fdab8f9302eb2ac478aca5fcef936162850313d8830d09de8cacad0836cf93596f3efc3f78900e72b1f9a2a51156246cf7b8"; + sha512 = "05942bdf2a87295506c798b9ef8e1f3afbbc234247385b5b6ae43b03e5e8d0898de100216b838b8e0715c08ec25673bb66fcd0200c86ae4615eb4dda37d60ab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/pt-BR/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/pt-BR/firefox-67.0b18.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "ef730208f5aa09e98912397806d055425a85bab2937e2a126c304047e454bd9d051404acccaf125b0df14ddacc432fc48131d7ae9e61613b06b2666466913139"; + sha512 = "16d53681ac12f1fb9061054b4eb4fcd846517e5600b5825909baf6c973078c3372ea96a02dd0a2220ae738326ba7772c85336aa7adec0f195da68bd8c4e881a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/pt-PT/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/pt-PT/firefox-67.0b18.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d9e545f7266643733d05ba3159fe427172030aeac17d53ec786cfdf3b2cecfc6df5723eff2f13b85caa1c1df491718bb7125d6e5de0aa4175f877e9884196b0c"; + sha512 = "fc9c22cdc6c500de25b3d7a8051bdaebeb78b80c24d191e6c5963d244a17f18505edc29f167ff65259e4ff32a9ff267c4f93b312a8cc23fca23f4198f56c9cb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/rm/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/rm/firefox-67.0b18.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "262b951c958682009d7568e1c4c4f852f337162a8544f6d43033fa5d35c9b5b65e785d730e7fdd1e5dbae3e2e92dc66b2678a28be255144d9208ed92661e2c65"; + sha512 = "054291423e1b2fc39248015601724b121c7dc4caad88a43d1fef95bde779dc7aed53ea19517782dda4e2940a4d7562cdd108b07da97b9ccbf0890a3c6aca522d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ro/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ro/firefox-67.0b18.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2638d6ab621b1c12d7a4e6e299c571a44e4572e5a57b35a98db5a21b6d4d66fce29dcfd7cc4cb52bd1b6babf70eb910dd07a0d25ff5f117e1eeee3f552a98603"; + sha512 = "a5c6e8a29dfffb1ae942e25bfd697e3863942656e81997023f5f36122a09838cbc5b49a2c63643288360162128e638b12cc8f087ad71ea2c167d8c8b19d3fcb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ru/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ru/firefox-67.0b18.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "0833383ac0b1c5845dc90a8e990321d67747bac98b731fcc4e9400806e8584f53bd30626e50235ca8246dbbe2454e06f667d2f3e393bc20b4c4fd2c989ff6fdf"; + sha512 = "a1fa36b7b829059e472779ff8b6ada126cd662241a9b94237fcb285b3f84f5ca2766a107ddb2fec1fd10f87383082ae9b016bf1dc0c7df04206607320c124420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/si/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/si/firefox-67.0b18.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d6e6e57d6e7b3ef80bb2a0574d4cd711669ed6cf026433b672909af2d749918eaddd61bdca2fb6c89c6288595fec50e58fd337507f04935dc88915602d4c2879"; + sha512 = "00a567b640dffbbcb8cc16070a8466f1915d19b81482ec76bead18aa481b0e9c5ab4822113dd3cd7b27f38e07e260fd49c1e890bc018444728fe35901b0e895b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/sk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/sk/firefox-67.0b18.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "4cdc735d757551058acc58d70f35589d56a88b172e156634c15cc969fb0165f8512920e256dca2cb34d0a9e33e3438c41962063a6d08a314d8b31a19dde3e09b"; + sha512 = "b7ff5274e86fb3de19e16eb2239336a6a65f6c74baa516a162a330b44842ce9e674d73d998cfff22b2935a4c72ba60083919d0898664d5ffce8d8fe0ccc16d9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/sl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/sl/firefox-67.0b18.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c413c3242e1d1a9bef75b021dde12ceedbf2ae026ee70186d398ea24ad14d68878cde3ffc34e290b65e5d64dab8b4352931ad9ce71c4d758678c1d416f673653"; + sha512 = "87b009942bb75273d19bebe713722d21bc0f9d220b386a4bfdd9189f7fecf39a32b4113e788cab9a190b43c6a96187f57fa32d9c34182e99424f4afb03a00302"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/son/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/son/firefox-67.0b18.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "b76ed2e4be73a466e74a30cd5d3eb9fc4d6e963d42a22471da3c657d58026187db0ea7e5f4e8eefebd558209719f6e01e01d0c54af77738214d49edfef5bc85e"; + sha512 = "bc2c0014e7c141aac7d45ddbf94fa5b82423959a61a501bf92577bcf880f53a812c99e6fedff7dc5b7b0981bc709bb919d4d628ed4d42d26c7e80f2f5be78af9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/sq/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/sq/firefox-67.0b18.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1dd5462ce9bd3217192f30d9353292f6ed8f9cb032f5591435068961f26c6eb630ec602477d4ae5c87cedb58fbf7a4265f738e5ce14366050c433c4ad5c94184"; + sha512 = "8f6e87b9de6706d5315709b4644eeb3aa5985ea0b5822e63f401f2c5b961aec01aa2396b844069e7c5198f2f78af84b2f76bf346be5eaba80712c3b7f187dcf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/sr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/sr/firefox-67.0b18.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "4dcdc2e145d647a24c0c765afc396b5a54b06a719a2ef7c87b51c8af63d04fbbfcf6801eecffbbce0364cf79577ee25bbdfa62c77fe20a25e5e6ac04ced35965"; + sha512 = "348477c7fd28d1cb5e567f6700f10e4deb70421b48a9dcdccd78dabe11cdedc80894128992b073848b697146c09ddc4cc7045e632cb1c2fc40bc92c67c9a314f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/sv-SE/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/sv-SE/firefox-67.0b18.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7873ba8ecf982ce3bda6fb3b6f0c757062c0a15ae73ee848389c8a8864b1555a441daa9227a2532185631b30aeb8dff974ecd17548bc19aad6d194d566bc0618"; + sha512 = "dcf45d07273b63ac7c2209366db6595204c379b2822b8b9a01c41ac56865bfecf582538f34ae3c25a4253ed22a7b300d18c8b3c90897736bb50c65d403a23b2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ta/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ta/firefox-67.0b18.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "3fc6a0592bf90bab7e1f14a2c3eaa036fabf25715a5bd90fffe31ed853d7fb808c5f2c0082205477de5fa0db9c7f13b9ff4a1cbc18194cf5ecc95272da04e42c"; + sha512 = "6f70d677c251ece26f00d34ad241963dd5686b64ce85ee13a2b46232f29afa72a8519105e84b583ebcd297cb76e17dca65e4f7f79a8bbd4accbf4efd2a34720f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/te/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/te/firefox-67.0b18.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ad6dd9e1b1f7f3b87260b771565c93c5a1dd3e3816c0d02e0b3d9a29693be1d933298fb40c388fb6cd0d5088eef2d3673f6a64b95b13bd0b695be8e3a48c3bee"; + sha512 = "3877da4c91a7ced22828ae4f706ffabab178a4667c61b1a3a771eb2f7fe073b1079edbeb009d1c5039477ecbe29a4e14c501b9cfdf3d8b02052f0d857e8b3e45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/th/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/th/firefox-67.0b18.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "4bb69801eb42b7e3873311a58478a4ec3b8c645862ef168bc05108386492045a66f8a1f56f7e672748d048afd5a5a3fa98211c2a93a2dd437b85ea304b1ef44b"; + sha512 = "c3547e34cb5ca350723ab0acae61e683abef0c842c3702602f0867001f02acb6a3aac57595cc0c8e79222336625243aaefcca9b9e2f5550349f934708d489a3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/tr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/tr/firefox-67.0b18.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "432da9abab5f9e37ec44526fad6652517148bbcc3df1ba05e0110bd106f546d3d5013643ab692ab7c7632c320a1ef576192fb59e5fe992e006dcb41828269a3b"; + sha512 = "d044e57778f3b4c83c3a952525e092b5d6726598540a0887050e51797564ef50ce1046692e5b3a33a661360235b41da99c6fcf22c546839e3b8cbbf755a87356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/uk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/uk/firefox-67.0b18.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "87aa3f86a456610f621c9fc3f3df91d95681727394d450f3c14a9a97357f4010b25a30a20f3f3f8dae81874351c170bfd03ce98c626792c043d9cf03d2f73789"; + sha512 = "d9bb511d55a25325a0406e5ea8541f92122db7a1aa3e9d14349d5e215b55b411c3c88f02b329c53ee930eaa352a5e4e107f97b020c18b2cd71f375ac2ccb63a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ur/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ur/firefox-67.0b18.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "170bc3a3ff6141975fc6e64a4a88246292d3b4856c05f70f1125037f8ed6f46f178fb31e422ef0bc3fc4f90406530a2388123004416bccfb712fbe847e668457"; + sha512 = "49023c5c550a8098dc19b972a13820afc3e9c4f143df0d3d983f99f94adfaeabdd098bbda2577a94f2449eaa9469289beb092afbfdc08a1b4b6cd7c45be09b23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/uz/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/uz/firefox-67.0b18.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "db3d18fb95a9db22ab18f53f6990899ea59aab426e968ab29e3dbde45df334fac8b418398df9b6deb9dbdaca6e6a2cb8db4fe892046936fa90761f037ab36c2a"; + sha512 = "3e47215ed738f4c00c5d891aea775adb21c1a41ebf8a6fb4f94b2dc801816390cb207b064bd8703b4c006fc6dde8ec4c8057eeb203a56d7fa0478c629cb66489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/vi/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/vi/firefox-67.0b18.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "8d43a6f95ffdc4c6408688736554ffb22033e27f89e862cf9aed6969f18fb3ffc80be6f3d685db2361dca58c0b7446aa4b4f2d32f624a7d00b72275870e7e782"; + sha512 = "e6ad9cfc80fef308a2365d616b1e2b1949ccee0ecd2bb4cd421a175dab35956146c4e75a7976b9c71e680202811ebddf3af5b99a992185a5c523b90246c41156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/xh/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/xh/firefox-67.0b18.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b724fa6cc59f1371bf86b7c3957cb4b37d101f0713ce859008bd78658a35f014a9f2f68a7c5751b3e5cfdb59ee80d0227e24d939ec8eaf62a96fc2fb438b22dd"; + sha512 = "f3db5f03d9849095d8fd96f1737a0bb727b91ee98668b78e5f068aac0468621f26bc686bf69d07cec2b57023ccb2780bd68e62afed196e1668a90532b8480a2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/zh-CN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/zh-CN/firefox-67.0b18.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2d0d2db1182f4f15d72accb8370012184a8b27525c3d9b7c815709be23dffd04a45cadfbdc31f2f3bd58f8643c2f09b4c59363b7ead23fdebd9e8236ea542725"; + sha512 = "a562075894b5f1717105e5816ca3901344266e96fb2a0d7957c7dd846bd3315689eb1549ed6604f05708c8feca48740fde1efb6b4553330b1da809ee49cf79c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/zh-TW/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/zh-TW/firefox-67.0b18.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "de02dd3b856cedb3575819aa24b91a7303a057d29074ca25de759487192f4dd9c466fe16d2680f0a1f53776a897bc2089de6490f13c546bb163dfe28c8f1ef78"; + sha512 = "efdefe8171624596f027e1daea7f4872b5faa6247064fb97fb81451c213a021002f32be707d4f92661f5bf9e73dd7190fc0745ec8b6984198549bdcd048d6508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ach/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ach/firefox-67.0b18.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "5e2dc826aa6b0870f9f0ae43ad9ec80d8d73e69b1090f50045a7af4bd9ab9708fe0dd4479248abb1e58b36b4347be101582fe989bb37d7a88f0d1c1af144d58b"; + sha512 = "443d44cb68f0dffae2e74dc07b583a6edb33499bad2648d134b8205ff96afc395ea433ca1007e832ffff1f2ab9b35ed4cbe7f81d84b9269fce6af06713a4cd90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/af/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/af/firefox-67.0b18.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "6a39561973ddcc4598303cc4f21ad234fd739ef6b8683380d48c6e865846debcf1b1a85afff271d9c6036ae11fc7bdc1e6b00fa12ab0d9f376145c167bdbd35c"; + sha512 = "03f9b49f091f25a3f588b388d4ae93786bcc98e015d869829761b50e52b1c13fd0d8cdbacac72763b589fbcde13f563cd84ac661408b80bad1212862393a6430"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/an/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/an/firefox-67.0b18.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f890a442d07a8f6601dca71f6939be99c2e50729e9488504d47f90543159527778ead5bd94db86bd4551888463e6465abbe8677cce1521c6fa8f2124d4d9e3ef"; + sha512 = "0b3412d5fa232a32429e75d0b165956b73712abdadab3a04159a8b412f5c40a748d93e2b8494fece5012cc6a020dd2a1c8436f986112eebfbbfa07e0c8f02032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ar/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ar/firefox-67.0b18.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "07b2fcaa4b5a689b3a3faf76d48e774d05635714569d96032c636d89cfa6a3c8c4dba455052556ac4dc053dec481662196b81281a5c27db372191460b97ae458"; + sha512 = "ef93aee847557e02aa8f630364b80451787fc758e06ed6226d9703c63f9d117e92ab6ec697fe48084e1f7fb50896378f88562049131fc32ca456765aa3890145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/as/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/as/firefox-67.0b18.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "72abcb41fb5c2b08cd6b32efe1179566640ce1aa6300cd4b47c5bdfee5862a92b4e848284f0c7793b5029948ce5594f2cf9a592255f9013987cbe67a5900c68f"; + sha512 = "272958c4f4069ad22836fd15e4ff663e8740b90f34ed816aafb10b2f5da039fc4da7faee1c2ba6e8a6b2de19d19274aea2ff8d495b808bfd1a98684b6edb2f24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ast/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ast/firefox-67.0b18.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "7d2b0b6ebdfaac83ead00682af7f42e870a218a99576a4837e81bf67c2d6fbd4657642f2a4c4a55e7633f88f847e7673423a756b96eac00752c8e5023fc91397"; + sha512 = "7f48fd4d4da18e6a1cbda39f73d97adf6544ec7a11bacd9b2d433dd526becaa157a70db033531951bc771ffa30c15c9f501bcf80a0ad6a54364c6b919986879e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/az/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/az/firefox-67.0b18.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "c4c3e1fddb8dd682caa5de4714cdcfb9263ae915aa6926fc99c7e27f5e8abc5ba8c45fc4ec8ff3b21f029d8d4d2cc671103a24fccbecd6b4e54841c25c240eb6"; + sha512 = "554da22b2703c8eefd3c3e8ccff156ff5c2d7f33e7e508b36908e25b5a289157d09a204c84f88312d845e42969ccd874baef7afd08a6f36c9e4e01e4f2c3be7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/be/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/be/firefox-67.0b18.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "49c16d91f380b611c8e6e898986824f0afa7d7ea24a3460f73788f4e5d0ba60f13c1c2a37018e3690a54693f22662d4b43192c5aceb93bfd20f3aca9fb7ee33f"; + sha512 = "1b0e39d81b3ced1bedc1e3472504aaf71f2cbbedabe5bd1a6f894a10f94c9941c7452447ba4f1a969de5236a33bed82abc0434d9fbc37c17467887b12c680cc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/bg/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/bg/firefox-67.0b18.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "4e13b0959bec44ce0a7075611d4687eed3e88cd8e27888678f53bacf5762190ba628890b6c1fbf0b0c910d193a6f5be1d779119bb40ffa39c187e310bcf4d195"; + sha512 = "4318f2a10487d87de120b49dc01be19dff208c3f3a88897e50ef1fba5a96da038973d2df837881eb54b2cad13a1b68beced5f6a426ff304493192876fab2ae9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/bn-BD/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/bn-BD/firefox-67.0b18.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "c3ddeee73c35cdf958aded90de953941b0ec9741a7896174a9a39976b76ae45c635fb44dd8db26f080766b61e4d5ad54f1257708d2063ceab4a0890689666332"; + sha512 = "61743f94bd59c57ff979fffad91e7d0762d7732cda4cd55d861ca52363bf306f818229a69165a0398a2b2e9ce8a70c22112673779233a88e8109b61f2d27160e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/bn-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/bn-IN/firefox-67.0b18.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "998a234db5db22ace4509a1d7d651331de2c8c2d79c21e0c9167a2b5200d828913b9e878c2399f4bd139448f5de27d8ca52feb89d5983459f54652c8f4da4d1a"; + sha512 = "75ad4d61195d148939681038baf3d9922fafa2d8204b72ff7cbf9017b332b3fc8028e8615edd711ad5b1f58b1e8fb9825ea69d772ff1a0c35910c86d35cd0fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/br/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/br/firefox-67.0b18.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "00bb23f5ca80975dc6d58a06d3d7b30b413525b31dbae8c5abaa65e6dd65c4b0e4f187af0637d28fd0bff6a0508bb90d91d0b3bb55651bf056e06911acddb051"; + sha512 = "54b7f2aad80e0e0278fa541118ac60df4e129c063a5c28563391f11a8fa5ae0ba51a63d97cebfd4226e47e6f623748f6e6961b5e2e4cd721fffcdeba296b4835"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/bs/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/bs/firefox-67.0b18.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "10d5d9d286d7178ac06953f66383f7eabe677bb73784df0b8e02933d64956a70493e02c7aca099cdc63a80645ec2536ea093637b7c579efc2f4a24a93972afde"; + sha512 = "04444859798d31fe2c713357c963c46802d42ade7d66cf80893b6b39917b2625f78d5599e3f97a24d9269b2b4e5a90f82d1fb645633e804062a58eb4b79f6bae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ca/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ca/firefox-67.0b18.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "b412e2a8facaef2de23f139eac4910572a148dcdbe22429e5c64d4cd1682fbc187dc2a9ef396e9e7a4643b0add3dbd3bff5815397b4877167f0accdfb9c81a11"; + sha512 = "0f62333715524c65cdee1ccc1da4c345953cf14449143206b64ab5bab98e635b94c23645c40bb4865ba9c9585731aef45cdb1bcc6d3d268667417cc86c366c91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/cak/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/cak/firefox-67.0b18.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c62dd0c1cc16619f815fca5240b1bb219cb973a1e47e75f0a47a34e2be739ea2ff1fa3b4b1822486ca4d6c0538f799a2ab3368b2582d005ff6f2bffa742321e9"; + sha512 = "867a1ee75564bffa889f0ef10974459f6dacb07cd6ecadb622a129f846f0987d8cf16e47a9010d73260cc2525f141cb96dac52a498797f1da3bc9f6d7624a4bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/cs/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/cs/firefox-67.0b18.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a724da1110e2597097b09d446d96594858ca6aa6e8e02f536be14e74c19aca434fed261d9ca217f69e9b15b54067da2afe6b395f0fd3f44bd024c6ad0c5b1ab6"; + sha512 = "ca44584f699432276a7d8aa578d0c4c76a8cfd046e82f053f62f194681829382e2695f8a1b851de2fc9482969e7975dcf05dea58c92bf505b1fc71c57c7b6360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/cy/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/cy/firefox-67.0b18.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1e68b3351165aae7acee53356b9d765f1b8022b6775d340b33b196ecc7b2608961e970f33db8ac25310c0e98ce2e556bb69840b7078f89ed1f34c64d2af3be26"; + sha512 = "a68a618fd33012596ad5c511c6b7ce3a218599b60c55ff8efd4d5cdcb8962efe4fda0366e6b0e8c9b44d71954184a334b6baee6896d0d7cb0960a08d41ad14b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/da/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/da/firefox-67.0b18.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "d571516feedb549fa6fee78b4d2705daf1225c41cffd821526530b78e059f9f58a4e37e6302113425a1ccfdf6e3af88bc380b075099431a98715b1f5781d046b"; + sha512 = "d69efae3267554ffeb065f012acf7e63beb584ca17070b80d6fb91a2767b03cda4b86d1291a2c2211d7e7ecb867e316a52e7c17e841c1fcf2e0757571ad4df6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/de/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/de/firefox-67.0b18.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "711e30fe39a81084e59fb98a1256829dd3d6614da0486a6a0a7483c5b21d596438610be69bcb1da46978d26a86d7b60d2445cd70f7b16483be346293f10a03c2"; + sha512 = "0cf2675d8fb544cd896b21e0dfe211b22c43bd418a9f51bf2c63be8d29aebf9220b852465d18af009e48b5ef8f08ec7b14e53a650562f1c24e2e08b045daf792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/dsb/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/dsb/firefox-67.0b18.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "bac01c4ca713a17061bcaded973bea11c1fe4b960cb7dad7684389fb96d83ed5cc12c744fdf88677d38e1f4593059bfeccbf2e84bd165c261af4ab611556f8a9"; + sha512 = "a0fdefea46c4339720c1cbeadde59359b8cdb07093061daa9527c98d41d972bc4d16a5882ef57322f4ceed46528c7b62820440541c2d2b96d93dc24a070e4cf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/el/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/el/firefox-67.0b18.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "7d36c4eebd58c5630456b596cfc4069f4601c3e07238b1b7fc0d10b5a02c295626f4af263c274edba110c36bc48a0b1f4b351ddd7914cb077775a7b37bff62f7"; + sha512 = "1cedb34a76f1a6f98f62569784534f642de01997dc8507bf83ae3ddc5e195ee02d4848cc7d9605dad7681413373fe52811d610e917cf995c5d80ee883df58021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/en-CA/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/en-CA/firefox-67.0b18.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "281fd337e5d99892c29177a51b99fa5f6c872190119dbba5a340cc6255398c0b233f9c6281365c1ab466a26c0d0b22ea9ecfa19cd7de166de45213e908092732"; + sha512 = "44504283554c88cfd80b8a662e795e0405fbe1c0fc009f2ed4da5f036ccb40abfc9f5769de658e9c89d6c8a89a5adaec53541f50c3ea1018ecd5cabba43c8b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/en-GB/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/en-GB/firefox-67.0b18.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c03d75936de0f53e31782a869626120a363bfa334273f0a262d85c207927391eb7ad036805d1abcfa3cc372284c1c9badc61a6ec1a71ad00d8332834c934b226"; + sha512 = "40d2985c60333d6d95cba75efd0ca20bfc9e9c81434df050db08e6934f31a9d141eb63a1417b3ce2f9b01d71c5a299126fd7d95c34e64edd83dbe9d853c05b50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/en-US/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/en-US/firefox-67.0b18.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "db51834187e4892436b2351c85b29559fa55d461d285785555f6c5525ee3af3bfac2db24db7a9fb67c46cb27d3832eac362b859c10dd9ab5e3f6af29f6a8bd51"; + sha512 = "083aff8bc27d00ebb3331f81f14429bf105cb16d4ac9464d9e275e7ffcf5983c7144a7f9001e6f766c668f79a9d80fd147455cb55099c87c92a4b2ed3807d1f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/en-ZA/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/en-ZA/firefox-67.0b18.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "f4d8a9b3f1e00835f7799cae363ea14e7753d0f85170af7833ba04a08c1764603fbee6bff79bc3cc70bb71490efec89632a7715681cfb5b9ad8c790841281b12"; + sha512 = "cef07a63302a00869837d3e526f7cc5b6518f2ea49932cd66e788912bc8e71460cef265b73c3fff64ae35c5eeb9585323f605679b816d817e4569fd1b6073772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/eo/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/eo/firefox-67.0b18.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "cb51153857c23854270a74b51e321e3d769e724c995b55f008d5849d0dab79b7b4fc5b488b50ef77a9c11c0c9f4eda39e6dab038ddb0e3d8ecb2c26a7e95a26e"; + sha512 = "37c35c893cdcdc2dda103ebcd4bceca4097a999070ec3db76288b00080f71e4b39c6914760bf42f1ded50c193e56261ad1563c2a5c006c66703b7c3065190394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/es-AR/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/es-AR/firefox-67.0b18.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "dde46c908755ee912df15d4d95e52636ca8d5009626215c434e637ba22f895765017e94a55b344ea44850629f7bf6a5b39c63dedd9e82b830141ea0375d2e4f9"; + sha512 = "e2975c93edd8fbe942ac4072514fd786446d1c1e4dac39c3cc7222377006acfd6e037763018b81c428b80290da0d7c685620719cb40e85e6941a4e759574068d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/es-CL/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/es-CL/firefox-67.0b18.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "d7580e5675af69576a327341c8b8572b1eaca977d074842a8681f1aa6082a819c43001effec7255b3c067790c14e97027df3e014a70c9f7784b44b7f22f39fad"; + sha512 = "5aadba2d88bcbad41750cce4ca43d1cd9ced8177c4bb86ef7c85302cde7ae5900cc5c015b11889e80011c0a9ffac839f9d68859ba298d88ed4117e62645992ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/es-ES/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/es-ES/firefox-67.0b18.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cb861d7a75cbf7a1fd6b0761a7f8afb3dd5a6f85567e65ba3e888a41a916340b9a41d5815518180b0feca4bdf7b95fac3b8f205395a9d0bb8ea1b0550bb1fac4"; + sha512 = "a8a68383ddcccb81123228a60006a59e3ab260c53508a44d0360c56bd1bf28ae920893d5c3c8886ab2d223a7cb92f98d4e19e6eb17d75d2e1de2bb6e4090d082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/es-MX/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/es-MX/firefox-67.0b18.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "354c649e408ae15ff00b5e88accb7d52979706886ed3ba1bf4fd7790cca2b23405c34aeffe35d5476824c15e5f4c6c1123a59f43392c3a8d9fb8108364e36625"; + sha512 = "0324d91ebbfad06b5c9a51d8d4a4b0312d28b52d180c463bbdb2ccd282983d5734a9299a0e6ac4e6b7688dba24c623c0c61600609c0846b60a0edb340393daf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/et/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/et/firefox-67.0b18.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "25a14e88b3a87f8833bd820e9f438eddda6eb4b17faf3f6f09da56b7c649ab91295cf37394fa01f9ab94ca8770aea70fe707bc7ee5f613bc6dc3617ab831af79"; + sha512 = "a2a21987984ea4883cb514aed741d95fc0fd612ad00d137353d5576da0f3741eff7e280f520613f9ddad0dd573e9c7b91ad5394030ca4ff8a6f9209fa607234b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/eu/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/eu/firefox-67.0b18.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "885cabd74befb02d056c1295d761fd46a03e59670eff7a7ad31f6248dc02f8ade924a39b664e2708483d97dd00b958a53c1a035bbecd92445d9633f07d28b905"; + sha512 = "20a4902349677d58f9ebe2b3c8ffd356a11e5cf6cb7cf3a7389a77e1da1c2697963c6d77c3c2724b0946665b02166b5741f9a48372c6dd687028751ab3f87116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/fa/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/fa/firefox-67.0b18.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "9c79a05157471141caa88513ccedbc522b85d26faa52d63e9c4650720fce19f6e83ab91e333e4b249cf1cc0945a04f5cb1d6c3e313e34b8984f53306a603f687"; + sha512 = "53a61213b2c6e652804ceb53b810421635e9cd392e8b3150389a067045275d2affb827732bf6717e32414cae76cb1eac360291d5863b785a31fe5a14701fb73f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ff/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ff/firefox-67.0b18.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "8769ac72f4ab9136930af41ea2d7964bf2bc615e0a6d7ffbbc9396875f2ea0ab709e14493adfcbcf602a700f656a7eb03c67bc75adc78379c4170799e38a490b"; + sha512 = "4427caa3218b20dc0ef5ea349f40c41606e6cd57b536b0a48dc590e8a2e48c6516a2e5fb930745aa28a17bf835107f65a8a0e586b401d5b717199ef8cbecd387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/fi/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/fi/firefox-67.0b18.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b677a46820fffdebef4d7b9b2a7d50cba76f0f371dfa27aa7f2c9aa954d075467eae9936a6d2edb47eb726e57a251fc30c481c2d95e493e32815c7cb315a8a37"; + sha512 = "08cfd6ad90c88e5daf264241c9c40f89930d0c7e84a8c33e8333741ebb139e681b3d7b3ddde972aa0ce325a686bb75b56e524a0259ea9ae696a926f052dff84f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/fr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/fr/firefox-67.0b18.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "dc6433a9ee7667af7feb9eb4445477f0c9cbfdd34f906c9b9218b465b8d743a309b831309312587b3c259ff986e4d48204e23a3729d3157fe9287db0599070e1"; + sha512 = "50b63fcd9a60a32964769d766927b913b0b5c3812ebe88738aa2d0420b448d5aefdc374a1b030c230644ac2e89faddbfba1b50006eb277c109ed36c81ac436c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/fy-NL/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/fy-NL/firefox-67.0b18.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "0e79e794d88a257dd7390d1adde4c3af0968242c6fad464742f97710f248a385aeca70eb6a2b1772c91bcadf7e02187fc914e1223b2f0fcda55ad7e842bf2560"; + sha512 = "616b766e2c3e564dbd0e4eeab9544be322aca47de9ba44444dbed96274c291e6bcb155a2be11aa2d6b43a296422ce84ea5143425b174b73283870eb2b78e3c55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ga-IE/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ga-IE/firefox-67.0b18.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "9776f8ab91dbe9ed43cd446eaafcd2da329092921d99126812d8c15dea9f475880e2e404e8bc27c77e7558562dd5b552a570837321f8d044058151766a53c918"; + sha512 = "a00b961fb0d3f832209d5c33147102907599abae9c10b5062c038863f2162b5d93fe48b918e958890a273c9a449bd223e22d7adabe2c60a092246d6fda150e59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/gd/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/gd/firefox-67.0b18.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "158ce665efb91a69deebbc3370080546420a06e093f68e3eaf8a5c6200d59837e3eea7f5395e674209db1c25859488cf43f6f8a2767b7bf0751bc2d68eaada99"; + sha512 = "cf8bb3ab406e4893a3f7f09789c95b51d1e7d745dc5fbf30e809827340ae056b6bbcf5c6c8e224a7492001ea182ad6354ca0702a81496a3b543531dca92d2ba8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/gl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/gl/firefox-67.0b18.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d5e9f7ef9e8392ac7bf0a927763466b60d3467f54570682775d8cad1f6f974e4c8f1c3332c1425c1f5c2d4f60f51db4745c9c0cca9c4753475f546935574ea1d"; + sha512 = "77e143d6ce058654b9e4a92bf1a1d9dffd37339d85733d5785885ce51d32328f525140f9a9409f6f1532146514715fe0fbc750077a384f9156ca07e994864530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/gn/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/gn/firefox-67.0b18.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "5dde85bd2efbe5750b57e66bba184927c0732a60118ec11069f6d3d89991576b9f12bbeabb8336968a0413756dc35a68407d425b3c5943b0b11f4371ff5aa181"; + sha512 = "baf483e6285268c50d07b75ee358cddabf2ac99a502fe5c8524e71ff5ce1e9982df0ff641877ca54a8074c39ff7e964ce0d82dd7970fbc674994806abe23cc3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/gu-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/gu-IN/firefox-67.0b18.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "221b561822058f1fe6669ff1f0f5503b7196e0411d543d76a5e21bc334cab08d74bf521e8fa927d3b7d2fa3ed9a9f56846962569cfe45db9a85e1ffbe77def20"; + sha512 = "771bc1ddedd8147b3e2cabbf0bade2f241542886533661e3a006c86cbeb922517a1a417ae80d31710461c8b4e5899b2e745eb1fa3fdaa69e32f498a9b5ac848d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/he/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/he/firefox-67.0b18.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "99c46906fd8b57472044fb4d6ba2e624b960afeb6eff9a6c5886e65607af15d5a62b5d1a01d8937e2f1faa67486bcd4d17b4e2b5c6ec983388b872aacfb2e084"; + sha512 = "e52d6a321d1fb8e39ab376cbfb8d0e75e820ec543950a4d21e3b01b3a5fd33e1f5e017d002c608b3f19edb50cbad8c949b50121b29b70d3557a6ae5d0c4bb96f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/hi-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/hi-IN/firefox-67.0b18.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7c78e9e84151a6db4f2c4b00116ec3c4cdf9caa167009c9360ed068d4afd24f323277c6b8bb40facb62dd6046f3481efadb00f8b249046c57ac156dea4d121cf"; + sha512 = "fa37e7332b45f518b9d1ca8287da80a6b558788f97f256539e21b83c09a6569344eeb3ec9e766b0fee7ee33a91247ff59ae639b83f3713f110c2ac993dadb7f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/hr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/hr/firefox-67.0b18.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "206935a83387f77a4fc85e98dd81532e9a7f373cab4895a8e71dbdc0b5794452a91870a38daf1155700e92b413bfe1ca4ddb854299a86ca8f409bf51df4962d4"; + sha512 = "fe56b9438ce09381cbb4865e8bfe051ac0397414f15f0da7374de8d82a1f6f0bc13d8152d8d3543674bf01b1d6fd948981c6e95c19f84cfab94f33f482be7124"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/hsb/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/hsb/firefox-67.0b18.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "241c87157f15a71b51bd74cae7cabc8b19a7046e1ec287031705c6f288cd568d6225b9119f539963622950b15b1dda3f7031034946f407ab15d070655d5a7287"; + sha512 = "24565e1079f23217165c5dbcb9c30d4317b9a5e8d71f9956a22d643326229f519ef93b7d1c2e676a94f95f7c80df133d73d6b6d527adefe371f89767563c9aaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/hu/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/hu/firefox-67.0b18.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "2683ab21084ddcbf86da7ac9390679e65aec30e2fa513d20f230bb23b3f0e21489d991e7dab1b781ab2e927d37eb18528fd29973f02170f5811752cdff53884c"; + sha512 = "67e13a7752d7f9078ac1827e93bbcfe2175bc328b3e45cfd30acdc153d73d1acd18fc318ef6cbebdf12b9c4f482df89f5b6d88ac3144f2ad2128e9f0224783ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/hy-AM/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/hy-AM/firefox-67.0b18.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "b81f1238f396e88a02e55f5dc0c1b2bbd51d247a5ff7b918f88fde8b2464e31fb08aab108dd07e5c8abe4f27330f82971c73d685f927044138abc818e3967b76"; + sha512 = "d9ee9e6ace7d15c619e5e25ed443c0da9cd338a2ae255c85bcf31f990c92a26e3b447c21b510efcbdaabf3604877166c0c67d86c336704990a8b6cbc10b999af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ia/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ia/firefox-67.0b18.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "2c9ee27f81d5662c61ef0e293be5568f53f5e5f0e3f7f6e6247de23e13d9dec5bde3ee93c141e8c11863aecf3ccc7d8000f88b4f1ab72cfc048162afc465268c"; + sha512 = "3f2b35311ad2fe946c6b761f73f2e4c4004a0ecadaefd6888a83d6ed16d79e1a1bf069c15cdecfc9b7207b49b0247f1567d640d73eea445ab0b6c7153ec6d315"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/id/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/id/firefox-67.0b18.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "53c0c4572bab7b8fba5f3fe4ecfe2fbca02fcf344b9a451a921eb0397b3c0af264e9d70191489dc70d3f3aa853f87189c45c3cbd26b31560dd737920c46254cb"; + sha512 = "86c35a9637ef56b7b3e848f455b40b0d857a18c32298c7260f69716bf7ec4270ec00690f5f23ed3baa61eecd0422f23500de48ee81764a893db84fd123733433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/is/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/is/firefox-67.0b18.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "6a71af26f4d21d82d1d0e272f48f2b0c4a7e52a4d1e3ff93f7f45fa5b63d7e50a09155ca7adc38860454044a4eb6b929fb24ac7ff036e09e8661ba2006e1ea20"; + sha512 = "4c8731b2fe7206efc1ab6717805bccbb50dd528abe0ef7d60921066985f30ff1dcd4c370e5f2513e9e5ada2df13f7bcb127bfc893ccbcb671268af3d13691d65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/it/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/it/firefox-67.0b18.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "f29ad5e27344aabdf39f1d592cbd0a458cf63c073ee1e3f01bdb4cde665b885f479e7fcf286301e80f1c31468fe9d171ce63a684b734bfce32fa1a71c8384e62"; + sha512 = "0da9b1924421e704fcc0ec768e82acf743f6c444122c24bd48f633d0694e017b54814d776dc42593267c967f3825c2f4dbcfcb209660d3df27f9dd405c850e49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ja/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ja/firefox-67.0b18.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b9d9e8eedda1273302c5568ea0c39ba1eaac0960351136d1761d75cd182e57bd80c10cd790cd4a1832fd9224f56dacf1829ad45ee932038f22518b8132c37170"; + sha512 = "5bbfc6a34dc66f685060358aba485b1dbfd0b6f5f25bef8239c500d00990a66aa8db9e67d3652ab84441da4aa0f8417d5b6c61a305afd9dd8dfe199735bc51c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ka/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ka/firefox-67.0b18.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "8dcac75ea5303cb47b86e259d381b7e2b4d947460fd9fe57fd236334bf4afd969e4cce2bee5690d619c3905417ec5f0a6791b48954cdd3c124d181dd28fed6d0"; + sha512 = "68b484fa06079cc723327771251000e6096c2bc8e323aee3a8cf10c3991b803afdc8dc7d12e282eb9635fb1a81e90b5fe777b592d7865a525b78ee845e6b0174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/kab/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/kab/firefox-67.0b18.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "a1fd847e02ac23f4355eac80609ec892dd6957c769c1fa3a6659c0e5ff8f8e9ba23830ecfbc7833ec1a514f32f7325aeb854b74a0b69f402e6f92c3c3ffc9aa4"; + sha512 = "f8bbc287251129c314d459750b28cd6287582e48f8fe6fce0fa5bd55ede6ede9ca9312e04e44ce973535f750a8989675993115f796de67b2fae8416d0252cd15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/kk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/kk/firefox-67.0b18.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "ef11e019b1f24d65fe086ee1ef6eaffe662d4d879e57ad1028d0a4ed3d91d5d3821e61929887735eeaeedda53a16b133e4a26c1289f109b6dc161cc0b9b8d737"; + sha512 = "0b45fd12636de2709e45419348e18ff38b69a54be9f7fae8590e6468ebaa2608c0c493432ea639b0c7417ffc44cb6354314b0b89642f7f97705d063f9934a6f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/km/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/km/firefox-67.0b18.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "97f5d8e017528b61a5a33f54ebe46cdae993bad7de5b31bd5e023d9fbcce4fc55673a5cc4dca3488dabe2fabd73f137d38ec7b606dd2968c1269ded59c761223"; + sha512 = "a3f2f417b1f00e5def74ef2851a96e75db1d71952c74b3715646210720da7cd5a182ba9c25fdbc36f82ecc197ed598116d91a004e5946184c02108e2d33708d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/kn/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/kn/firefox-67.0b18.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "61500f9fe70f3c9cc3d96cf923cb8cc38602535d9a7018a375ed6d3e197d2ede9bf7e43af61e6fa6ea6ee0344464440bbd50b89e03d1d498cbab4af60e3179d8"; + sha512 = "bdeb06aa7a025117f8f8dad65db32b42fae8b2d221354cf72c3e04eb54cf94ceec0954679e93847aeee5da01431f76b52f8eb6a7ab9e5c3d232b69c5b17f0605"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ko/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ko/firefox-67.0b18.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "b21506b419fa8107c9536fc2d769ae3a22904291376849df6f37db04508ec9cf0fdf826ca59b6087aae084456b74eaa641bc5f52ffdf92b3af5a1e5e08dd01e6"; + sha512 = "ddc3f9091d9e01f81eb0c8a07f125c7f757f2110efca5eba5967dff550211bf81e8e89153ae4b8e76d53c4187b25791e580cf0845788c55c1b65242a80712fe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/lij/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/lij/firefox-67.0b18.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "7d190979e6d3b1064a7e8377fbeb35d48ea2558eec730b6486aa4a8e710cceae612de374ad6353d13168849b856a588fc4275e5fb4448d8c7a888925c68d4219"; + sha512 = "7ea1e6cd38910148e6e2593d975bceaadeb3a2c6fe66ba9199bbeac5be7fc4943213fc81077970e81df1fb8ca7168becb3e77c56bfe51ce38aa17a02237af8d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/lt/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/lt/firefox-67.0b18.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "56d160ff01f238bbfde59aec30711ae2a5cedd5997b2989da35d91716742ce467671909905e3fc323227fc819e420af927c294e7057b698255d3e01bfa524aab"; + sha512 = "a8dcfa87273f1330e5321dbff06fcf82f6a4164f7b0c2ff9926b211d1b151a9991be1f0904d587b7755583db457299c67d81417af75bce7b1e1056508b652e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/lv/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/lv/firefox-67.0b18.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c814420be7fc181e5ee7f0b8ef56f7aa2506a5de5f6a7586befbfcb2442869998193f6412a54b2dcb4d0bf52094e539c5270d35ed1709b70187643ba476ea262"; + sha512 = "f4c7d14014d0c4d9f22f90d0bd01c2bf720a36e5f19463f57c7f6f76693e45e06297613fc1486ebea2637637bc0ce50ceba2ba88cd2f1f77aff3c25155363986"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/mai/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/mai/firefox-67.0b18.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "c0a44bfca4c3db9ba7cea0e1249b8983d322d0414b03fa868f72437961ed98afca2ae91c7ba0cc13137ea182f14d709906b080d7e41b82f4dbb49ea73190ae40"; + sha512 = "06b5c4c32654e88b3b6c1c67708142453cb0da9e85ce287f11a693f88577d7f614b56204437ea0ac4811fc4145d36ab78822bc3b9d72c3d71551ab75d6860db0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/mk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/mk/firefox-67.0b18.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f3533ae65afeb45d3bfa8f6b4ce59083f9853a2e803e90a9cfdcbcb0ba58a30b0c6b231b5262366a3f9f337a92aaf7d8534b7ebfc8fa4ff617c1799c6a05d0e9"; + sha512 = "f6ba1d2dcfc7f2b0a4f70c6f86b8ffc1a3becec61cf17780c52bfe03350b0f1cdbaa48bea7a1fc5f0ca58353c8f57386472d34b04257e8bd2131383df7855006"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ml/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ml/firefox-67.0b18.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "3214165c93f40c6add58de638d956f98bbc76051d57eb8251bdfed97dd0409d6167cde18b63cc2ef787756e5f62807ce0ef01f749e4b8312e265b648bd8ba55d"; + sha512 = "c40d68315d5c6118f2c0a61cad7118427186e558aa8cf9a89443f73d4ac012598988a87a03547e366142eb0d7a8ee776e965a07efdc2d44611c51dc9cba5469e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/mr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/mr/firefox-67.0b18.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "330dfe55f9713c9353208e008b96565df738aa9d31d0b247e8a3566a190e8c117d2a75ab9ce2bcbf47d69bed1a527d9e39262838b8264cb896821bd16037503d"; + sha512 = "603980ce2bc2e3b13019e2de439136479b3b650a76d0cec91f8699fedf8651fa3e872662160d19d022bd90597e59982f0f0ad2ba4cf0a738bf5292b15c4c22a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ms/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ms/firefox-67.0b18.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "75150905e1f61c75ff61f2b98a14e21c3b2a8366cc8e22871166efb0796e55ad7b77eaed3f12089a481ff219218c60d964f1a62f6582954e43aa761c348d8792"; + sha512 = "62698a95379733edd5f63abe8e9f110d5bb853272d0b8bd4b40228251a8055464520a9e1b13975dddae88a624edf8dab2a9c751ac3f5fab4df4bdd30064a2fe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/my/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/my/firefox-67.0b18.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "1ac0e5ad914680e2936918702dd29325119172ec9959f4108b1da6f36eae05c50b10ad48f3faf433321b0d5706950d5006b0d47f5f310097bf7f3ff81f05e870"; + sha512 = "1bde440109a874ea1eb9ea7db01bce2338f810985fc5b5d059c8f558f9ee1fb2bdbdeee2dbd7fe7b788e31895ecd9c32c036d1ab9dabcce850ce49abf9f7da53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/nb-NO/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/nb-NO/firefox-67.0b18.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "3d22b6109d20e08b81d36d41e41c7f864f360f6f66dc440ca30e996ea52c7bbcd8d1ef7ff38318ea443843d0cc3ac8f0e94fe53d1dac9ae09a5cbc595b08ce6a"; + sha512 = "7196b732947ccd0e94022f6687a885d5af1c1613b605fec82bcf97eaf8cfdd170f22963ca446277d884eada376e3ff0f4e79da9effc712547fef56adefaee62a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ne-NP/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ne-NP/firefox-67.0b18.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "b2ddc6467914af5e816bf5acbce901e63a9d21a1f47d6125c30fda4ef555c2a386fc2258ea613a8fd277e5cfd7db0a917159307268595cdcf67a8c473f5260da"; + sha512 = "27220f803c33302a9b8636a77324934e94cd2ae395c43bea25cecd977966d2198be99ca5d9f9714109e00349bc66de6391d7b7aa1649d2e0530d8d4f3726718c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/nl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/nl/firefox-67.0b18.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "79525094158eed262d1d269368cc3cc3248efbc7b667cf2b6c455de6c14533fd0fe5a6536f1b8e78baa804bee6244a46ccd7e5a261cfa20fe61f2985d52847bb"; + sha512 = "c46f47170d990d7711d7cfa7d3f7b7d03a1dce021a8c7d20dad1f36db5af7f0d5071eb33689bc7f55b89074d11963190f31abf26387fc4bcaa28a6e3403c88bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/nn-NO/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/nn-NO/firefox-67.0b18.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "78c8b082f84c1120994a21e231bfc97d76f785f675a3098f225a4213ffccd34ca2a3beed45520286bf9edfaa70a924873225e162328ed04c40cde1e8f0eed486"; + sha512 = "4769f386b959ec8229d3d6574fc93327d90be06129ae433906fa1d36af7dd03d3d5288ec81af3097a7eefdd8bc7574d035e279b6e4c923415038fb8e6ee779be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/oc/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/oc/firefox-67.0b18.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "be2f575c2c009700a3da80db3769d1e8383fce60b55a59768752fa4b637d4985c380d63a38a1c348a3f8141f28cdaa4efdacd28b6cafdcc62ae683b7bee978e7"; + sha512 = "d44203376cc4e58f7cd5241d7e14e970dccf0465b9b156e5004dbdf56440b7e5b713a45a15d8a5d0100acffebc804fdfd1fb45a61439b7e7f9b0c17f8f413d1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/or/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/or/firefox-67.0b18.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "93c59d7953133c827ac0bfee3687b7464234928beb2a903ccea62a483423408db1750500f028b5fe7e4136c08179936de5b24fe5e0a76b931eda21a76eeac039"; + sha512 = "6e4b49731a4fe471af22734ce48e67751d7ff5999db8e55b74d5e18d176d7e8d354b150897b6863e2913703d5d43211fc90e48c986f57112622f5ef820182cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/pa-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/pa-IN/firefox-67.0b18.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "c451fd5e76bf9ea7533df6b52e08c61e9ec5632588d45a491ae755d980476e946f951b85f08e03f071c4ed67e969dc06fe2aeb603bd997afa04ab14653d4b37d"; + sha512 = "09ecc51e3cd84c20dca84ddbabc89ee98201d2de3630ee3b07f1a03838624a2392023ac0912566d9e1d3422f3c641698485cccc0310519643dbb067742b9b739"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/pl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/pl/firefox-67.0b18.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "b957cb08156642c30b2c8158875309eac6e3e30cd9738c30f433125206c3a9798d3325e436a55d34cf8c4559b88b5c6e4e86b64ce71fff136e48bf8db90d636b"; + sha512 = "818b35596e13654b8705af0fc731e0219e304b34693e48006c508e5e516e3a7b0d89db32b514d51a04bec569e88ea86b1239edcf304bd99bed34811a0fe33473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/pt-BR/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/pt-BR/firefox-67.0b18.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6fea1a12942e05b9023a55e6f30e7b1661106c4007a0c4b0fd2a2f97f8a280b681176937c4534acb756fdf69fd5ad7cf33b78edc5709928926d2ad42aca632bd"; + sha512 = "047eb09354fa50676378c7e3082dadbcc71088c0d25398e1e6bb25f0d44fe26b9aa025b222970e9bb33d9fb0f48f60639c28024c95ae47624389d311f62753ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/pt-PT/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/pt-PT/firefox-67.0b18.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "4f2a416dbab14767b83361b303d5d2eaecae8397a6729acf3274be7f6b9ec739b0312f94f1116afa7bccb5773fb7512360f4f8a403ff81c511a129a1c1d46b23"; + sha512 = "0674dd63e12bbc5169817557d1fa9ada97d1202cbd97b8fb36595f234adb2716b6f79c6b7cc1aaa48e9513e8c6fab042852483fb3222ec868a655d43c5315d81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/rm/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/rm/firefox-67.0b18.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3eec49e997ee34e6f79475cd1c3224ace06d030f1c62df8e58b89cd83ffd2ab365a284932c08f9b8e49314a91d3f1d03c137cfab94729a5215a8dc824401ce5b"; + sha512 = "18ba376b1e1edfe731428d486f9789fdfc0a2fc7fffdc0717431ee3ed60f737e3166309aa9c28f7ceb321a7410ea7c160a85368458b3d7f7e366ab81fb48b802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ro/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ro/firefox-67.0b18.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9662eaf290ec38500decf8d474ea3d635d4a4c6df4125d4a36aca9635f02d80129d5a92ece301ed1c0bd4d6990432479825b6575c5bbe40d9b93ab09de7fbba5"; + sha512 = "46b6b7fd59e6c5367e95a5d5c5891f9339043faf1ec2518242ece74dffceb8582b46289534978e7bf39e8c2bc61e0d011ba3f1adc5d34022b7f857e5b25f237d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ru/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ru/firefox-67.0b18.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "a0840386db86e383f6397fb440a86efe623eea56e5b9246c0c2219b50864269ef35238a1028dad5b858a1ebc347a44b588150e1140679292d7f8e43b42b4b216"; + sha512 = "1e8df6f7cd3902d6536a5e9355a300dd8a75a97036f58495967a30ce18086bd9610bfd173df57c4a34cd6a1c64e0786d94400da312806a2430493e684c1d6fe6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/si/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/si/firefox-67.0b18.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "3a55e60a4f8baf1d0df17d1317da7b5cfe5bb7e5fc7be512599c9ea566434c8ec98d7e55ad51c3709f46ca01a96b5322b54e44e8814f9f11633a20e4a1a8d83d"; + sha512 = "06871c8e05dcee61c3d2e1431fe051e5cf70b2d623fa0e07ca94ec3a6d6b85699585c41bc9d978e33297b1547bc2132c09fedf5160084f911de93fd01cbeaabe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/sk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/sk/firefox-67.0b18.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "df88f7d9667717c8922e6cd575ebae714246d99252b7f65b3d12c4d1dc9717fa06ecb89b6cd07bd37c8b5a3744d4c5380a7e78847398c42f112c07853ee5724d"; + sha512 = "6f46bfc89960fe7f35c3498ad144a1195c2c32085b7c4b96bf73cf25734a46dbfdc17b555f3adb53942a96dd87995fec5ad911e22e7202859d8aff4f7410c96e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/sl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/sl/firefox-67.0b18.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "add245941b10147cdd7888dd2183c72b43bd36e5a57bd28234ae8ff45c239b20242599a07aaf499947118cf613df483188f945381c43590864752b0178eaa8e0"; + sha512 = "bcf428d707e38bd783fbbed5c21a43cc171840fa24e0a382b56945168ad19aebf07dfa6b5ea7090a767e10043d89277556d577e404775fd466badc9722fa46db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/son/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/son/firefox-67.0b18.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "95a1e1c4a749aa0a8107771db090a628e3980eda4562f413d9417ae71b812a23cc5e9210c93e5aa1e3422503360213bf8168a9f2ddea0e83e06b3a8caf5d9f66"; + sha512 = "22ab850e4c4dc0af44830dca37323d758f7350f55c15d50dff5acd5d44402059a24d5cde697812b46e7eeeb92c9e75a5e2acca0582769191b96d1161692394d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/sq/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/sq/firefox-67.0b18.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "59f9898e8ea2a9d1c9cae3f3fb9b7ae20144b38656efcf9095cb4e534cb5b92d6aae695a37fb21bb2196300ed01a3896b7ad9dcd4a6d3e5c68dcaa1d43931070"; + sha512 = "46a3a290094740d45f50a43b6f680889da5134cb158a81776c253fecfd61fe36a0a6c3d6be717e4aa4f97deacee9aa53808210676562086f7b43bf40f0fd8f1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/sr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/sr/firefox-67.0b18.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "da5ca0f67e6b452eb128fde6fc6e0657cd296e2d4fa2e3fb9aeae88563ac0e2cd91a85915d3c758a558795c92a849fdc2d22bc7a650fa785a08fe624bab0c452"; + sha512 = "8d3cf3a5269ae6c4455048ba6b659c01de2897809c10811e602dd755b742034d10aec16ff5cc9e2c4c8222764938c5335693f33d8ba8b4f9a749700c43f52d4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/sv-SE/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/sv-SE/firefox-67.0b18.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "4d5cc5cda0f85653a8234af9b674b8c334ca7561d3cd4f69245830d3d31e8f1f7ff30fe0615ce154ddaf0d50db2e717192826b850b19dff7aaf71869e401f436"; + sha512 = "3391a5258315f095fe4d560f6c2cd8e70af8cdd6b062e2559ba3955abb162814a15907d8a9fef933d7af39b3a5b7f7a1fb1e531edf7a6e1b5ae1b96d4adadfd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ta/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ta/firefox-67.0b18.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d106704886b39d6a4dbe0a98a5fe465edeb975346d28659fe866ed8afa23e7416276ec11b17965171a5cc3f3ffadc4a58beeaeaa0ee8d879783c301dff5ce488"; + sha512 = "85c58141e9a871dda3807b4d4e0d8b4f98a18fc963953afa44efb0f755cc60d793a6ddc0d8add21136fb5f98c83bf033cbd62ee3fb1f70465127ecc47c5932b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/te/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/te/firefox-67.0b18.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "c28dd4b81e4583aa79a7c8e389813ee3c7e66ce27435fbf4203dfd7b9924eaa88f4509ef879cf64303b155fcf95bb595e74130d1fcfce0396326ca8710f65e3a"; + sha512 = "7fbd1c13721120550fc755f7b277b145c3f6a23a176407cdea7b0cd36ceb1af8ee4986d74bec056e7d9ca823550964785f93d2e906a26968b3e45bb51ac72920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/th/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/th/firefox-67.0b18.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "750ec351b5164c1036e6099d8150e234f8507acf759ad5a94d90f5cbb75bb2e1a81c1728dc1c4167f66bcac4ed0c9eb436e58507b0ff1cb2024970582dcc1dc2"; + sha512 = "ebaa8f5c8b4504a5a69d4687cac4ef3c9adb51043331bb099535558b4255f506f9a30909df98b0f8f6345370e2c86b217e4d59abad69e88cbaea8c3bf05f12cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/tr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/tr/firefox-67.0b18.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "eaed8385e18fe63b481e2a4cd8bad587cbd77187aa5979b6153ff444554aa3ab844181b651344f111854c7cd605006ce2c43b124f75dc7ca30698adfd222f8b9"; + sha512 = "fa0d0cbfc24876a0bccafa7d2b1264a92d94d5fcc394e2fe87fca0f4ee28bb7157c20a55cef88cc30d01a9163c353f9013c122ce4072647cf4922b4a0958093a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/uk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/uk/firefox-67.0b18.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "674c50f7ce0b29dbca906db85acec63a57a313b3057971f9927ab8a08af346e4f4375b55c3711d59bf77507a3e713b497e78fd98737c3520f56ed918d2a417f3"; + sha512 = "5f0ac76a263df2c9424897994a65843e5b83a7f6a31cf67cd87ba42f78526566cb1ab0d8253c9292dfd8633c153de4f9f1c2094794e6cd008eda22ce3d121605"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ur/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ur/firefox-67.0b18.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "4a5ae461d3f43ca4596ce3e82d56ba6558c971b32e3bb7ca035fc6e4871097c09f3341b27e2e4bf2eb06df31b3b2eb53f82d7b807225611288be05333db07870"; + sha512 = "46b0f84deed0859b03aa5418e73b15fdb925f424dc2aaa37b48697a6ddb2d22c2cd1f98d8bb8252dfee80a070a2099f29c0898b79b6cd91dd1fcce2f65418472"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/uz/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/uz/firefox-67.0b18.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "236f58c13709566f9cdaae2b8b03742f85616a917fbbe6c75cfe662f19d10cd60ad16bee8e454a8e9233f3b80184e4a037a91850763d9572935af56572db6c44"; + sha512 = "9faba9b67cc972f0e60e2fff63a4808bd0836ae5467dc400dfaa82d9249dcc7091014180d04750ff94c4d7b5645fa18ff11a950297b6598d731726093a920dc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/vi/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/vi/firefox-67.0b18.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "1969f62165a73c88004dda2e173732c9b7d133edcfc313e1713d9b5c24cb6a5db19bb287d693a1f77cfc9fc28bd3c7ff8449051df09392f00d023add981d4529"; + sha512 = "40ab917e85d5e625bbf29c6e89c2ef816306c22f00b84e3296523ee50ca3de44a6e3a09623225ae3b2a435c098639c828026b38e1fa987cfb6f1d46747170baf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/xh/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/xh/firefox-67.0b18.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b4406d3c5ba0ff5088f91a8df30087a3029eb0f36a659e08666cbb55dfe1461b69501d2c95d22dcbb534551c7df0d8330d226883d24c3458e3bbe5e2c481d27b"; + sha512 = "da5e9e56e4016650602a28e28ec0a58e00ed1f42392ef410274abb33c4b5fb71732b6810ad61cf172b618cdefbbf943386601e114dfc9564723b3446be1ea1ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/zh-CN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/zh-CN/firefox-67.0b18.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0c0a4d87d4b973a79da290692375358a6cfc06758be48a84b0c56f39875d3488e845f6473ce432b2e2841023d6cd7655551d13d0a464b533b3bde7efa96e912f"; + sha512 = "94315e64a5f757b90a06d94a6bc750e16a66828b6bdfc0ecc7a0dba34c68dd0c1c93a6150ece78c58a372276daa7a700609de9477e807eaba395038ca99e0583"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/zh-TW/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/zh-TW/firefox-67.0b18.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "46539cc0cdae004ea69c792aa7f9f158994fbbf3a28f2db43efc5a6a9337f59d6a0507fa94db3a6e4bf451ceb4234841c9e3417b21b399eada809b9ca4511489"; + sha512 = "81c8b294c88985bcbd8bcb73767a5f4dc0cc767e16177a548222727f66316fabff379f0c74e4087bb5d4d6dd19ae59314dcc1a43e13328b9279750f1cb87e4f3"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 41b2ea1dbb8..3f0a39a2b44 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "66.0.4"; + version = "66.0.5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ach/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ach/firefox-66.0.5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "789ecf57dbca48a149a19d60e1a25ae5c1aff21d7ee4dd8e1cd40674f0ec29f891b7e90981e48dc69dc930212b7345ee0ec09f47e09cc8492112d2454fe4f5ad"; + sha512 = "81dd4f3df0953e6234484bf0f55973123336e374ee38e0ca7c1aae3dc12e66aefb18c985be7e98578c857c6d2cd86d5319ac9aa2170b4df7eb47fe8fc7373b08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/af/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/af/firefox-66.0.5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "2bc27408660e583abc67b78b05e88c2d8c75a71979bb286609b68d978ccacb2e5edc35494ede290389587b80e6ba3a27cc6bb8f1853fc58e8f138b873b36e2b0"; + sha512 = "87cc2d6c5aa0c5a8eeb910af6780144111f81fcfbdf4aecffcc046b5317669d29329347920117256f2442e8b08b11fb9886c7f9558647db9847637b07aac272f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/an/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/an/firefox-66.0.5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "4d3b215c6517633e130a02fa468f92f93e366b645865699729cb4eb4d93fa638ad3a7dc9b15d927cf871412e9e4aef352e882d3804477c6b0d378b47445f325a"; + sha512 = "b15896cb8c138b444b779362a38bac2defaf012818696d303025dc1e1dda7efd57032ebab254d393d8fef31356a525dff87aa65d60dd65198cd0e47bd87c27f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ar/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ar/firefox-66.0.5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "931322aefdc370f4618d4a595d750840e2d9b573e870531bee97832a878e0ce4787947c09d06ab7d27319ae5e2e56a5a2e1f35a41ab91fe160f843eaa749e22d"; + sha512 = "d7f6e90064ce4fe123922f786c9395706c12ef1093b34ce60564255325fa14da9c46c24344a45f27a2e6e1b606f1e8bf6c5891c278763e3f4f70566c3b128970"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/as/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/as/firefox-66.0.5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "8b7ca252fb388aa6e29385e78e90f66b377ba1e0bff05f185e7b42aef38eda2bd833a24921cb3d497d68aac3e1b36604d9b9019af3e0a5c8dd6e074c134455f7"; + sha512 = "ef2eb62a16e865a6f0ec796dc17a91da99b5643326a102019a55d3c477d68b62a566d0c73feb5aa1c23347bc7f358e1b6d116608945e03e4136baa6ade97d763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ast/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ast/firefox-66.0.5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "42f9447742379e80ec51c9604f002689598b66c6eb6948bd45c276aec6a61390a024aa11256263a4de358d9c219d80d0a784427bf446d63740529cd440d21263"; + sha512 = "fd5a01a343911f5d0cf4afafb0994cd236ce5f477a020272e56222eb216efb27b610a6aea26273c76b3947f62538d613d4af0a0d5ee16f6c985aa7b637dc4832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/az/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/az/firefox-66.0.5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "1a27ceb32a711ae960c9637a3557a962142ec959590602a09459af46777477d0320283f6aa1c54015a73dacd3928297b5a1864a0237aa5bc6c48a50ccc7c1636"; + sha512 = "2674b4404da94eceb54bb91208d622adbd0c433691e6bf09b93b784c112f77c5b6a7f655000a8a1ae6b2957c96637ba2b61fcb18d4a028a70c8ea6b4c82f7c72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/be/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/be/firefox-66.0.5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "f7b8ed7aa47d67d5d71e0887f66e89697add0af6a1de04bdc80d07c6c0c6f0adfcfdf2e1e6bc6194bd624ee8e442f0f0901b550b4621d40340e1e6c37b12f777"; + sha512 = "b79bdfc175ac65bbf13a50eccbcd47587d05e1a7e937eaa91598f546c2ef33b99c5b9b5ff14cb155add7602132dce98ee298764c40c27e72c221f3d64a3ed7d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/bg/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bg/firefox-66.0.5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "70066e04e0f1d5a55c09d19668c05123ebcfde74cbba0b1d685c23d48832ba8865576af4cdcaccfa587dd90c7e4cc8477d7397102482933f7fd98bad13260dca"; + sha512 = "206aa03f0299af698149d93eba7b232835d5471e60ccc6bbedfc1566e0375a88e8bcd8da882f80b500fad9e850c1ff6657eddce499abf6ac976b1fb0eed77e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/bn-BD/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bn-BD/firefox-66.0.5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "2f31746734cab6b027c7f1503629bdfeb25c6ed8f1d597fbef7bccb0ba67ff02705e3bae74b4c9598bea7063b9e2819fadd582145e6eb81381820935ecacef5a"; + sha512 = "54f8f199008519e57d474f49ad8b28163fea3ea158a94fec2c437ce81336059ba8fdc70cc080c79667dd8172aa89152e0bea08a67a2f140628682d66c0da07c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/bn-IN/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bn-IN/firefox-66.0.5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "e80862cc2f26b76f7d77404ac693acd9086ff1169cebfbe28775c4199f79907503e034142e522f81fad67c2ae273513c969f4c4fe073ef87e8c619b5a55da950"; + sha512 = "e78887887b3793bcc659f9dff24661aa5175f4c614797c47fd7063e36b668c865cc61e65ad0b040cccd499ae99d41aae215c86f43f837149fc612ce7c02ea908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/br/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/br/firefox-66.0.5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e7602765bbd77f1e525579f4e20bb151d9201d072b323f9d3625aefe53808159faa4bf22b9ed9f57d85df75aff2a0246b6482d5880d5d9b5ba114e5f815fb3ba"; + sha512 = "da4e0af68be8aa38db212beb0a6d9f4de14571fa32ddd28d47a439626111ac0fedcfc7976250e03a40aff626522840731a1febc3718fba5cde08f02cbc045e1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/bs/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bs/firefox-66.0.5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "ec5852bcbefaafd13879256e6c6d58ade9a825204f5bbbf01297e0c19de48ee72b47fe1dd26c9f00d4df8605563e8cdb9cfa314c1134bd17d5d4cb80f55b997b"; + sha512 = "68d1a09118c0a81dca3edcd3eb0e36384fcb370c708956c84681b6f41a084256df2c463a8539fde497a34015cdb4523c340bd34080e433b7eb71e66db35c89ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ca/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ca/firefox-66.0.5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7f119a513b64a61ba8f23adda7c8f3681fcdd66ce945bf9060ee4b0cfd2ec8550d55e820b177f896f2f5d43b538ffff10ebd1b2bd5840fc6ab026a7b2e93e3f9"; + sha512 = "f76264197f35bb8feba8905600fd4cffa9561e17bfcc811a880a81c25a9a9c12bed29db9e4c53c99ddcc8796f45fb83003301df2cafac93eda582ca6ad92334f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/cak/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/cak/firefox-66.0.5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "52d73516f4e268410fa0bc0ddbde9cd8c1c70721aed1d28a750e98b2bb8ccfa425082ced20691c4f3074cefe2c7427e9b7ca931bdbf9100249b2aa385a5659b6"; + sha512 = "779e3e776877aa1116bfb9c21276f6e1b2b9813c854b38894a2c4beec39a52d15ba3ace536a58011216defb729c4a26a6d80becbae967b0ddd2126d9ef8056a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/cs/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/cs/firefox-66.0.5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "583e6f3682e9126310b11e8ae515dc2a550291b9f6069ac8fbf568d8f0696e896d9b3a410d2ef13a1475e793214674d21e2c357b4acd5908ac6043c259b043d9"; + sha512 = "bf4d60effd3628602be7ebae080bc429e6d0795ab2c4bc4e703e0a1d92b1cd4885dd3af10f22e939dbfd8d83cb1b79c90cad424fd2bafa976f9bb9dc3ec78c94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/cy/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/cy/firefox-66.0.5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "9deea20b92d1e8e48bbd0288959ffe8f9795221b4d57d1f2e92b0f6de65caa180684b5ea2354cc442bdd5941722be160b95a455ed7464a683906310459000d0e"; + sha512 = "f485f1e307db31a6382542a2ed4c103483342bee05790661db1f12d11585d029793096f6e0d881388f317d54878ba10dd7f6703b488e80417d1af4b3f83771a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/da/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/da/firefox-66.0.5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "95b0e4aed159fe34cf925174f3ec20a14b296c27541f1aa2b369243261d305751415805321d02259512a18cc422bf0272f3b92d8918f03ccb65a9ff084315061"; + sha512 = "6870622105879e703072153b0fd8b5e00b1e5621270fa187d0795675e69e39943e3232404d8702defe6844f75335292615d7c5f128fb3881eb027a90d3fb9710"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/de/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/de/firefox-66.0.5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "dd21fa81e0e85188bcc61519bb4549bbfcb433f88677b79b91da5c3796df985e60b1dc1fec391a70813d61f1a902dd0eb69815c5d81d96a0937373b491d70cbd"; + sha512 = "58a9ca0b2faa54193854f5467d9efd989be71560afcd32f013bcfdc01a8f51a24d54850bb02527c58a1c39f698b66144af899f6820ad867edc725a7c0399442f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/dsb/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/dsb/firefox-66.0.5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c7fcbf4e008f6c2ad9bfb5c37a57f257011a2eef811e5bfc28cdc05812283db5a69aa0167651dfe9df5dfec2aac74ba128d9bfc396ddda1475630b89e46cc6cf"; + sha512 = "8ebe982a0f7d0520654093af62ba62e2d9415ea1bc3ea1f12f14d64c15d4db70f64abee3ea9141a875cf487f72287fffaa2085e66b610a01bc40b0ad2c944efb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/el/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/el/firefox-66.0.5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "889e9e88105d12523b0394d4ea8ff2dae753f560c624b2feff3a8c48640052e3dd871446b9b0b9832998d909f2c9cb5dbc0e03f3b099b940bf50779a9db44eed"; + sha512 = "cafe8a9933947fbd7acea7234ced4ff7061a3e2136e5fa5789fea64aba96b1731e3a1e7120f4dec1dd0353763435089354998e2d151b1a884ef927a799edd1d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/en-CA/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-CA/firefox-66.0.5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "30e54bab160ec76f15c7d44b8ba8840204e297fc3cddd74cf35cb86c9a0677a54548feb3a4b6ab899b10abba142635faaa68888a6cc53ba0f6f9ee401338cb3b"; + sha512 = "ffdda6e16d9b43c23aebd5e876296f9dcfdf3cfc54577e4031ca25d004aad53ba63057e2875840fb054f8fe080532361c1fc613382ca23a521aeb844e1626dbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/en-GB/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-GB/firefox-66.0.5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "2c9548a80d26ab338e662c4a2ccd02185afd6bb07812fb4d2118f0acac01dd32f759efcf6921942f6b7db144f293193554ed5678a9762220c9a7e997d9eaca1d"; + sha512 = "69351e93fffcf3279abc7b23a81c262b1e804cbec7da3b55b3a62a3062a59dfc6894fe41975bb9f70bba01364f0d5bd86f0659b82f9bd9b9ce8a14b66cb24506"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/en-US/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-US/firefox-66.0.5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "938d9efd9a344ed755f26a2864d813f848f07907ecd795d74edb352ff44fc7cbf85d6d4bfd496a85a3bb6fb2ea1b14847705c627b40f1af53b49301708c3c1be"; + sha512 = "7cbb43a8c1ffe1884c551421bc32f8e48239200af62800e8ff5b18d461b1ddd7b5d0c9afe0e262f98112bbde2949fedc740209e957bcee0b2c30a19e17bd5428"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/en-ZA/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-ZA/firefox-66.0.5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "2dac84bbed983f8638a9a9e92c217bec73b026eca7d66f585934ce4a89f21bd55b69804df00a61c9613de0c9e5fd331dacc01f3b08f36cf4489b86c85b05d688"; + sha512 = "8bf0583385c31dc6cf3d4df7790d06790a9387f59c54f18f30d3df05cc110bda2fefa6764d732c90e7f6eab4e42e594230da966acf1ebae078710f99793919d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/eo/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/eo/firefox-66.0.5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "82b4fc79e2fd0aa29e88570ed3b44967ea888a7df70c74fadacd929d7b64e86aac2abb7b92362fc607c858de5c8619c63267e7ceff951617517569df06accfe2"; + sha512 = "2a72aed4c755f463dcb97549d7f9fd644ce1bc0e259eff7bfe5b43148a5cca32315779121fc1d02c189961d7aa6953d62bd7f56c6925a321d1081765f11b2b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/es-AR/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-AR/firefox-66.0.5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "78fba3adce26eaaafb72a08a953ee8801c401b650a39c9ae4cac872a86456813976db0c7e98b4255b4b02525c1fca3f3ecb5df8f8d678cb60e29edf5e9d2e103"; + sha512 = "f5b297e47bc51811e2096f9cf60686b0732a6f7eabde581ecc585b192341724e5656d251b7da545d99dce840b2aca2692c5e6b4eef4796b58e791dd59709c12b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/es-CL/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-CL/firefox-66.0.5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "3f59b8a28afc1255cece3534e639d4a9bbd48f4bdcdaf836b5c5a459d55599c3cdf84c8af45b30b9496f95afad11afa51364b2b0acf9cd08c561dc2f132347e2"; + sha512 = "94ba91ab326ccd20ac60da18429e9a787de3e97057eabc24ef38e6ba44066108eb18e8d58f2148a8b7a28b47aee65b12673b51b1a3eb8f733af199ef0b865c4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/es-ES/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-ES/firefox-66.0.5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "7a01d61bfabf1bdbe9e485ce2cde726ccd3e937e8b951ae2b3cbbd1d7976cc010ac82202fda51f07cef5f0895ce5b53db506bf5d949967f2232c999b52b2d713"; + sha512 = "f40a14cc05855ca16efeed2c78a4342c1f6439f6f380e42ceb47433e1cc9088e17a91b656ce098d02d6b92b927bf33c0288f2bf2941d99e10b9e536ee71108aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/es-MX/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-MX/firefox-66.0.5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "6e1849aa7c85b099a61c616bea86f3b809c7ea464b85291415f590d7ea4953005db7ae2fa15417cad9ca0a6d66b17fc3447bca31d3579ce6573609580cde3cb7"; + sha512 = "dd3ca519b32a1951844a0bc54690be59a9843000873091a830df54fb8cc92b866fe448a5216d253a3118d533baac672e3c56464cceb5d3b920b5b6c51a3b5163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/et/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/et/firefox-66.0.5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "2c119e3902073a150d3df9e1d458b155529a2c747f2c96508dd90a0efa73df0fccf7c36ca7e8438dbbc9e463567195d20ba9e4bc1b9a908b13aa4e6a43ef58ff"; + sha512 = "5dffa53a49117d2f0c6442ce343c08c5f5764535273ab85f7e603736fac25795fa672113384de47b649d7214c84af3d249ef1e9ffb43db7d81e51e59184f8322"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/eu/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/eu/firefox-66.0.5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "cc82250530f1a869ce578f05d76e835588e01b359a19748d1d418b9a0b16770878518fb492fe79108b1ade4c8b9ed780b61a6e414b89a1b259aed5eb73510b40"; + sha512 = "f401b7084044c346343c52dee074ecc3478dde92cf9ee9f624749e88ab2ae5c9f70b7a979129e84172d785a81228edddb9023351b61d6c74c2ab1137843f67f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/fa/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fa/firefox-66.0.5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "bf990360a952060ee71f8f761ea893401775f317d3e1409444d26eeb3f7ed8f641b70226db1549ecac4550cabe8c19308fda99f494560c660afef4a886d27d3e"; + sha512 = "af65c1415f5fd26cf0b14dce1855266a2e295817405abac6402f20f7a409466e7d7dc06a9233b5cb9064f9ba5e954246db20ceea0f0bbed4d42e93cda77e22a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ff/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ff/firefox-66.0.5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "22213c96652c3f1dedf400281dfcec1aeda20661e8f9e24cc32d62585b70e3d09a2dd2537f09918a6a9550799162ae196a62158a2e1613f9ec23ea9191f3cd35"; + sha512 = "6440b9db16a365f44064da652ea4b36b9976794896e062d627e200d6781d35fbbc98ac6d148c45de38788b204005ecdb0857fe2e02cb7240536c00e5ca3fd8a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/fi/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fi/firefox-66.0.5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "3b82fd86b0116eb36da8fc2ccebffce4bdb00ce549bd69264a7a837374241bf02f24b2196a4d2e80dd9b82a24674f74ec8035d3f6f252878d28ab9dda028545a"; + sha512 = "756a89e20d96e548b27570a907595b9aac701df8ad9262f5c82ddbd25d508e07b603f8d24769d756e83e6e4e9076144bdf39f66ba4f1983dc447646d0eb88b9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/fr/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fr/firefox-66.0.5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "db70c00d7c60083ca8880cf324f1f510d5ae66399b76790d6689e668aa6e7380ea263f0f5ab18a0ebdbcdb8ec66e1921b4a56540971cf2c641cc026293aeb885"; + sha512 = "2c26924902510167d88e660fb5236e6738defa5cf5600daf1cf9267e7ea05541109d5e736b7f78e311b2e31e53216ac22d9236f91a51498c40e376fa1a4d9387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/fy-NL/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fy-NL/firefox-66.0.5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "14dea2ad6c8da49716adef7d20efe88933dc69ec7566c07c948c296d145b4b24268c0e08f0123605451699efbd758a3af2229c23d301c8b122cd99596624ff63"; + sha512 = "e45b45c0b84504c978906dab3057c9213301767efc4e63c760ebd4d8b44b59ad72fe486877216f6062a592ca173a13fa5341ffaa1106763a43c215201b390079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ga-IE/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ga-IE/firefox-66.0.5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "70110fa27b8cda7b0ffaf52f2931000d886be4763741ca71eb7ccd6b58ee1a0e1e82735599ed19519b4719dee0ef9d0bdcfb599ebbceb7663013f2d5e26bc848"; + sha512 = "3e2ec6aa813351add3292f8d646761a5ba0c371f0017a965b0b815c9d6324bcdba42f3b585cd9df4a187f1f0b40d3a78dbd6357b4d46406550ce6dc52111be34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/gd/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gd/firefox-66.0.5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "063f8ef3adfa83637fe15f89ad7b7baf0d9ebc7a54fd743f4b88637f4a29db925d459612c480205744136e6f99f84ff2aa755a58ac89877cce0ac0f93bca5d9f"; + sha512 = "1aa9d0bb86c56182c28efa5f92dbf58dcbc83bbc187bb942f5e418e75d586fd1742568ce5ac5871133cb0703f83ec2b49f1337dffd327aaade3359e740b50fa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/gl/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gl/firefox-66.0.5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "79161f599ba4a916d8bd61b761067dbc3ae05ac4eb0345c941c87aabb826c5a41ce2f3d60dc91062d4e579826120c585e28e2b4364209852966267abdd3ec767"; + sha512 = "121f5f6c384283cf9002cf4f1bceed611e28d1afa837e2d19cbc18a0d6a7ca291c5d7b75d110005369cc491023bf84632f0919ff359ccd12ffdc449e4d1a0cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/gn/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gn/firefox-66.0.5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "5a9bde18ffc4f15875dccbff737122d199125e32f3805e904bde0e3b1eced173ababe00b3170f97b140e08861d27a63cc2aa9345231ab12e34785e17e390d3a5"; + sha512 = "66ec624b0b903a215659ef34828fe83cf64e7d43cf264624deae0a37aed9a0980be850ddeacddd8ac71b27ec6d1e635f43ff1f75e5c7ff13848220a27a23df4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/gu-IN/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gu-IN/firefox-66.0.5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "4ab7a824d4da3c1cc5b5eadeb35132a0322c61f86d5c475e0632a0964ea529d3255313501186138848718f33b2ee62bce30952ca5418e7fce784c1e218f80452"; + sha512 = "7438de7c95068a4c84b57b49b86652641ef176f88c715789067f2e33edf35defc4776f2b891f1cce2813889fb4c03fe1c26110564f02c82326cf48cfde728af7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/he/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/he/firefox-66.0.5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b552d54f6ae9ba1f565f7ffe86b68eb916a6f53566e8cb05b1a1a7e39ccc8cf38b941c11b25e07fdab9baee8c31f55f1611153609e873b15c36e00ef32ca9871"; + sha512 = "4d6675d21ebcafd60fc27971676d9f1d87823fd0f6f384746b7e5ed9ee1c4a3080cd1b93a7481846f2955f12c3648ddb18424749a1a2d11eb56e74232f9bf7dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/hi-IN/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hi-IN/firefox-66.0.5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "aa39f47e5b56544ba826173048b60fb79723c0af2c93155ee7ec632741795c40cb38b445ca896543b0af2ad0307b2f5c4786b42be1cff992c240298e8786b9d0"; + sha512 = "fca993dafb56b59235a7935dd19e2241f3a4c81bf1d395beb971cdd4c4d3f2550c90a76920e55d5ace09c900599b48fd7f9a318fdf4e70f0ef26c7f937f0b3ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/hr/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hr/firefox-66.0.5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "9e4256069c4c094a04df85c899b00d27e5cff171c827c4946973c1f9f58d9fe158dae2f021dcc8e85aeca2ec9baf7ed11d5c8091b7c4705ce3dbeccb089b02c9"; + sha512 = "ea3fafeabb46eb2c674c4dbd53bc1f98badc09ee7cc99f2deee75e2f377c02d79c2c881361500424db5baf10afc016c074b8a0b91420e1769dd5e71dc39cab85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/hsb/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hsb/firefox-66.0.5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "65285b9abdb550dade0705ae530af879cabf9eb0953bf91c5e7485035eff20b4d97134f2ea280c8e7087aba3a6f9fa0f4b30443eb418aad400fe2ac110c56745"; + sha512 = "493379fdc37e29079c3561f26c5c211ebd4a68a5d7055e5089d0c25347d1f38252b5145f76a910868f5edb820d02d46c682a6226c97fe674ba2b37dc4ee4e39b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/hu/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hu/firefox-66.0.5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "ecfec8847285c14238605f12e29ae9e7fa0540162e08678bd35f20ec135c631df06e1c5cdd31349ab338491443a473b88e5f10bf5528299d4c655a787c94c5fe"; + sha512 = "983dd20160987e94cc311fface93c64b8e8aa99373b0ddd09154e909504376173027f7eb05a96fc205c3e1668743e05001081bb0708c3a5ece02f95009f6ba35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/hy-AM/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hy-AM/firefox-66.0.5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "e1b4e51a9bdd5b7a41fcad703ec674bc6b602edd94849be310889286bbc22948fcd6370da99c0481f2f4781077856e9766997431f3fe77f0b3d80194e36d76d4"; + sha512 = "fb8759786a313692a7de408bf377614264b5af657ea9ce95bc7195e4075196c69801267913d1a2f980420785b9e04899d81231b8f00729c73037f9d22b9a6914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ia/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ia/firefox-66.0.5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "084e8b0238b1ddc4c441cc8579f28315fdbd0e997eb7a9ea8413a3140a10366fa16b8a0c3e0c03312196af03b12015d498961a4b7673c82c8163b39d702f1ff7"; + sha512 = "1c7b9e314276e9e0e94de008ac928c2a8dba0fbe4255176643f9f7aaf0e4f7a2edf597656a0b656b94741b55300b850943cfca51d1e2437f84dcd6ed2884c11d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/id/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/id/firefox-66.0.5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "50e18367cd9cf31d9d3df3e31cc78c696e5578d7840c71af55935fed645b149b61c8843ae2f4bf25e2a9389b4ad8da9cb16b587c5c9fd912872e8baf4ade4f22"; + sha512 = "52f31c787ced6ee5fb68f910f565d6890c24cb06f396a7cf60f9dd4832959468dda4ab1f65b874b46331a251679cffa507fefdb55803f531b41cdcdf848d4eda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/is/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/is/firefox-66.0.5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "fd4c9ae4081afafc51285bdce826e92329e8d506a71f649a73bbb2786532cb7929b7577e24f9ca92caee9d6bdb88783a842c55c2c446aae57663fcb6d563815a"; + sha512 = "5571678c28173936303163ebd780663a9902fb2c82df684fbc935b45dbd81b82654981de5ca8ddf2c803190c3df173d9edf7a5fff6faa23932bae0d084a1543a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/it/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/it/firefox-66.0.5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "070ebcbe345b96292d06f10d209144629344cf1b48070465f82ef6d974c648c83fd587a5d629b9fcecfac6c6dfe1e3c5cae4ff25d11518b5536f931bc6675da5"; + sha512 = "ecd3509595c0f9229202b3cf45d50bc5902c1e63a8064cca77f0eb559ca6270fc49497448c2dd24ad775c0e229963c6aa76c6bb07736751a318f4c365839e276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ja/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ja/firefox-66.0.5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "58842ab79b1aeff66c40fdb5a27cae809ed4082799301f1f718d695b46b389cf1b6416c26a5b05043778fdb6a7260e85a0080ed3dacc50da74350019643455d9"; + sha512 = "a56268e5cd7f4d9eb598dfaeef7f9fe56e98aa0a0552f17fbf2c4e4eda4f64298f400d03d89bec27cb001db65aa4b91abf9aac0952f43c22e95f0c320ccb0f74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ka/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ka/firefox-66.0.5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "dffd3ca8e7530c0f563d7b8309956553b448da98bf6e9fa3ecc8492fa49485287432bb72127285edf6d80c52760dfaed8dc65ed6a48ebc5a4857b80c5e9728c9"; + sha512 = "c57e5c9034989a5ef6fe6fde7f179dce7a8b78fff442a0d3db93138d6678f9b4a74a8d5d51db16953a729b48b0b7530d29cec41f6cb1dad27677a759fa78036f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/kab/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/kab/firefox-66.0.5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "5e87256a8230356a382a4bea207d370e2d4939ae7f1e88ecd1a0afcd004d498e941be648ff12c4fb5912f009e6b192212a44dcc4b563d935699f82842fc16022"; + sha512 = "6b1241dd610794867f58289a7149038cc2a8f5bdd17f20bea99ef7dcf3da2a683079bceb37abca6d21a6d2c90e3406ea406f50670b189135cc656180c13a627e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/kk/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/kk/firefox-66.0.5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "f3a73bfab3e2f69fe366e73860eda64c94da004877a1ded9aa6c6b89d3d48d4dc3daf918036a811cce4a37c2ee2addebbe61f47c6379316a60980316c8c02c1f"; + sha512 = "7c0f4cf4cfc0894ba9bf48c29a8b27266c637d7d7a293465a048eab1cba6ab9668b8f274521dd670425a02282e073c148cccf7e265910f4f034b8edc1b704bc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/km/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/km/firefox-66.0.5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "cc669ef1e7139ca3561557acbace0455c59c2333d375298d969ab22dd0663425791e3296729e98f514754fba9c119b15f8817835c9d053fb0fdd327baec184e6"; + sha512 = "c5aa21d97b88099065b571f007ddb6b50f86b16d82d2ae699387b3618e47fd847bcfeb34e18d2c7d1a7dc402a5cc99885610169abc41fb5941b3fb0e959e8a7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/kn/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/kn/firefox-66.0.5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "b067a1850687a5194c57f1fe1b1ebc875e39d567162454fff8522c2c1c02d6ac7bdd7c23053e66c19552ac7239e95118eca3e93cbf5e74d9e400d61caa80a337"; + sha512 = "ed574cdf851b071437bd21f68293db4c3dcbc6f259651c25617a64719e36dc34f22d43a3aaafd08439d8ca2f52ccc5f78a109f52de0c26a061e5fbc197990172"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ko/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ko/firefox-66.0.5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "43571dce5bcb5cd9c44cb6974cf7224e9d03bb9dd546d9b494e2e4126e6b91c3ff0fe7118fd2ddd2cdb3d1bfb96c4433c935d7af52c387cf03f33363f995a062"; + sha512 = "2602dfe1c534f688247ee3b14d80ccc75d43060203e965fb6a28e659031ebf9c10621aaccc25cec62663f3b52198579a8d9db1be406d2cc99d54d1125177ee04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/lij/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/lij/firefox-66.0.5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "a8163716dd01731d8914d4f711466277e97107c4d62230319a85d251ac68e04a05554c402d3d29ce5a1d00ad69ecd285c0fe4412ce52e905f3a6c6cc9d8cbc98"; + sha512 = "1e3a78df80e259d0aa52d13ad3a47b65bf37ab4cc456b3704991726230bfcdb5429bd727f8631127f878975535154acf3b8f4b32b97ff815f3fd8efbd2d24761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/lt/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/lt/firefox-66.0.5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ebcc5d3f6eb5c458d27fbf8fefefda113cb6dc78eb6e6b243396aaa85bd7891f5d8aaa8978a81e40653cc73bb6fcdb16839a97f769e437f6c4a9d512ad1cfd48"; + sha512 = "3ab5e09f5af356428b835fcb9e9e7c7a1fd710460fe42072bb67b3007efb3bc2d24d8013c96474763245d7bf806f762679e8053d73d20b6fd2b01f5b3f529f86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/lv/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/lv/firefox-66.0.5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "6573e17058ca50a28751a62ccf87ba0542df55b53c4398a09d0752181cc442e57e967d060d3533af394dee4f122ee784d6ee6168ed2dca08855617121bc4a60e"; + sha512 = "4f87af9f69d52f13424f481d8ef4109f74ab361c7056daf9b81581076b55b8ffd1b2f96fe8c6cbadf16418292e8c49d3149199401a4da519d1c1c29d6c6edff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/mai/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/mai/firefox-66.0.5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "1e92c29312c635f195a6f52c869f4b4593d9284a8e00c768bfc4490a69c09c69e604d514178e26a1f067a7348088e0022f7c4659c4193ac775261f402e72418a"; + sha512 = "06e3072e5b94767a3c42da911a322ca1a0c403b69cbec216b3fc82d1182403ee074f3b595b45aee834d0e0267567cf0adb97e99246e0aea233f6512f39b50bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/mk/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/mk/firefox-66.0.5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "493d4ee0450a1a7c54aea2a2541d681a7b18be6f45fe2e9b97d41761e625cfaff4977ddb464dfb6587eb844c23bfcac04015da69d0f19b05b4afcbd42dbfd26c"; + sha512 = "b42ddc552556bf32f3f11897174f452a23f812877219bf0624cd0ced1f2adba1fd8d6ec8e7dc0c5127a22ee25728c7f73ed6cf7c876373f2e26735e1871bbc78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ml/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ml/firefox-66.0.5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "d00043f5b87edf4dbee22289c031a30d9b9b5d4b95ad63bb07c3196270da5fb2e14cc1ee853edc0f4d1de976f4da8f84a92f70fb319135bb6d2a5af21ea5d4b2"; + sha512 = "1842099651174a2adcd42cec08e9250fa00fe8e2c80044ee170f9ed411757a44224876ea270f4b491e81ba99dded91d07747a7043d3d43141d4d31bffb4dfc29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/mr/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/mr/firefox-66.0.5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "ed41f4a7e8fed7fe60ee35406a5aea0050e8a3d687a0d4d97fbeb0b34e3593adec6d1b43e6e585e8cd94ee07213341c324289da264503a9c340d26e9cbd6b38f"; + sha512 = "74b439a4742da28e1c5d34b3b4d7c8896c6910cf6a6088bd06b79fc881b98bfb2fe9a6f4d6f9a41acb7950dbe5e334f40a9e978c964edea7a34b510bcb971502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ms/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ms/firefox-66.0.5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "043d73907bee6e333cdd6d1e905cf61d0ff8f78953027dc09f2a845171e5d25c671d529cf2d16aec7b2aa39961482d13ae7c91e3e9cff664aab69f5e8f291a72"; + sha512 = "798d306eaa895e6d673851865df7dd2ec3a4f2cecb3d88d432de9ca710b8c67b00a75a070e5c736c0d86f2bd785fee515cc8f33a22a23ebdf593586fba7825d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/my/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/my/firefox-66.0.5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "6e3d55ac4dcef62548f309df30853f8ee317d2bea1a1d774af4908e1abccf3cb31cc5dd2406829097b043412a40b8b81c8a87fe9433518e0d811b43a878f99cf"; + sha512 = "2ea262c2c96bc20ff8814880d25783ec6dd5ad8cf0abdadf0e4892ec49caaa1eaed05680404ccb74b3a0b482ab0593992c25a77037b39f8f081a6ce90eac57bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/nb-NO/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/nb-NO/firefox-66.0.5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "681935d216c8607ea0f84cce21c1c88251eef0ed4e057f16faa6e485e9bbedc62ab05f1c31dbafc356c2923ec5b6b3d4fb3d74454647917c11896ed1a44f4e63"; + sha512 = "f49e4d833f29352aaa61c41f400edbb121675ca7bad615a3a65c8676283ee91f89cb505384722ae5326f3e8311dc3ca6330e86652ad09b3df11aa6f31b109f22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ne-NP/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ne-NP/firefox-66.0.5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "8790899e58535c921b156b89cfaba61dc2d201d84faae066c0c89ab6b39aa6dd961125398ef139571f3ccfdf8c8ea0d1b8287e95bc0f90686569220909572b6c"; + sha512 = "fa2da86e5751731b4d76b20d2c4e7e4313ef029184580c8298a66fd5f7b203508a3174db7733bfb4859eb146b9ed6b0699490210114b995ba0eb62ab85af29d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/nl/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/nl/firefox-66.0.5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "cdc216a01b1953a313d8d353ca58150c46905dda9019007f04be93459054e57868e7a325792c9a5e5d0d83a3b6a577d60848739bfa908114e4c2189d1fac9978"; + sha512 = "8aefd6428b710df898cb9e637367a2d3ade3370821630230afca1241367eb30a3cbbb23d4dd6c816c19e6804766e8e84c00c7e3002dd91d80cae9c6b5c003523"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/nn-NO/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/nn-NO/firefox-66.0.5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "79fffbf0c1bfff145461427fb7fd3bd3805e197311b7bbf9915bc5f07ddfb8a66d2348637afbb74d25d70acd536b27464069d0536f0a471476620a76b4e188b3"; + sha512 = "e1ee61f29b915ecfc514981d79be115bb55981cd28a10f7c268f4e3a8cfb80524c409950a3b38c16988ccdbe5eeb333ccf3833cbfc5b3243f08809ac79dbc0c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/oc/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/oc/firefox-66.0.5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "39ace895dbbaf995fe48e7120ba2f400ec5c412b21cd4b6857fdf3ac86857db5b875459d6e4772269b24824ca7f7de1f13d2085b9ac5d6ded930d1afaef724e4"; + sha512 = "802d59c2d9a037140d22e62cc06a122c41bdc0120c54be6654de0237344ca6865d1741fd852e3391fbd508015c9fb4c98d4bab46b028d1867b61dc9eb900b60d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/or/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/or/firefox-66.0.5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "028650991e5d17e2626532e29470151a81258748a1f59da216dced05b2f9923fcf8b2b008e3385e954fc2b787e4b4db28703817726dffe1ee10f286acf03da86"; + sha512 = "c97a7812ae5992f5832c3c3e456e30f166134f09b086257e78414a1e790d19a2a5a8871eaa2fd66b0efa30881397bc29e207f5840dff891a27a1e86bb26d8ff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/pa-IN/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pa-IN/firefox-66.0.5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "53c0c9c88a89d6613199da6a9912920a77cbbba87e5a324ccd3d52129cdc76c48cf26842c2b173308ed64d2bfda2b2019ce4ebccf0ff4ee2003db240a020beb4"; + sha512 = "6044da60b8aafda769622d9069ce10916818f1a266e9457d5373043a8d58210a822e0091450a613967d2278f2817ce24daccbc1414c963113265f36602e34e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/pl/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pl/firefox-66.0.5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "afbfaa5e03fd9559cbaf5d26427fffaafc51abf3ee7e7161cf1d33150a6729d598acae52990a452a628d6df7ecbb37910e1ce121472f169826ea698ad4a4cb58"; + sha512 = "59cd02ad97118540b52aa981167604e82c5ea74af22665be63e7dc3e01a8a13856810c293d04125d015306445dc5693b5fabebd62bdb04db4dda09b05db81078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/pt-BR/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pt-BR/firefox-66.0.5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "46c152920c7f8cc36d845429a9e4c9213a114a965a79c069bd16214c104e29bdcdc014b8629d428a6cfd735327c89659f12dc4e84eb572c0663579a9b19bb858"; + sha512 = "987f650e38aab5d59f4c84da3830524ff0e141102649476fda04349b3960ac4142e9731a46da6457ecbcba00e402eaa5c0c6ae78189c9b223bd0133b823c887f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/pt-PT/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pt-PT/firefox-66.0.5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "f8052357068416fb3ee87547cb7714c3d59a719bba6e943158560e212062708e8a4bda202d3519f0b2f7fe0933d77edc7030694fb9a40d3269164c17ad46836e"; + sha512 = "06ce2ff205d1e14174d9dbd07f39122b093380c22fe74661321a734882e9232138bdbaddefad598c9344dea8bd61e81ed2c0bcbd2d09df616a05486635e99ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/rm/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/rm/firefox-66.0.5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "942bec7f8a913fe6f259c1c38af0773268776514453e741e455e0af3c9c2ea0fdca0926557b39e6f65dfe73867fa9de0ecd3c97a1876521651d82b7811e01c50"; + sha512 = "75f5b24fa0ab6b069a25ca568e2ad70373762e03353c7340e4fd849803360229f5dd8cdf79bb71a04c047bcaa63cbbddfef71b35d9bcad3f8d8492fbe6b88847"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ro/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ro/firefox-66.0.5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "16fc97cc0b16eb7bed5d0fa14f4584caf0a082b322cb59260eb5a1e7303d94d42e055db5c9b192d15e4ea3b515c3e38e6b6f7a421f2a97abdc7821264669f342"; + sha512 = "acc557c9634f09e206478e4cdff36e7af4a70c6ae25dc9c92f15143b4239bf20291a0e977c13f98137457e97601e164a0e1ee8ebef387acedb1f2e1cbc2429b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ru/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ru/firefox-66.0.5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "85b0f38dc56ceaca5ef633beb5303eea41b59112a9d96d839f681da46e41deb9c77b05fed578c6fa431eeb71b5af3117e2d6697f2636ba7bb373c17e5690f65f"; + sha512 = "d5c0e11d622eb0f5681b78cff605437bbf12570f8c282ef8cd8fee405c06f7a42a402d27f784b4574828a0ba320cba4849b56c0f639c2879682e0cdeb6a05d76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/si/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/si/firefox-66.0.5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "e0aa9a503f830bc26f85df5ba952405df73e1b53bebe24198b0400d683f4194a4ca7fca26d89789c6ff347b954dc5e4c99ac2eb07f328985a61ba636f93b24c2"; + sha512 = "75ff287200ff05afb435604987ab56a6177f86954c1233e2d91a24c9529205af9b891b771aee02c21ff09adccb90d49bbf33c1452d5921d4664ac3575d69578f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/sk/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sk/firefox-66.0.5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "231a8c4751839709a65133e7f643a8150468fe9b0760cce308895da47ea1e032f54848cda6ebac27813be3cdce09392e32c6cb1d08471f5e96db0349da592318"; + sha512 = "485d0ec3d88c3f4afbfc8e1a7171b463d8596efd85e24a17e1da71df747b48680087532d8cd0d86bd653d6e0a3ecf2ad0566527c1448a6cd13d4958c2ad8e582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/sl/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sl/firefox-66.0.5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "961a2a2cd6b70bfc919859ffeb4153ee5539da05b56ced84c00b7cbc23ddbd8825aaabad2885c325d7a96c16e0a710fd403cf9d4fbf706508cc6d6901bfda3e7"; + sha512 = "3453d03f4b43889409230ac85918c41b2c4b28b17a88ebc6e3028e943ac840ec13529759f01b55beb69b47870eeaef54130b4407300bb7bac5ecebb9d9267459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/son/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/son/firefox-66.0.5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "6fba26ac3c298a20ef52a8ecb0ddcc4b6e0d96be10820b0038bc56f5a879642885641939d86de64b516033f3623cb6e6570e9b0b92e0afb5aba08d847c1f4f4e"; + sha512 = "2585dc5818fe8fd188876319aaada09cc570e2731b70a8948d733f49e878f081a999a27e8a069c2fefd89ecc78d994b8e16b00758d606bd8a6a326e70f09de32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/sq/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sq/firefox-66.0.5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "0344b6ca43dfa9ac3a17da898177a65d46c600518ca26eb1c01643fbda1afdadd378fc642c21f9ba19e512c2ee31391c4b0cb71086d290fa9275f99e6cd87bc3"; + sha512 = "bb1ac7b25f80a7ebb58e989710751c168014ab4c40681078b64df26ed224908acf6d0248d1fed9bc95d8719faa78624c45636da30a79916083a60ed2a118d75f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/sr/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sr/firefox-66.0.5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "bc75532d2fca3038d8415a6ef5447dd4ef9cc5a189aaaacf2f0bff9802ef79dc42b9083c2b9d0e7c4b019f02e01af5ed6b2ac668a61f66f359312d35a0db3ae1"; + sha512 = "6dd2728d54df09705d6ea4c3e8191a125f0ebc547450fae8fa24fc3430afb654d72992b91267f1bfda5f11ae89b5f653c0536ecffdc019a228111cfa530199f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/sv-SE/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sv-SE/firefox-66.0.5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "45a183b62ff7d2ae17bd696212cee5babe71e15531fdde486e19505d0104cc5e96360a5c475b42edcbbbd0c754168ea474904bec7bf493befc7bbd4f280a8b5a"; + sha512 = "086cf49b5cd6e60661e1b89eb0a1ccc33365bdba7e52e04432256be4975f27d58fd4d3996a27c0f63200d4d925328c5de898df7a5071200162545e7fdae6b962"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ta/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ta/firefox-66.0.5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "e65efaa3d08e3912db2dd164c2cbf1ed686246347da3e5b4fa11de5d7db7f0c6edfed6cc822c64730a309641a5766662a0e1f07e6b3203d139c89eb6de6e197d"; + sha512 = "f00490d45844a44dca5fe498771fe9490c56ab7861a93128eb6d55f09a4e9d77266023e0c6fadf1d121aae0916966c21bae30d9126e46a8d4f8d33c23f16671a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/te/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/te/firefox-66.0.5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "613689c3665c76ab9b05f666b1250f92b5bed37d2cb7d61df2ac6c25ae085853416b2bcc5638f3f4cd2223adb2d585b0d3be84132e9ac038377dcbe08b39b319"; + sha512 = "ad10c5e4086d50e793639ab3c0cb7a066c5bf2627530e54a1954d15efe1ede3df900b968a545c3796b16b3a78176a668b2067bec09c230fb48da3d3b9c0144e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/th/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/th/firefox-66.0.5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "9123aad2b2a8cf5c09007a042571e884fcdf06d04e2fa71207a8e266257d4b83125d6ef30acafce3d8731856a3e81ac54858dbf8fb7e778a91f188b1338754b3"; + sha512 = "423f4aac98e178b832b99724d34e48ef4d552c8fa8e0a3e7df60732ce13ae4245a510305309507cbf86d0ce74ca06d81001b3b033912ccfdcb138960848cf038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/tr/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/tr/firefox-66.0.5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "c11a6020364af2924e4970afa09377b34ee6270ec0164afa3e583eab8560b1c3824734556f91c0a77581032fb978a0343cdc86d25e02e186e6e600240346325d"; + sha512 = "8f0a5ebd69b011ab3c8507ac7e7211d41a449c0b49c63a484b7b79159e46696407cd8f96387b043aa4c223a4021d5f282a6b19e95fced18ce1cbbb494fc47118"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/uk/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/uk/firefox-66.0.5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "f67e01de24bcd47b653174c9d72321004cba717148e045f6744b89f1a45423225ac533f32f9ba4082b9dbb9f6b594f96dd7ea819a5f9aa2f6342ba4ca7064330"; + sha512 = "2b9e0678eae4dd1e920b3faeb3484441afe0327dd7a1dd42ab0f89ce6b105e2f2856a62789a02f90b6e81ccec1d295116b73b469dd6eb734dd929b5409915043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ur/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ur/firefox-66.0.5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "27d6c55ed4b364353318a4585844545affd9cbcccfe119ee2ee925ca2bfa68c9dc14ce8dcc4632e9064ec679b6504800c7821beaaac13079a85fda5914ddbd31"; + sha512 = "68676c3387141a73060702899e7eb2c1ae6bde43124f844a5909140e9b5b180d4ef226bb1785265f406aeefffc7ad3b56c89fab12d2e92e41f0cf0e08b7ae691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/uz/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/uz/firefox-66.0.5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "fb3f8f95efbc230d4f92efec5ba1e99f3945461962b24d20d635e312facc79a2d62a6ca9eda34bdd516b697beb7b78612b73706ba461b8127abc4bac4db261c6"; + sha512 = "4f146ecb3c9428e6da96c8731df491693bdfa3aafbd3d898aa349e025baccca43514e831d97a54d195c610fec5e12d3cb3ab8763fc5a1e6c2cb210e5de86ab1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/vi/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/vi/firefox-66.0.5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "db2057f6b203144dd032e4f3c53dfdcea8e339ed71894d21f96b24593254beb0779103234242a0541fb26f913d47a7ad8543ed9a871c2f11f341f051c4dbd0ba"; + sha512 = "3cb5572bce606f8ba96e3fb40abe943dd1a5b809619ed4c72d9f645deb3af9e2da198cf1c6f8625447c5c63d4d3cfdf7a093a6a8d6ab58edc179c9763ccf942f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/xh/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/xh/firefox-66.0.5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "30574f459a2fa6ed4bfceb276ecd48bafc2ca63ff5dfcc6251f4b003c5c7a1039af30682394b0e93eae4ac42177a4e58caa9cadcbc4c36b7eae0052595bd62ad"; + sha512 = "13d182190781c091de4055a3758dca2c35ca070a570fb48714585caf1e9306f81b98d95fd321675b9c946eac09f5256bcce396dfd9dcbd3c0749a528ce08b300"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/zh-CN/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/zh-CN/firefox-66.0.5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e7278c50c7db235f244f0e32f1a3a5e438462a7a179a38bbf8cacb8dc07cc63d979491b85036ee9baea1d8481a10517005a164c31507649d643bab995f98a1b1"; + sha512 = "28e1149f5cbfbd81871a4bc817f6ff1fa01d91ca63625431568abad1851373f402fb93cac8458cadf66bba7fd616c7488cc2703b524fec0e803a474c3c70fc5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/zh-TW/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/zh-TW/firefox-66.0.5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4b3024b7b47348261aceb573b905d079eea27b45947069316629a05a8ad9f983bbb835ac46f610bfc2640874403b48b7acd6b4bfd4cfbc602227fcbeca4e9c8a"; + sha512 = "0c6a7a431c2d1ba3d3b437f56c68914aeaa405e90c05530f996a1448266d0dab1193921c11291b8eecc32f194e24bbd2744ccd8502f36ba8de074ab6ddb7b605"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ach/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ach/firefox-66.0.5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "721ab206f584a65b0f5ac2e2da9e0b95ef80e66aae01cc65bc736ea672c276dccfac1885c7de5b168432736f00cd8106f85c5a2a5b8a477e2860e9a8dcca8f99"; + sha512 = "143bde45ba31f2ffe4784f05d9b78a58644f6e8dcf85c12261cb542346352130bcd7c7cc3fb8fbb537af096902f8594ff90731fb680673bcf3902ea7e8fca165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/af/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/af/firefox-66.0.5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "e86bc71b580d6cb1c4f52d5f5d248301805a0b3782f822dcc41f590a1be289a6a2b9f42931b56e36df1124ea2de0b2528ed00de54e2de4e915427cc055e461e3"; + sha512 = "93b15d2721533f3b3b2a1338119adc663785b82e3a48549c5700be522c03a00fb46e8413b31c2ea39180cf8b2b7b4a3a7c766daf1687dc389a9bb314b744aa0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/an/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/an/firefox-66.0.5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "bfbc55e1a0002fdc30dd65f396afe05c7090cec1a54cb13dac0fa2079f2427f54960de4bbe7af93bc3d3dda3bdff84f8760463054e0cf315f151d318e9a2b4ff"; + sha512 = "61c2b6e8a028a6af70d047d35fbd14b25d87b41d3651456f4e4ce151560e1d8618654d31ace7a99eeaae6c7e6fa438782a2ba3826476bdf07664a6fe11ab8040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ar/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ar/firefox-66.0.5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "e030f962cf81caf576b165c7c76f6bebad317860b788153c5df5f27c8427a0850e3dc2a4877a8de8220f435fb71ca43d3e131253e345b2161ca65bca98b08833"; + sha512 = "5d41aacd05ef2c548e12f8f8ac9c9e514b55be400a1de82709b27edf3a0a31778a40ac01e63d170b423c56f4a9a177d7f4ccf511311c1f140aaaa259eb6b3273"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/as/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/as/firefox-66.0.5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "afd792df04ac43cab4bd837fb7a5139635bc9a2851bade301bfe677882134e25b7aa37a70da9836ca28496dcb7533f005af6806b97f531a3632cdd2e019279da"; + sha512 = "8e92abcaa8bc2b891446551db5377066a4ff25dfa76e5f940e5f0141388a3d1ae5ec57c350a45d655ad573da28d99f465721621291a049d93bdcc20f8799b434"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ast/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ast/firefox-66.0.5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1589d9b31ce8ce47666ca091358acd423452964ef72a45f89e01d20507ea3c7ce85547d5eeba8a7afbd4569ffbb08fb72faa2be7a45749a6ba57a1a887290842"; + sha512 = "661508f7d31d3795eeb0859289b45eb9efae70afe714153beef4dd9af8a981aec74cd2a31207cff95420b2ff2485b8ccf6bd104e9269efc08710cda1ad9e0f43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/az/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/az/firefox-66.0.5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "312ecbde1115129d4c5cfd6f5e0ac6e20b13a81ee7cee9e2ee7841e1c4ad81743ab50c3fb0a0d599cdbeb9671fc7410fee7246865db58654982e4c3935dbf266"; + sha512 = "518cda92119d08b6853e55a2897444cb180ba21f6a1d5800667612dc56dea3f025ae6dbdd3f950d07c9fc7efd5ef3a4a0c5ad1de40734bf4d4e7b70c0bae0889"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/be/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/be/firefox-66.0.5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "01f750b21f49806e5cd6227bc4f6eba698c7c1de7cea7bf6998438490ae4fc69641ad9de710f9dd1e7da67b8e43e668f3cca50dd995f9e12c4c5388f743a77ca"; + sha512 = "36d328eaf96c904b04265c9f66eb009e9a7842a1d4848bf6135b46442b91aaeffeddf5595fe6cbaf53c6c9fa9ade1beb01726da08cdccd0444e8182bc61b74b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/bg/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bg/firefox-66.0.5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fd950660fe3660f8474c848bdfbf356ea47adba4a25719873cd322ececd3bc8f5f3748dccb0272b1cdfe91778f0c5e18be8bc1253f2192bdb0cda0888da2c49b"; + sha512 = "387e8771aaa032eb51f6db15be9feb897db813674f7f8444e13fee82cfa2ad108470d684056b4c858c22e35b91e08cff7f514aa36157dc3879df3c93bbfaaa48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/bn-BD/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bn-BD/firefox-66.0.5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "9d95cea55725327bfc255cee7b9dc5b32710d8575931feca0c5d2611fa9d9a1c9121283248e11715f594e98ec1e0584454ea4836b2853386dba3c04e1ed764f3"; + sha512 = "70549261581856bb220473da33f605401a329cafc63ffae697cd2dca149e4a55d2440539e97e5f9dd1c781c9c39daeacfe8027219dbcb6d8dce81aca5a50c737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/bn-IN/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bn-IN/firefox-66.0.5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "1504f69b631ec7452a6db588190987108c52f805cfe40d50034bb0da9f06bd642cc4e8a78fdf297950156109e1dac33d8a186943b61e89923ee313cfbcacbb84"; + sha512 = "a9129a26e2c923c8484a3b1b1a20b5330cad29f127222482b771a216a93bca88d3fa33e42fb8c39edad61c61939be04f362888b09d483fda60b5c97923abd828"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/br/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/br/firefox-66.0.5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6ec57a6f0159d6dbdc9ed1edb5f157bf9833fd1ca626011a3f9bc7387ff5e5c227feadaa2ddc87c134774f6b93cc36cf421f46996125cfbda2b265b7aef3a04c"; + sha512 = "f809eea506327ccfdd9d816d7c0133e90154ce5b4c7209748fd9439bae2b28a265087804fea7a1ad7c5ee810b41b922e196150e4fb7b5b8ef6138420313262e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/bs/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bs/firefox-66.0.5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "2d71b24c1c24f52d3930e65a37d8354d826e47dea1eb2c4293094726d76c11258e238e2c71121f7de0c323c5e701f5173decd3857525df944d2a349a528dd603"; + sha512 = "12973bb2dea8bb8c2c046e45e63b4b34d0a49d067703274cc32fbb9ecb44a8919361743269ffbbc7bc7716bb20f3696721c4aca41b45fca68160e308e3934a10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ca/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ca/firefox-66.0.5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "241aa2b588fa66caa21c64e3e0511893bbd3e87d8bd24cb73956eb7bd17e6aeb1248712bf2a2a302a9d9d5131807e0daec7eaeb00c752f6fc66607d9ffc52a33"; + sha512 = "25dc6fb35330d637912656f9f1f813c6fe742c6f603b879e236340e073c056207ef59c395f2aa6d6a3aaad2ea1b1f8aba97602597b272af0695143ca3181e64f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/cak/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/cak/firefox-66.0.5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "1273f8d70a02d4d49260ab97df101136062bdbd70f9b76fb9550dc9fd9097961fecae61832238eab017f00cc7e63c6b096c9452c2f426460a2347e66fec4f6c8"; + sha512 = "0f9888724bbc7157a9838db6f58ff57c93c527042806c3697d8ce996c4d059cf47daceee6a39e79f1a4e01d8ea4c0a1101808e5eb2d99c5fd1092833e4df55dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/cs/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/cs/firefox-66.0.5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "de0d30e2621b8d25a701ef1350f9cd75989f436880567541e0c34c90b6010d904aa06cfd4839f13670fce4b98e1a759490ac7b1daa396ad570ff1032c3cf308d"; + sha512 = "3c9284275d4fac7697ffe0790ba8b7cde71f3297f78ac5467261f47d588ab620ca370cc349ddb8683febade9a4b761acc79236b7b1bacd18e819324ffdf61964"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/cy/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/cy/firefox-66.0.5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "2b980fb5fd2a3b98af34dcf0f57e0f1e039148d95d452c6c297cdb814eca2327f2887933a89bcf829c38dfa0b1742f166f133f58754af564bebb0416ac2cf396"; + sha512 = "e3047c59c710ca0f189c61089caa86fc844514ed8653cec9e64f5ec1ce81466890c5e565fe6790dd6d7388d8e5c48847eec54d42431045fd1a1de056544e50f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/da/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/da/firefox-66.0.5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a2c364a2a77025f7fb2646b110ff765d98f44ad84d0f1a56984048c56e062a7e498a0f8cf6cb1fa4f3e34ba386b20a8b00ef3df3691abb49aaab9e86b869a2d5"; + sha512 = "689e8bc5b0b93658da2e5b873d799b2f3f1548ef67f4c082a07d79918f6c7900b0aa00c84a115279de9a5e2d8f2fe083bd14476b111d589a610c539612d3beb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/de/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/de/firefox-66.0.5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "aa053f108d1b9775529023f7003a5bf72fe0e503ca5fa61f5f966b6034818483912e09df3a5aa72ab0df75fbf3f78407c9410b609dbff8e0be3869ad8995ce9d"; + sha512 = "c4a17564458794710f52eac0e3e7e5fa3416fb278bd1113270b70f877dfe105f802a5de611d0e0ab5d0d8888dcf6d5856211a34a8315a039cad7516effaf8eba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/dsb/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/dsb/firefox-66.0.5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "670fce6387b3e867873adb71cf37a28016da2bd9826ee718a0196280e8cbd1f7406bdbf91009f9faa8d4c94a55ff5102b73b8fb319407261a3cf8caa5b69e726"; + sha512 = "6e52744b4d65ebe711dde2c7f5e92243858d1218f18eba1e47b6bfd5600668fbd36ab3edd0a0780b6682354c7df5a2d3d0202263a0768dfb7be1f3469e1a21bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/el/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/el/firefox-66.0.5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "cce6185101eb4d4044fc6216d1af35ec25e2ad7f4203f671cbce1b1f2968b71d2eded6da45dcfaefe92471046edfb6e9551ac3c0fa2a109966210fdb8c7297e6"; + sha512 = "b0fabda2a20c3a9b0e957987ef4c859049988cd959331f83510b13c52752867722fb6fe99c6e4fb18a54f9ca965d34947bdb3aed6ad007ed41ce98c68297735f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/en-CA/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-CA/firefox-66.0.5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "24666b9a5c26be2b23c80744bfc3b08f83f02b8f3d6ee392d02d2db6ae16cb555e0e6a65fe08d7942551520798f2b2d0bfab4f607c9ec29f82acbed5b3a8c7be"; + sha512 = "3a3952783b22490762054b0fc6bb73d15f5c4faf1d208abaa8f74ef6ca9b829594fe9b2e1c57a02df840eaf640dea09c399e62a93a2481e6f35c3271443ea1eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/en-GB/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-GB/firefox-66.0.5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "2e66d24d2ddbbc03b284488c062f5c8b561c647f184b370c621bea67610713ad41ed83ca04e4ee7092e2d4d9916b94b13736c02e7e9eab519a30fe5531120d39"; + sha512 = "64dceee7bab4580299ab32aafa835ab0cc0ebc8f9326e3b933b1d74b2ee35ed4a95ed0d896c38cc0ca880f5ac48f52019b910e9e1ca50d9eefc17e5043f808a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/en-US/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-US/firefox-66.0.5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "2b0bc9c83c9f8e9b570a5d1936ec3418fcf738ffcfb2dabfb6a8cd153ddfbf47472c6f95a081ef49ae2a6c7153b0f50b4346385470b7e28a90e5586b71e8507e"; + sha512 = "0c0579498ec84c12e2c90ca98c79021e888de449d031ca4e27c7b969934fb5d63b997153947b4121eed7046fd42f264865d6a3cf40b4543fe3a2f7880fb0ef4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/en-ZA/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-ZA/firefox-66.0.5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "c24f3d5ee00fac6285b6551c59c9532a84769cfffc61ae760b19347cac5c98eb35ea9803f89c6aabbf8077a9a844b7bef8528b309f26658891e711ef2a08c6ae"; + sha512 = "fe1331634800d62ec69cb1e1db48377280590a0629f6099af2e5671102fa277409a8e682139494ca57618c2cdc2d8f1a4721b6b495d10b1d775ac22c22756b4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/eo/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/eo/firefox-66.0.5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "060a951a4d997aab308b9bc61daf09c133dea250499d9e1699fc0056c382956918f8700bd5a4f8c2955b0c812a84fd6775569f7d16424d5299a541b0d0152e20"; + sha512 = "bd5fba6465a78e821ad1bc15e63cbc4a5cc3c3bd9b9e44e9cabec05d0443d68cfbd4571963b5aa01c9124c1828f493f48d043c18acd6b6db1b5d9d339e696693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/es-AR/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-AR/firefox-66.0.5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "1dc63ee6473ee4659e7df21d73e552458075f2e0885f3bfe79264b3f202a6a2ddcd90f81b7a1b8b877467819228db0f5f7245bdb434600e05bdb7d6af8043c1a"; + sha512 = "d0be25abc28e79ac615852aa04b71800d07bef55f1f279540bfe198546ee6f0483dd4e06a9f23215c816eb4ee15d79730178dd54a2aef8d1ed5077c2d35df470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/es-CL/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-CL/firefox-66.0.5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9d999af584485900e53910c462ae5271cb08dc24c39b89f765a7e393f940e6daa317202e3ebf46d4a03ed5adeeebcaa9390465a954e0bf6816c48ea4a55d05ab"; + sha512 = "636fbde6dbf8244652f4ded0423b708567817684aad648ad682371b37d70694444355398eab933626782d5ffe2274cebd7db4c24587580b7d5edd213b9170bd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/es-ES/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-ES/firefox-66.0.5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "37bd3dfa6a2bf3b2988f889270123a19ea03300e51b85fb1772230d3764c95e17382c996b40124c3df439d40f7fc72f69de006bcf024604ac844444a45179f0c"; + sha512 = "6c786ca9432d8bc5453b3558c0863953457f1f32f4204cf39250628f6fee50050b1abdc0d0478600f497d3f082e1cd9f5a280db0202240c3f66dff2870afb9c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/es-MX/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-MX/firefox-66.0.5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "3ff7427884ed23efda07d5448e3236456a44edaec2584d2c693cc9ab8e9ea27f715e7c6a0b7ff84d79376ee36e81d63ca80fb467f481595cd64f919cabada830"; + sha512 = "10bd832885031e67caf6495543bfee9d9e1e9f5e75c6dc34aa81d2f9f33fb89a52c2fac78e3c15ec8e2fa09fa1e43cf07035a2e0ea9e9a8d8ec21343b9ace36b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/et/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/et/firefox-66.0.5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "624f2d1095f92c1e6fb88355801f5b95820f3c43dcad5243247aff49e6a83193a704c377ff44a9ee94edd7c9d1ee7c735da3b6250868433aabc0c3274f320e3b"; + sha512 = "1d3019bd7ee02ceca29b4c48a9f41c89b9836e6fac0d1025ebab2a8faa4bad5274c13eb81a1a919d490ee92400d2dad480dcf7405a2a3094273179256d9165d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/eu/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/eu/firefox-66.0.5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "432fbcffe82a8122aba1298fac1f9e1f93902cc7f8c8b9782074cbf57026d34013a5b77a3b110397a97281adfd7e07fd2e6b99a10114017af2813c7b4ce8c653"; + sha512 = "c6e8c5e9d0b41d51b948a3b3a4a20502392ead14e45ac8c559bbf9313a9d6d55f33f1eb6162918020d7786db334b7193e00a4661c44fc7a3c3b7121c4e708fb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/fa/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fa/firefox-66.0.5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "ec7856b3d8c3f16db39d6e4c0378815f10a0eea4d566cb2351bc6a5dd38493e6d965c32da6431a9ecdb30cf31acf86d877ff3d694f43fc46ebae14dd36c2e40c"; + sha512 = "6a0b16e81d926f9b52d1f160215e78d4ffac272dff5043433c372f902ac6c031006ad8367baaa815da766f703541804ee088fdc1d4184995f3ce5448860baf6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ff/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ff/firefox-66.0.5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "9f811b0ebcf1a25ebdd2d44b0b8cc185a5a6a01df79f788689410353f76c55144b5ba74a2efb896c7ebcdceddd24c1aff109580fe4360d6ac011597ab5955cae"; + sha512 = "65092d8889426a7966af531d0cb6df2cb7588cdd0bf8d79102772b0cb48759d2f611d2d7cefce7de85cb799fc5b65fe6fe80b3b10eb00e53328fb14758a01072"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/fi/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fi/firefox-66.0.5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "7a26244a21b13bdc54fc4c14fcf547f8302d38f73f8385c424fe79480acab1ee43720544a7137bcb2a0b6cdbb1ba8335ec5b723773128eb6825e9e3bbf0b30ed"; + sha512 = "3e69f8af10b5061ac183a53c674a1964c3840b3532e521c2c31acbb9d665ff6fc25f82c90c1c23aa08bbe152628404a3916a786b7fff0c693e3e9cd0f6baaaaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/fr/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fr/firefox-66.0.5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b97ada588c37af74b3fe6a11190e4408fadc1a63b1760986ea258c493460840cafc30d46660c85e11f74946f1a5cb87149535926d286e2e537a21b7d7cdfa229"; + sha512 = "40e919128406b91d86a64c7f1860750b17e3947d8bb58ac0b6b308d3b2f87ee946d58d250c2e735ecc0dabad844e67bab63ff7a41401da2a852f0f56ee28a1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/fy-NL/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fy-NL/firefox-66.0.5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "3fb3465d10169182e9e34b2216b8f7cfeef421f9c45fe72b965b92220b828dff68acf88e755cab0f2c831acb1c0bd207345b7646c83895d4e448ffce0bb7fad9"; + sha512 = "24ae60db18847e9bb877d512c6d30b14fa31c855b9ea82dbc86c7febb5f80fd0bdb1badf4ac1cd78f287f1a0571a07b85a207020d3441bd0c9454e9d917ca12b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ga-IE/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ga-IE/firefox-66.0.5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "be5f150e10bb4205b8fde5a78fd4860cf45b1367334020f90c5e1e2c2b65bbb8911b19b0b63310f1152bdc1857bd465d2a168147e16673fce3105e87182422fa"; + sha512 = "6f44ba5cbb8430533f1e3ff2d1b7dc2c3eb869f54eba387bbc9b57b4f14d0dbd5dd8491190febaf76899c54805274484a993724b556ffa728129eef7a4b7b974"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/gd/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gd/firefox-66.0.5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "95a6522ef83ea8da6a36c23bcf49e1d6f2b4a5be0c0aaba3e9cbeae0e716d6f5a78c4d3461a1fb799a21a96c04510fcf25fcfa5203e8101536e7d4c365ee8bf1"; + sha512 = "e9691ce54fe3a0f9c90a90ce5ec9b6fc9c070bd55b3e852e9e586fe60d7358c9bb0c86ca2f0e0e305fce8df6c1ccd9e190923ecc8d9ff1125a2075c1986ceb81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/gl/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gl/firefox-66.0.5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "e1e3506d962c06bad43fcd295434035d6312a4d686663a33a043740123b28ec4040d6d1bc7581eac742c6193974ba3aeafd0867307f2c28d321363e6a907b97a"; + sha512 = "27954989bb8d11c984a621b17a4468be77f481916974a63e4dd7ab38f43db8352c5d77dc200dd97cf5b6ab7d169e9960c9d202500492914c8b24ecc8bd2d6c4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/gn/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gn/firefox-66.0.5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "56063c52c71cc117ff1984da22c03bc8c2f1b53b1a063f62864a05dbd3e5bab79c156307b8be5c7d7cdf9254048e1a27fec8112656c4677b0ab068d2dd658559"; + sha512 = "8d4c7b80cca5cc6d4cf3dbc66e56d62c9055b8b2c6050dfc55a52b1ecc835bf40027d22cca12bfc507491e75c1b29cb7e805f2b340a2943ffc89b0127a608b90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/gu-IN/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gu-IN/firefox-66.0.5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "4400ebe78e80b8c776f7af169c9e99c83624db188e2de98626371052999b7d52b265b0a09152f3acdda85040abc029cb9ae790ff8d4d6562b111c6fef8387aa4"; + sha512 = "39e8905fe88f742d0060901dea2070ac8ead2e4e3916628166a5b64fece1a16db42aba347cb4b346d147c95cd14e9e2259abe80749c0f0a8a837ac49ec66057d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/he/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/he/firefox-66.0.5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "16453b5aae26b4bb7153a915810fd66549c8e8c6d880686d90c5340822e757a01479978de0ce63b48e66979456ad20c508da5c70c7d2411daefb556e29321ffa"; + sha512 = "24e04866088fda3f66e43d05f71baf07295409714f1a51a4a2dfa419106e543b42ec5be7ce27339a0d65ea8ca084695e97aa4b3226293827aad6674026817119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/hi-IN/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hi-IN/firefox-66.0.5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "acc1843b76699c68a1f6328829a339f303bac8f1eb3a66eb9355422bff6782928de6e4693ebf51b6e3d8337dee6c6ac34d7935b7ae7cde6fef8b297130115e28"; + sha512 = "cb580cd596cf6a6f3e0b9fd83e47362732ea8f2de2c9535800172949320562b862b29dc0b653d17ac44959a78b99f2636a5e28a57a00a167bf32c711f9ba32a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/hr/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hr/firefox-66.0.5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "4606e21fe491959585254135cecd629ee39adedb2c576fcc597a385a103b7c774f84a141e060c84cfb3c3560359c63a014bee7ed76cfe17b18bbd86458fde8f1"; + sha512 = "c319352e29cd1ca0627d7a3332ce9a9afc29a8ec447f921a9ed2a89a4722ac43f21bc353509a15257a139de7e56652a2cf96fbecc38cdb860bf59e7ff3e282a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/hsb/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hsb/firefox-66.0.5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "20ce433e45c16af0ca6d4fb9bcc85c2072b95a7058f4b4f9aba486259278ad9077c02fe9daccc0ab43772a716728a026e6c7224ff243aa095a35a62a8f848ca8"; + sha512 = "e04c62c9a7fb273f43efc066491fe32a214c5e8bfecc527508b5d1a6ef1db7f09ab045a913593ad98bce8fc2af1f63f1fe695156018181b3b834b7545cd17621"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/hu/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hu/firefox-66.0.5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "9984c6a996e1aec493cac5722166c20f7bf91812ef805c065bb32dd6e01b0e4950074f50698174341d2fd98bf583d2fefb033918f9243da32cacbceb6c2be66d"; + sha512 = "af69a29e22f8d6566c68fde1e661352835ddb3de87ab80e4921ad44a1575af815163744f4814bd761b52075474d8570152b0bcaed753ac9bd9909baa297d6f00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/hy-AM/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hy-AM/firefox-66.0.5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6e295f3c4d2dd1d8ccb20a6a95aaa90f6b56f2aca0f56e88ddf2b5d944e83f7950883e6a78e8585a35ecf938e6ad3c2a9861bb90b7f243f9d9a95ae0a3611797"; + sha512 = "9531b16c6f7a369bf435f9449fb898ff8eea1d9d1a6855f56f01fff6fd47176f367b21c26c2757af0874e3a88b948e4d3d14217c92a49a5d4831313a338b1c15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ia/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ia/firefox-66.0.5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "a6ea1f8c4ed980696afde549df4f2e8811f33c3a26990ee594328fe8ff2b85da690ff2562c4589adfc6c96a8df2826b4ecb45a1f66abe37fe63befc7c1ac83f4"; + sha512 = "387466e7e270bd907402a9c323b2766c82fa0f04d252a21513f71acf3f0d159c479b895fcf95e9287ea0a9366fad9e04f5fc67aa65f1ccddb16eae07e3143105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/id/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/id/firefox-66.0.5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "525778a18d1a10658f68acd5765ec256c94a0b380cebb9f71ab5bfbf860985dce1d075abca8a230bd10f45536d10e1274718bf475d6b371befaeffdc3f66c12c"; + sha512 = "c5ba2f9707212fe41180cc1a8fb987b03d7547790639e34457be6b9a921ed9c2502476990f0417122cdacf9a5f8badecee23957856f379dc3284b3fd26847058"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/is/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/is/firefox-66.0.5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "d6495199e2c2327c5b0347b9b4d41e7e83522c0e67202080b71bbb804eff012cee9949e0376dae274b090e64308a26ec73d040ac13bfa8e694cac4419c312b38"; + sha512 = "b0c2561628b136736b17f7c52bfff315657310fce0b4445334657ebfc4e6c98e73f21da7df56e4ce4dd0a6b91ad5980eff63684a7c8109b4a00b9a24669ef625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/it/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/it/firefox-66.0.5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "06a82828e9df605cfde798e15e68179adcf6d7fd8483668bbad5d6671a587a1c44e1adfbb737ef333d86a47afe251fe83ff3cc79286c3a92ab9cb28f9346ca7d"; + sha512 = "cdb0bf8b76a0ee92272a3b22061ff79f634bef1b2804ab40c4cdba54458b0458a77ee7dbcd17dab45015b26e8d8704f01ecd8041d8a0c1a0f2f9cd413c89d8df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ja/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ja/firefox-66.0.5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "7419ac401b72896e66e92230fe54da3b88dccb900fa208e1d4786284fb64284c3979592d3c0815bb4ea7a6c50850920b27d6bf08b134ce7adc60096556f94a85"; + sha512 = "93be68a0b11c4fc36af01d0399bc177562e5cb41fc7b7aae332bdc57c1606aea6a210c4db8154f47c6aef414be2b6ffdab4c86f0188254dfcf89ae9354f9a9fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ka/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ka/firefox-66.0.5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "1664333a9c32f312d2f4e781b277549921f30efef1012de640fc62368c9806dfed3bf37fc6e25315e4dfb571e8fe1cd5032ddf5b6a54904277c59cd52aa40efe"; + sha512 = "dd30a818619c26b069b3b9da38191df64ac190a5663e49d0826fda79e2ce4123f48274f66bdad64538f6d03350e462cf34961e00a0d80c67e27bdbb152e57e57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/kab/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/kab/firefox-66.0.5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7bbad72a2a2da61446a45de9333f97749ac07019959889cb4e2c78f3a014d478db8e3f1f054e934d32604b8ff1aab6fc5e59a6dfb7ac30456cd5c5bb0b9637d7"; + sha512 = "266725f1fa6050a9c2a6c7220c42e96a2605319ef7b7a93861f7a1ff05d8f28e5399a12d3091b3aacb653c13162f52cdf327b315da11226901c480cdf4836569"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/kk/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/kk/firefox-66.0.5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "714e6d78307b2bc33ed90414943dc3e8090b3a0a63d0a6f1266dad2bd9b155848cf747b2685d376af8c4d34a1d520ac3ecb8da7b7e72de70f80c726aee555de9"; + sha512 = "1dc7a5f8cb76c0fb9c537e197556de5a0996eb11701b759c2c8c0ecd89e58f60f32e75261eb70861ef6a19616bd56e29a33023c31e4b17d2ec9f91acd346f9cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/km/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/km/firefox-66.0.5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "eac3ba4d9ea03506bae726a2ced74b1e37bb58c29a03529ffcd6cf595a6c2ce7feef29cd289aa1b650e399e046065bf7b93e5506f92b2b332ef6ab5d5ae89591"; + sha512 = "b227eb8dfa16dd2a7686e28e7d62cef1e627b19da6879f43b435d70ff8bc9b60964b9c1427418b71c71cef6e2fd6d26a7ea67e4f9174a4dcba59d50885a6f6fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/kn/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/kn/firefox-66.0.5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9741d335f170871bba7f731caf01604341800b706144ba050a0f352e15602dbfe7b2db42930f92828615aec8afd2b432f6857474f757ba940d0292487673a0b7"; + sha512 = "c89b651540671c085c9b7549946004f0d0377e7fd75d6cd5156e5d4bbf2d1176a717bd062da4eb392928179ff73a87cc1f80c0f703a7f4b8424b78bbb2f29056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ko/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ko/firefox-66.0.5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3c4fa714cf1de96927af3578a2da83898ff86b5ca9f4499a266e1300c24b0a75b88e718630e269e94302ad7ffa62f8dba1a5c13d5aa807129857451d8d8a04df"; + sha512 = "4962394b60da987c7b9945d840a98f3c4b3dc389dbfaeaf71c3194efad94f3e8646948c14383f0c6ab652f926971f1e95bf75d54e521bd13c865e61ec812f395"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/lij/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/lij/firefox-66.0.5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "31f708c82116d359100bdcd3d5750311dd387160808d64718b102a9e6b35125ceb971c7c5c530a584d206e312ca85db5a1626314ab8d573ff0d48e2e2ccc65e5"; + sha512 = "dc08d5d4e973da32b84bde101152b595270cbe610f3f970c844fc278e163ab7caaf3a4edbdfd5b7cab937ca8999eca084b0f5eda40e1a12a1334aaeb1545bc58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/lt/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/lt/firefox-66.0.5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "9413359590c85b26b2fbf141a9ac5d4e1ec27c4b64c8bed3ea9cee40567ba1a84c9757f16499c53d96643f50ee53fc9194d06688f1e3deaf6866b77f0651e45b"; + sha512 = "ecb5e9977295b74c63fb64638da06322603999620bfd396405b5c272f584066b5c17e2f872c4c7c8f53fc62362b56ddf09c6f39ac496c5868339a7d270891d72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/lv/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/lv/firefox-66.0.5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "0746866b601275a4b937175a7176de6f13dec8fa88dcdad40bbb5c5aa6bbebebc61162baeefed0269ff6af75854095a704e3df62779eb2c8e581e82cb2038e5c"; + sha512 = "f668a35dd04604a07d3b93f83a7731f87d2bb726dda74a6a94bb23e2824117a0c6335a28d7bf05efe154a601472f0662aba5a2d6c38717e0ebbfa649599a7edc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/mai/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/mai/firefox-66.0.5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "103c1b5c978a8c2f5295e24c346eb95c4ecc3187cfe6e2d0ab74654683dca13751fe1aa58456732130249a1edd921fea2e0843aee6de82b62524b5ed03a34512"; + sha512 = "ac30950eb86b9583eb1dbf0ef74cbad0942ca227a7a79284cfe9beb7f1d4decad95ce8435c65c3a8120b85259cf98a1ef89ad184b1cb0afbcb69937f2aed781d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/mk/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/mk/firefox-66.0.5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "b408418432f7c2ea8aea58e1138dba61c00f0a8d6564df0cd14ae03050bfd8ba17e9654adb6cd835dcb798f26db1884fc89920ed43974c1fb92c79b39c3001ac"; + sha512 = "e346090975a9c14782161142f370bc22c6c73abdb80588c9584a2efd8518fe016a764327fbae25e08ced2bb8107a50e256cdc627eceee8abb8eca3cba6993ba8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ml/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ml/firefox-66.0.5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "5c58a55345930e9a136bace10466a534f5b9c2365edf6bafcc47c9797461c7b98f836a8b8d2390a5a9239b6d4e96b7213a600fe64099f80e9874ff1dcb1ebcad"; + sha512 = "2d26c4af2cd67fde5e7e4132f4ab9fde8bc87340adbecd00c006b3064f67f19f7148b557faac6252b78d1446f16899b7336c87ddf9dd739c7cccb0318493a1f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/mr/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/mr/firefox-66.0.5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "d6ed0fe10c705a06ec1a361634fad2498107b8c9ff47f2360c6acc11ac745ccde738a014af22bf171022198ce8dd32eea53062642a49587764e99975f4147425"; + sha512 = "536180dfa72d2e2c4043dc35e529f7243b13bee79bc3f1727752cb75165258481b16f834043843b7b3480e4a8c4a275b8242a0d4455f85b5d33a67a8e206b098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ms/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ms/firefox-66.0.5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0112e5cc8b176c32e10ac2725f47bed95e49176cb81ded0e6f2b324eb9f6dc487ce073a92a5fd5c25b66a5401389c1959366905846ee7bccc8280dd6b0e94e31"; + sha512 = "b2a619df14d1110910bbf96876c22c2f4d70bcc522a886d801d3ccef5b6a802ff6528e67be7a10e05d5602c397543b59e42f88cec694d721abf0d5270b4da1c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/my/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/my/firefox-66.0.5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "32837f4f0f733b133171cd730b4d5f67ce8abe4cfdf7d5763ef431f605ec7d2032437c2d41be16c7133ab8e6ffbb5e3050be769a1c90ea88faba32e32fa8cec9"; + sha512 = "e45c96e33c4dd2c1707676bd2240b8c79a51bd3f5b0bb436f1d1639f62288858f6947ecd1c210b17c6000309b514ec1fcdf708824ea0c2783613eebdd9364939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/nb-NO/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/nb-NO/firefox-66.0.5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "2a4bf96f5f55da8fd6ef7393f99c52b6b99fb75944813189ccf7d30524686b3d6beb14bd6d7854fcc323acad3b17629e5b9b4e9c05dd0f1bf29001c0c9db8274"; + sha512 = "3f86e960b3d7eb9309b45b7c7d8110a2421f210b6890af3f5dcc8b4bd9853643d97a03c8f2d3fbb187644ea29ac39219ab17547924d98e20c4e0949e6f9acfb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ne-NP/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ne-NP/firefox-66.0.5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "db675367e97d4ca0c46f066cc53bdc9265763a0c3492a06db8fdee0f27d2166374c703445b5d286ae5ad1edff2939ac27705af5f484f9dcc82e75b154d2a4905"; + sha512 = "b37cbee88debed4a9fa4dd618efee71052a708cff29b398b8461f35824e6e877fc9b1df1dc856081f8e9ec820c6388a6c875965707955626b2b185a9c44f4e69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/nl/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/nl/firefox-66.0.5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "2be6093f8a5303cf31a7bd3788c0b87f6525b0fd39f8d867646c5667a0bdbcac54c7bcebc6b0f91531291aff4e9041f6af21a20cd28b9191a1e778a6b3dedc6c"; + sha512 = "0e5531ee0ca2765542e84aa88b0756e0ff765e25f2f9f3db9273658f619e13c6eb1e028f2ab573d6b0b4fe3233561445136ef329c75d318aebaf9b581afc41c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/nn-NO/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/nn-NO/firefox-66.0.5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f1a50d57284e5e989e96598635fb9a876b1f72049ab2c3b5d4155a23c103bcc814f9551ca8da24e4c4565ba45ed2206e786b2070a51da248c654711911b62fcd"; + sha512 = "e9aca83b6acee05063e602f5cca0dc82d04a326591f4d414ac5a3aa16ec6871dabfcf27fbb1e6bafd95fbda96e1c64251ed3eb6aa698830846b8c01e8b0f055f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/oc/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/oc/firefox-66.0.5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "2d8c7b92014717126098ccf93cff317c7e119cf05c971bc43890d84adc12201977a64fa8f67c6db6de94a1f446ea00c815164031f72862ff8bfe5188c3c192d1"; + sha512 = "45085d11c85f6889056c144eab500a24bef9547be394e5c1834b2d7096b6c1251ec2a502e10b4b51422a6e6033a1fafb21b94330b5e370c5d8acac3aa7f609f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/or/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/or/firefox-66.0.5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "43337f05cd9a3f37ab1c65a0a6d8375d8029dd805d70d9b638fa80941d53abdd1cb8befe0203219f69585300ec4175e0abaaef38d41703ca828600289b102a95"; + sha512 = "bcb365e42dcd4d2f426117b39b39a015d3cd0b1667db653a7798fdc261ebbc52499d265b913e76330963b271d7f2fc567e2d58c5afbf6eefde87c890c6685f10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/pa-IN/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pa-IN/firefox-66.0.5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "de4794e5ee7b82475d9f1ee03654a606cfdb93e658c289c8e51ed12d5c4f8f5d9506a6693dd9c55dbe80c9a050b8d5ff9e4d587857ef65885a683a669d827269"; + sha512 = "8f9477a044885977707288c8e2bf98858b92a61b6c4e9e98d416521913426bebf2e7d1baa0925187c0e459ec41e94d8ae7b1b26f8953b48189864f408cc573c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/pl/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pl/firefox-66.0.5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "4836a9c7ca7eede61aef652e5a97339aa3c9949a78a7b2de48affaa335777522396555ae23abe11c95b02a1c59fc38ceb932fb9db74b50eb9b852bd3738f62b8"; + sha512 = "86fae15a9e8ff7b7a3b7c7ad5ea7b308ed7bf5001547b0ea3a7f251f2bba4e966aeaee28d7cc489c3d9f85a4a7f3660946207d6899915834adb5a178b099a537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/pt-BR/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pt-BR/firefox-66.0.5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "85173013452964e7621ba41588c3376f29bc73eef6dbedb9ef4f0a3ca5ddce831a2c03fd0855df32e1f72f16e544073e1749546e82ce02aae0a057eddd64dfd0"; + sha512 = "c54dd7d19079d41545fb305b680489e7613154c9800913405f6383e25376c96db6b80a2cf7ad0f356f78f4fd01f1f2d1d183419e78eff1e9a1ea0b0fd9955177"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/pt-PT/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pt-PT/firefox-66.0.5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "f1a4b2d14811e8b6f9617126b03d931665275ea5a59cfa9c9b93fad395d09a6ba309f41ca472b2f0253eb4bd3a12914d1bdd25341d4166b71fc601206a6931ea"; + sha512 = "8c7ee4e79b89a523c0e0378f09f006d883a05bf0b094c3756a366cf1037e59662d9588cdfb064a00cdf22cca8e9d0b51f150b4218764ecb2c101a797a127de9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/rm/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/rm/firefox-66.0.5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "4ac10aad3370d83f56ad59a6c971de1e53548782493979ab5f214c7499d0fe0fd86b59fd8a1e717d5e3d27553667e12eadbdefa2e474a5815e74e46af4485727"; + sha512 = "73ea3ce657b4ca26eaab1239dece228643fe5bd72257f04c7273b88c2b2cf136beb76f692cbda2f799cac82688316a8fff652455d10f0dae27eace99306b7b1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ro/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ro/firefox-66.0.5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "c85cd47c77c0e1ee4487cc0d0909ae02c20052b9a0784b426f0e7164136ca6eb6be7d87c13dede37fa6b0d4df63ea5198b9313da7af5c28e0adee0a7b7404943"; + sha512 = "12ab234921a0b7fb07737248de895a5ca32430715967a9f786d7015384d58ce68bdb555a1074cf99ed76babc61dbb73c6ab45eb0dd6d4124813d84d5db43fc4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ru/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ru/firefox-66.0.5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e690662ea7c9fdfc5d721a41241b5f70bf1ab12f4db4bb444b51f25c5f0650977848fb2631b3f0106e5e54cf739a0288fb6e36736560a3170a5d893f6a6e6864"; + sha512 = "f5a7110b1929aae678a832de494477dbe9d89dfe8fb2a29e2d18b5a7b8c4b4fece2f8863b04e03946c318e1a3a7218ae68afc5b30f0caf39b36f8a648d4ae003"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/si/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/si/firefox-66.0.5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "d1a4f021ed8ef7d55cde9ef2bb1c5e28fb41a0220cd169071a070cd6be11ae2fba7d0f9a6c7d036317c4e7c13b07a041f46bb3e750261c382805bce39e9daab3"; + sha512 = "076c13952baa9335a26e04ddb083f76289bb541f23f4d8ee80b0c442b0b23c3fc8bfa50946c9220cc8b6d9dd6afaed1e5cbf1a9995fed26e79b7666796c7dbd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/sk/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sk/firefox-66.0.5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fe0bd4ac5da78502baa39554aafd0d96f8c214197af0c62e28cd4a2a62940d6a6fe2774668ede43cb1d3ddc9f629d418ad467d1c7723020ec0c22bbed49963f8"; + sha512 = "9378267650ec97395fc9b08cc187ae5bfc16da28093202d33c64e230ffa9c7dc939474e3785df1c4f89adc3f8de2d252c3bacd754b8b904b76b5b868e5929ab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/sl/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sl/firefox-66.0.5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e5d46fa3ca8e934a7a3e0ecc1c096f478b7c3e594f12a8991c7181b18e321077768912963de1a48df7aa1a07440cbf23401baf1a84a12149750de3560834d2f0"; + sha512 = "5451e7f5345f5bcbf9d5d9550703f66efb316c3e4e98b5dcbd8baf68846e7ac3b2f99c53364d583dee92dcab63a2d6fdfaf0e85f39a093dc3b1dd6fec8375fd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/son/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/son/firefox-66.0.5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "cc79dbc2e5cd5ff682bcc61f6148170688d542fb3d07ac2fad518841ed6d93a722bff9a7ed1ce77a68e7f5f09fc4e1a13f1c7fc9d6458b2ef0a15cecdb15f7ad"; + sha512 = "e552d6884ad981eff2badd8584d79a7b7f561e88cd1bb65f86dc08f162d174b2a05d800255c3e1a3d65c11bd5c54a54177f3c990b954b2d439a70b6f8a15e81e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/sq/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sq/firefox-66.0.5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "8dd55f612140e10681102d6d4414ac34d12733b4f8c5f253d6a278f5ac3cbdfdec1c14e4384e875e9881fc720ea1c54564de8ac3ac06f2ec5ad2941f7738e72e"; + sha512 = "7c5d678e248102949298dc8aae4c3d174b01814e176dc923bcb23e71a49b96f16c167cc736e222a83a7c11de34708308b7d5f6057df71599a51fb353984c5223"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/sr/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sr/firefox-66.0.5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "fc29bb36ffd38ea5c71d66cc3fa498d2b6fda41a710c45ded72456c236c892855ba7ac8e07ed69c73f12ea2cd82bf7fa6e82a6fad49960feb4f5c36c78154fbd"; + sha512 = "07718754558e1023f437fba61dd55b9610dd2f0f3ec15d7c36b56433d162e2699f93b094e50794d15fba74b2c02eada99fdb283de70c73394041180b8e7d7345"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/sv-SE/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sv-SE/firefox-66.0.5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "1f544109c73fb4c34b964c4df5d9f6da8201689d1038043efd6150bb8a323106a911e4a6f9b7a648497747a1b0df16c2122fce55bbd6eefa72d1e64458e90337"; + sha512 = "c2d8bff74fb6537eae2c8e34df58a9233c4df3572cb3d7bb8b68660e4fd6848e23e58709ec4e7ec049c8e43aa40394b6f4b2f89363d91e6879c25ff0c523c27e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ta/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ta/firefox-66.0.5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "fe9d51b667c8a37caac25a5e236c40e87c3cc3620b630ba0f6169b8ec6b6580e6c5c53d36018fa236919120924ade33a3478f3526b7275f523d7f098e9c309cf"; + sha512 = "0fd4b8c94340d341ef2fe70c10b4880a1073972b1b3df3391f92b6084e2cb84ccf9dbf764e26b04007b286106289b94806f6387c353a68ae64bacd4b2ca8eb50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/te/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/te/firefox-66.0.5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "fffacb5ff18d3c6b78dda7d33d0b05a2e6f55bfa24908a4ac5f970f5e8e44f9f4fe066ee73ea8656907c69390dfe3710b35606c9e8e1e4a7097fd8c004e98699"; + sha512 = "3d1f9f8abe7b0491c0ce6084f6e4bd047fd606de376afe9d811f2ba91593f3e98e3d2f26d27c550c008455e76237a98c4f0847e88c3ed338ce1d495a3380ebbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/th/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/th/firefox-66.0.5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "98092b4981db5460d2457e38ce1cb7dcf99abbc455d7c9b5b490e2ba1d91db7a553beaa404b78b02e66d5e4dcb71cc9e521a3f953d84ca495f9c4405e6262d00"; + sha512 = "9f1343de6e161ec1803d56e7a87e1d3fa8b05c16fdb101f19daa8f514456e70645ff0935cbd7ce4a3d3d760b4b1107d28bf0f463509aaf197d7a91adb31c88a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/tr/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/tr/firefox-66.0.5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "8d75be55b4baffc17fcb6a15a776c3a9f85c06ac1aade5fa2d859951f3231d36f47c3b32093a0fc70c9a4593b4f6ddeabbe7388e0e648d3b772010ecf10c1f04"; + sha512 = "21058f2b49cca57e6146a02e211a0d80a92e3e2bd46445b06a8b5399ec1c2965d7e17d58f7c256ade21ff9399bc7dae1c8eb09555dee84d0e92a37f05e7b3353"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/uk/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/uk/firefox-66.0.5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "009350e490504e907a1667055a1816ee77f87ab9d6e2460a166c3b6ff8a95d71f24c7369b97a3723307dadea82ad6fe345b071d4783769b1abf0ce76c67f6f11"; + sha512 = "9d85bfa038ea5ebdda4061fa99e85ac93585f6d781e6a7b9297c189b6bc1e593bf429c2d1cc9344ccc253aef2367aeb840caa20ebf65af067636555fe8c66f57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ur/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ur/firefox-66.0.5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "790596c72c1eb9862d3fdd476ebd859c1d2f9ef756d9c069cdd4004c2df66a8c9b255b054cf50bf5b4c387fc5f6d96e366b60540fd79f5827b23dd0a2304fa7b"; + sha512 = "06a3f2d441756c1506e8307ef8f42257eb37f63eca1378427c59880e9db3de44d85bc39241f1e43970c04dac00c4c4f6b82d7203c48b5b0c113fd1589e8e8639"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/uz/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/uz/firefox-66.0.5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "c3d447f331dc36347f454aab0dbe5ceb4628b5b6cf63ecce009002fc87c2e63bbb55e7310c3c7a070767f38f792ac309a442c3abe4e1a041bd12638852b5e7dc"; + sha512 = "0c6ded8776bcac49035f7fbc73c4a8c5470a081d79b883040ae7b9f60e31ece2c4a2f0baf867b6fdd722b0cbc3f359d1f9aaf75a364edb03b8f01e9946f109ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/vi/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/vi/firefox-66.0.5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "370b456cb442a68e62dca86fb44b5cedc8a9328da5a8b35cd0fecbccc6afa5a82032454961a156e246c87df77799207fb6d53f32ad5a0f3c0ec0c21be5345548"; + sha512 = "6091c0e48a097408cc2251f0bebce6e77ced9771486c67fc89074490455ca11048b2653d0b934b23c8266730af3fd58fef96a3319af8cbd8c6c83b740fd87bb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/xh/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xh/firefox-66.0.5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "f126678434aecd25449bbbf4da96eca70a7b9d65000a2073b9b033e4e01aaa68aa4019793180c0400658ebd55fcdf93b58f391c7fe7c588c064dea1c1d2c13df"; + sha512 = "18bf62d055408eefccf145cf42d95234d88646b82c2f9d6f8f5107409be23879dac63b1ba0346d8295b114145c95921848de73aa98aee6343deb3bd103f73e46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/zh-CN/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/zh-CN/firefox-66.0.5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "aae684f94b9e567e8b075efea5f910261a752c29904ef658bbf9377884f39a467c359ab703b36867c2090f012b591502612918160ef7a2b2f98958af58f4e8ec"; + sha512 = "e999b37838b09da9f5315ec692543c59a1a801c99560f8830ce1998cbcc6fce92a873a8b628682b176dac580a6f66e89588e2a2cbe7214cea542bf0c7162171b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/zh-TW/firefox-66.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/zh-TW/firefox-66.0.5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "8f6329fc2a37ffd296a8e5ad7878f8f2bd7a172b53ea0629147c795aa920d1157001c819de479f62eeae6cc59d2d50e378cc9b9e5f401a1fa31f613af4fc145c"; + sha512 = "a66bdf11578fddc740a9dcd4d1bb43c29d27c6c4cd26e896a88050c6bec4a0d5cd9ffc6ab3e48b2ae202b7de9bf11b402436a37001b1d166b7a6a1296e57a998"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/fix-debug.patch b/pkgs/applications/networking/browsers/firefox/fix-debug.patch deleted file mode 100644 index ba92bbc4740..00000000000 --- a/pkgs/applications/networking/browsers/firefox/fix-debug.patch +++ /dev/null @@ -1,77 +0,0 @@ - -# HG changeset patch -# User Michelangelo De Simone -# Date 1479198095 28800 -# Node ID fde6e9ccfc72fbc0fcd93af7a40436b216e7ea1a -# Parent 687eac6845a77d2cac5505da9c8912885c2a9e57 -Bug 1013882 - TestInterfaceJS should be packaged only if it's available. r=glandium, a=jcristau - -MozReview-Commit-ID: IEHesdoU4Sz - -diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in ---- a/b2g/installer/package-manifest.in -+++ b/b2g/installer/package-manifest.in -@@ -570,17 +570,17 @@ - @RESPATH@/components/InputMethod.manifest - #ifdef MOZ_B2G - @RESPATH@/components/inputmethod.xpt - #endif - - @RESPATH@/components/SystemUpdate.manifest - @RESPATH@/components/SystemUpdateManager.js - --#ifdef MOZ_DEBUG -+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) - @RESPATH@/components/TestInterfaceJS.js - @RESPATH@/components/TestInterfaceJS.manifest - @RESPATH@/components/TestInterfaceJSMaplike.js - #endif - - ; Modules - @RESPATH@/modules/* - -diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in ---- a/browser/installer/package-manifest.in -+++ b/browser/installer/package-manifest.in -@@ -554,17 +554,17 @@ - @RESPATH@/components/PresentationControlService.js - @RESPATH@/components/PresentationDataChannelSessionTransport.js - @RESPATH@/components/PresentationDataChannelSessionTransport.manifest - - ; InputMethod API - @RESPATH@/components/MozKeyboard.js - @RESPATH@/components/InputMethod.manifest - --#ifdef MOZ_DEBUG -+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) - @RESPATH@/components/TestInterfaceJS.js - @RESPATH@/components/TestInterfaceJS.manifest - @RESPATH@/components/TestInterfaceJSMaplike.js - #endif - - ; [Extensions] - @RESPATH@/components/extensions-toolkit.manifest - @RESPATH@/browser/components/extensions-browser.manifest -diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in ---- a/mobile/android/installer/package-manifest.in -+++ b/mobile/android/installer/package-manifest.in -@@ -381,17 +381,17 @@ - - @BINPATH@/components/CaptivePortalDetectComponents.manifest - @BINPATH@/components/captivedetect.js - - #ifdef MOZ_WEBSPEECH - @BINPATH@/components/dom_webspeechsynth.xpt - #endif - --#ifdef MOZ_DEBUG -+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) - @BINPATH@/components/TestInterfaceJS.js - @BINPATH@/components/TestInterfaceJS.manifest - @BINPATH@/components/TestInterfaceJSMaplike.js - #endif - - @BINPATH@/components/nsAsyncShutdown.manifest - @BINPATH@/components/nsAsyncShutdown.js - - diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index bde6924a65e..61df0c61fab 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "66.0.4"; + ffversion = "66.0.5"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0mz2xrznma3hwb2b36hlv4qmnzbfcfhrxbxqhc8yyqxnc0fm4vxbbzh1pzvghp4182n98l1dignw95v11pfgi3gss7sz1zkiywz47sw"; + sha512 = "18bcpbwzhc2fi6cqhxhh6jiw5akhzr7qqs6s8irjbvh7q8f3z2n046vrlvpblhbkc2kv1n0s14n49yzv432adqwa9qi8d57jnxyfqkf"; }; patches = [ @@ -72,10 +72,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.6.2esr"; + ffversion = "60.6.3esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2gk11kffwmyq3m8dsjc86f7zfagl15msb8byrb4db4w4ssn335wax2p8m221xi4qnzf20fl0p1b30g5z8ivrxx2n19yknnwalazcjzd"; + sha512 = "3zg75djd7mbr9alhkp7zqrky7g41apyf6ka0acv500dmpnhvn5v5i0wy9ks8v6vh7kcgw7bngf6msb7vbbps6whwdcqv3v4dqbg6yr2"; }; patches = [ @@ -246,15 +246,15 @@ in rec { tor-browser-8-0 = tbcommon rec { ffversion = "60.6.1esr"; - tbversion = "8.0.8"; + tbversion = "8.0.9"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.6.1esr-8.0-1-slnos" - rev = "dda14213c550afc522ef0bb0bb1643289c298736"; - sha256 = "0lj79nczcix9mx6d0isbizg0f8apf6vgkp7r0q7id92691frj7fz"; + # branch "tor-browser-60.6.1esr-8.0-1-r2-slnos" + rev = "d311540ce07f1f4f5e5789f9107f6e6ecc23988d"; + sha256 = "0nz8vxv53vnqyk3ahakrr5xg6sgapvlmsb6s1pwwsb86fxk6pm5f"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index b6ccfdd921d..4eeef72a4e1 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.6.1"; + version = "1.6.2"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1sckfp9l2jgg29p2p4vmd0g7yzbldimqy0a0jvf488yp47qj310p"; + sha256 = "1yzwrpqpghlpy2d7pbjgcb73dbngw835l4xbimz5aa90mvqkbwg1"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index e5e162ff333..244f179ec15 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -16,11 +16,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.4.1488.40-1"; + version = "2.5.1525.40-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0w084mamy72v1kkfgg8nn2q3hmfj7v216kkvqb52f1nyycqqzb37"; + sha256 = "1samrhavjz21vynv1vz8qnv9bf30mcy0da0qkpa1vhbgkga5flgy"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index 76178c0cd8b..c382ab9d3cf 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -4,22 +4,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-acme"; - version = "1.1.1"; - sha256 = "0fva2kw82s94r4s4dpk38kcmssmcr71ia9jyg1rqmc00ifilfrzj"; + version = "1.1.2"; + sha256 = "1l77pckiwa72lwbwbqkjzy6m9xsgp13spmzc80gfl4q0gd3d46an"; }; alicloud = { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.39.0"; - sha256 = "0m5fvqrvnb7v5iii67l743j3hq32rljrvnkgc7fcd46zrf38yl2h"; + version = "1.41.0"; + sha256 = "0bl24mgk0rangwwbz43ybymcivn3kjjg35rrvv7ashvhmx58qcf8"; }; archive = { owner = "terraform-providers"; repo = "terraform-provider-archive"; - version = "1.2.1"; - sha256 = "1avx3m0dkld0kmsi8ifqcla8254p1izh5wrziffr7r05s152r8qf"; + version = "1.2.2"; + sha256 = "1saprj2r74b63z03n80m3mfj3vhgvlm4gp2hzqzjbdgibxsz4jaw"; }; arukas = { @@ -39,36 +39,36 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "2.6.0"; - sha256 = "0hpnyid5w33n8ypwcz3a43gazbvk6m60b57qll2qgx6bm1q75b19"; + version = "2.9.0"; + sha256 = "1gkw60ihc2b3qhb110m0mckfvb21lqgx4vc4x249mfxxk25i26s7"; }; azuread = { owner = "terraform-providers"; repo = "terraform-provider-azuread"; - version = "0.2.0"; - sha256 = "01aiynw905gbn6dv23971yhwv0kfcbckcqp4f65sypn1l8szqyjg"; + version = "0.3.1"; + sha256 = "1bs4m9hwdag58by49zsjpys3xvxg98nq8qims17mc82pbsz6mpag"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.25.0"; - sha256 = "1fhcljxz6cb5q1kd7aprxv1bga53x6fg65q5wkp985aaqnl42b8k"; + version = "1.27.1"; + sha256 = "0lxa84j9kzinblz7zp4gizizj0sy0vidkjvgnb99sr3861rak1x5"; }; azurestack = { owner = "terraform-providers"; repo = "terraform-provider-azurestack"; - version = "0.5.0"; - sha256 = "0pi8hjl6350ibkiz5pi86p58gkj8jf0a27ar04npsrn2wcz90k8z"; + version = "0.6.0"; + sha256 = "0lh0an3bz3kh2s6ncadikivr08fj8cvq7zm20csmjbgwgicq4gl8"; }; bigip = { owner = "terraform-providers"; repo = "terraform-provider-bigip"; - version = "0.12.0"; - sha256 = "0fmmlx757hph45ffm19zafjfkldg41qkw83vz0jjmvxicza1afbd"; + version = "0.12.2"; + sha256 = "0pplv5hi1kjli0jpya12crb5dkc6bkzvm8094rwhjbxb4f65ca5d"; }; bitbucket = { @@ -81,8 +81,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-brightbox"; - version = "1.1.1"; - sha256 = "03fh287fmbg9jxsiniwj3sn6nsjdm46qv82b5aaqny3qmhjddjvq"; + version = "1.1.2"; + sha256 = "0k9qs7kpjznascads5llajzx2xkm4hdil2n4wl0fqy43s6dkvbbf"; }; chef = { @@ -144,15 +144,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.8.0"; - sha256 = "1pmz4gxhfynj7mjcl07n2ggz00vccw4bv6cmp7na3ssbpnjiy1wx"; + version = "1.9.0"; + sha256 = "0c5s9ywd6p4qjd964y33rcqcgfqz225x5rp0jlsqxbv9i2r91fb0"; }; digitalocean = { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - version = "1.1.0"; - sha256 = "1w5xslm8939rz13bsiv9hfcl8cyvi03gr0h24c0ybwj8alxmxhb4"; + version = "1.3.0"; + sha256 = "1bi482s6s3v7sqknwwchscwwncwrhr4jl4gl4l25bngp1kd7cp7i"; }; dme = { @@ -165,8 +165,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-dns"; - version = "2.0.0"; - sha256 = "1km0pq1wp0bdccb612z9n0kj9w7hn1yvhk7xszwp2mzs8qmd7flv"; + version = "2.1.1"; + sha256 = "1iyfsx1fbpvp3zjrkq8c46nr6d80z40mzkfc4axfpqyrp9xqiy8j"; }; dnsimple = { @@ -193,8 +193,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-external"; - version = "1.1.1"; - sha256 = "110kqp4gsag3l8h9hwjdq98s9rz9f5w31mrs50rygdc0yd43hq8z"; + version = "1.1.2"; + sha256 = "12wdzm3y0fd840bdf0dczvvmdmfwpfwfwnf0j4g6n9asdcvjaqlh"; }; fastly = { @@ -207,36 +207,36 @@ { owner = "terraform-providers"; repo = "terraform-provider-flexibleengine"; - version = "1.4.0"; - sha256 = "1gj3y9xw9zzh2fs2i6q0afw591lhy1lvcn80xac4da08r5l3si6g"; + version = "1.5.0"; + sha256 = "17dksrqkh35wf0clqcd4v6ggmzc7xmrw8q7q0qa9n9zqyg1zibqk"; }; github = { owner = "terraform-providers"; repo = "terraform-provider-github"; - version = "1.3.0"; - sha256 = "1k7816dbpsjjbm3pa6l0qlrxw5hh8z5iwdr8mp1mp5liidhl6bqs"; + version = "2.0.0"; + sha256 = "1lvizak27qxgggp5xb15s8f504cjgr633889cv2jsr2rn64z4jv5"; }; gitlab = { owner = "terraform-providers"; repo = "terraform-provider-gitlab"; - version = "1.2.0"; - sha256 = "11j84kyw2lsqsn6ya070hx0k6igb3hhjl8zlnr4q3gpmv51y23qc"; + version = "1.3.0"; + sha256 = "0lh1v20msahcfjc22v7yf1cwinaq0zy2m8f7sl5jfn294j9nbam8"; }; google = { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "2.4.0"; - sha256 = "153pr01m7clvdq9c09xhvlivagn12nlxhykh1x9yya9ixkg0zrrv"; + version = "2.6.0"; + sha256 = "0y93hfwhzbk7dl7cw5lw2gwf5hdbc7rs9gh10b39vxgv9jrj4kqv"; }; google-beta = { owner = "terraform-providers"; repo = "terraform-provider-google-beta"; - version = "2.4.0"; - sha256 = "08vbj9m6x0byf7x77a5b5isg0kmlxvc9gswgilzi6djgwg0j6wwd"; + version = "2.6.0"; + sha256 = "1bm3nrv2pa6mf6l4vn5b0hads7bhp67bnhc5y72yingfky7kva5h"; }; grafana = { @@ -263,8 +263,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-helm"; - version = "0.9.0"; - sha256 = "1psqabifb1kabg268ca1x4l79z1xga1pr2sf8x9lrd7z856v18l9"; + version = "0.9.1"; + sha256 = "189w8zz2fv0qfggzxmppaw8814c7kylgb11m1r9mqii3phsgnlz1"; }; heroku = { @@ -277,8 +277,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-http"; - version = "1.0.1"; - sha256 = "1bnqrx4xya3lm5wp4byy6npazll6w1g6bv4rawgncswsgx08zqng"; + version = "1.1.1"; + sha256 = "0ah4wi9gm5m7z0wyy6vn3baz2iw2sq7ah7q0lb9srwr887aai3x0"; }; huaweicloud = { @@ -312,8 +312,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; - version = "1.5.2"; - sha256 = "0g1f5cbmzrd46abwd0rdyrf8wj8w9bx1251gf4s9z41adrxjy2lp"; + version = "1.6.2"; + sha256 = "14jql78a1rw1wl97myry29lgmqkcdn44qgmzjrfky958afnkgiig"; }; librato = { @@ -333,8 +333,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-local"; - version = "1.2.1"; - sha256 = "1hi2bxa79fbdf2n6z59xdfs7bx8cg7q2l84hrxdh3cqbnb8jvsbr"; + version = "1.2.2"; + sha256 = "0azrw62clki002nlv7ws3kzfsbqkadm713534i4xgvix2m08d1cx"; }; logentries = { @@ -389,8 +389,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - version = "1.3.0"; - sha256 = "1h21a4z7js2iwg0gj217lq4d7wccxhjmi5k37asfj18ch0x37c7v"; + version = "1.3.1"; + sha256 = "04ibq5dgxqb5lpnvqxg4xkb498w77p2sbjfyy9zj7m5i62xrwg79"; }; nsxt = { @@ -403,22 +403,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-null"; - version = "2.1.1"; - sha256 = "0sw7j2cz9d5207l1v32ahqahmsk1dzzsf83zqivaa5jk3w4bfnjz"; + version = "2.1.2"; + sha256 = "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2"; }; nutanix = { owner = "terraform-providers"; repo = "terraform-provider-nutanix"; - version = "1.0.0"; - sha256 = "16nky5ryyjvv7vny18ymxvy20ivwmqw7lagnz48pq8mnwwrp5541"; + version = "1.0.1"; + sha256 = "1g7p6qg32g75x8fgspgxcdsa086mz3yabdgv1k68rykhw3zbri5d"; }; oci = { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.23.0-rc1"; - sha256 = "11h8na7czj4iqm9z3pd8im06qqp3mng62h8ha5afvz2phv1g096h"; + version = "3.24.1"; + sha256 = "1yhcxwg3ivrgzasdsf5yq8v6h4j1lprnm881xfm4h1rpq465y1mj"; }; oneandone = { @@ -431,22 +431,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.3.3"; - sha256 = "1hwbwyhjrs16cy66przs44znni0x3nwfsx18glxbikb2zx1ph93n"; + version = "1.3.6"; + sha256 = "1b11837j0d8s59pjkankbm3p5l87aw1s17mn2q7nvy65kgzalsra"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.17.0"; - sha256 = "1a3asmkf3w1ndy5rpyn09msp5l1sm2cdm3ca7cx5v00pjvww9f52"; + version = "1.18.0"; + sha256 = "05sr6vra4fsrysrz7a77vaa5zklhxf4hl8g029y9l1fln7vdpssg"; }; opentelekomcloud = { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.7.0"; - sha256 = "15p5xvl6ryj5silpd2yrmjjh0d4qf89v8x6zbq8x7j351a1fljak"; + version = "1.8.0"; + sha256 = "068ap0sw17xmrfvri1yx70qdi8i5h0qhsm9bakm532xjxlgmaxpv"; }; opsgenie = { @@ -459,8 +459,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oraclepaas"; - version = "1.5.1"; - sha256 = "0xyyhr2n1aw1qn90535llv72cdgdqpni9l4gn8sj0ligpjhba7qz"; + version = "1.5.2"; + sha256 = "0m886wfg5ski8s1zr7g1h1m6q5ai08jk35ymipxpb6ipx781qvvk"; }; ovh = { @@ -473,8 +473,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "1.7.2"; - sha256 = "103r0k626ham8wh7rwlx1hald4rik17mv2mcfjz9za65v7z139vr"; + version = "2.1.0"; + sha256 = "0hj8av0yry0wsi8fwgs0z9x9jxcnxz8imsanbdsrhb8lsj70n25v"; }; pagerduty = { @@ -529,8 +529,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "2.1.1"; - sha256 = "0ivmxacb9pzz7av2rr6jal5vwdv24689a2806nqvvzdy2s8mlzd3"; + version = "2.1.2"; + sha256 = "102bgd8s9yhm2ny2akv04mhwf5mphqhsxx9vxjbg7ygqnz9ka5nw"; }; rightscale = { @@ -585,8 +585,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-spotinst"; - version = "1.11.0"; - sha256 = "10q1w66gbx6863797n6n15xx4llflmavrz2qk23pb8qd5pbni9bk"; + version = "1.13.2"; + sha256 = "1v3vgnspg3g0hvwzfplyvl37jxpc9m6hcsnmw6lkfqr57dy4dhlc"; }; statuscake = { @@ -606,15 +606,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-template"; - version = "2.1.1"; - sha256 = "182kdkbmnihpawvgfpxavg8vbczizw5mlkwp828ap0baqs09ai8i"; + version = "2.1.2"; + sha256 = "18w1mmma81m9j7yf6q500w8v9ss28w6sw2ynssl99pyw2gwmd04q"; }; tencentcloud = { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - version = "1.4.0"; - sha256 = "1gqxvd5ss2cg49856nj3srirny1298l3fla506r7v8xf9ybkzpb4"; + version = "1.5.0"; + sha256 = "04psgirl78klbpzllcvzl510j66jcavxmi9zxnwmmmw128a3dig2"; }; terraform = { @@ -634,8 +634,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tls"; - version = "1.2.0"; - sha256 = "0hvj00j8a820j18yi90xzhd635pkffivp1116d84wyqxya5acd4p"; + version = "2.0.1"; + sha256 = "08fh4k5fvkijl2ds8mxdc5fxlwhs11y5s48vvxdskklvkjhygzc7"; }; triton = { @@ -662,8 +662,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.7.0"; - sha256 = "133ximk510kchr34zicpnp4da27nxvzab2nd8dqpf4sqg2z83i0y"; + version = "1.8.0"; + sha256 = "1g9cw14mzslb445yhj04dzs0s4cbhi4cxycd50vc3f9yyg6sz1rr"; }; vcd = { @@ -683,8 +683,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-yandex"; - version = "0.4.1"; - sha256 = "0lvj7xlzqc6wfv1xpc4qc1gnk3wvcvnifbf4mqgjglz35cf697bb"; + version = "0.5.2"; + sha256 = "1fa1jicirww0zxg5kw4343ndzq86x0m7gkfj8yx7l6lb6gcrkbic"; }; matchbox = { diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index fad4a1d0652..3c4e58098c7 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.0-beta1"; - sha256 = "0djakf2agbhpfqis4x0lf2i8s1ahvrdyfkcgr6lzp0nsks652rcm"; + version = "0.12.0-rc1"; + sha256 = "1ap1q5bixkzshnwy8xyfh768qwg3y4pcjzaiajzn2icjf4ay5nqm"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix new file mode 100644 index 00000000000..becf828a856 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }: + +stdenv.mkDerivation rec { + pname = "chatterino2"; + version = "unstable-2019-05-11"; + src = fetchFromGitHub { + owner = "fourtf"; + repo = pname; + rev = "8c46cbf571dc8fd77287bf3186445ff52b1d1aaf"; + sha256 = "0i2385hamhd9i7jdy906cfrd81cybw524j92l87c8pzrkxphignk"; + fetchSubmodules = true; + }; + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ]; + meta = with stdenv.lib; { + description = "A chat client for Twitch chat"; + longDescription = '' + Chatterino is a chat client for Twitch chat. It aims to be an + improved/extended version of the Twitch web chat. Chatterino 2 is + the second installment of the Twitch chat client series + "Chatterino". + ''; + homepage = "https://github.com/fourtf/chatterino2"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ rexim ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 9b9b479d257..259242606ad 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "rambox-bare-${version}"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "ramboxapp"; repo = "community-edition"; rev = version; - sha256 = "15cy8krzl66b6sfazhff41adq4kf2857sj4h0qvzmadv85dy301v"; + sha256 = "1fsp4jxiypl6zkh5wgf9amyiyx9dqv6h8rsjn5xjp9bna27s0d3b"; }; nativeBuildInputs = [ nodejs-8_x ruby sencha ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit src; nodejs = nodejs-8_x; - sha256 = "0ifk0fzw4zhi4195jlmiq5k57bdmf912372r4bwa4z500wipikq3"; + sha256 = "0qsgr8cq81yismal5sqr02skakqpynwwzk5s98dr5bg91y361fgy"; }; patches = [ ./isDev.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index ed49dc6f612..de8794135fe 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,7 +1,7 @@ -{ darkMode ? false, stdenv, fetchurl, dpkg, makeWrapper -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango -, systemd, xorg, at-spi2-atk }: +{ darkMode ? false, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, +cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf, +libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg, +at-spi2-atk }: let @@ -25,6 +25,7 @@ let pango libnotify libxcb + libappindicator-gtk3 nspr nss stdenv.cc.cc diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 350ac7e13cd..c7b990db602 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,11 +4,11 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.6.7"; - sha256Hash = "1537div6pky7wz3lansz67vsx2h6b653cx91xg9sswnxfsf8nrql"; + version = "1.7.0"; + sha256Hash = "1plfby243hf65wjmppq1qnqmp25pgi4x3awqd4h83ly9hn8qdwfk"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "429149"; - archPatchesHash = "1ylpi9kb6hk27x9wmna4ing8vzn9b7247iya91pyxxrpxrcrhpli"; + archPatchesRevision = "464796"; + archPatchesHash = "1bq7r69k3i9p1csdsca0w41jyz6fbyn4qriv3lg7s28j9s803kw8"; }; in { stable = mkTelegram stableVersion; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 305535029c2..02e49290a68 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.28.3"; + version = "0.28.4"; # not really, git name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1v0ff6qqwj42p3n6qw30czzqi52nvgf3dn05vd7a03g39a5js8af"; + sha256 = "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds"; }; nativeBuildInputs = [ pkgconfig ]; @@ -52,13 +52,13 @@ stdenv.mkDerivation rec { --replace '-install_name $(libdir)' "-install_name $out/lib" ''; - configureFlags = [ "--zshcompletiondir=$(out)/share/zsh/site-functions" ]; + configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" ]; # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and # friends setOutputFlags = false; enableParallelBuilding = true; - makeFlags = "V=1"; + makeFlags = [ "V=1" ]; preCheck = let test-database = fetchurl { @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { gdb man ]; - installTargets = "install install-man"; + installTargets = [ "install" "install-man" ]; dontGzipMan = true; # already compressed diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index b384efc5fe8..7b3e62779e9 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchurl, gd, ncurses, sqlite }: +{ stdenv, fetchurl, pkgconfig, gd, ncurses, sqlite, check }: stdenv.mkDerivation rec { - name = "vnstat-${version}"; + pname = "vnstat"; version = "2.2"; src = fetchurl { sha256 = "0b7020rlc568pz6vkiy28kl8493z88wzrn18wv9b0iq2bv1pn2n6"; - url = "https://humdi.net/vnstat/${name}.tar.gz"; + url = "https://humdi.net/${pname}/${pname}-${version}.tar.gz"; }; - buildInputs = [ gd ncurses sqlite ]; - postPatch = '' substituteInPlace src/cfg.c --replace /usr/local $out ''; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gd ncurses sqlite ]; + + checkInputs = [ check ]; + + doCheck = true; + meta = with stdenv.lib; { description = "Console-based network statistics utility for Linux"; longDescription = '' diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 4a91840077c..236f794c8b7 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -5,6 +5,8 @@ , kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement , kitemmodels, libical, libofx, qgpgme +, sqlcipher + # Needed for running tests: , qtbase, xvfb_run @@ -14,20 +16,13 @@ stdenv.mkDerivation rec { name = "kmymoney-${version}"; - version = "5.0.1"; + version = "5.0.4"; src = fetchurl { url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz"; - sha256 = "1c9apnvc07y17pzy4vygry1dai5ass2z7j354lrcppa85b18yvnx"; + sha256 = "06lbavhl9b8cybnss2mmy3g5w8qn2vl6zhipvbl11lsr3j9bsa8q"; }; - # Fix build with Qt 5.11. - patches = lib.singleton (fetchpatch { - url = "https://cgit.kde.org/kmymoney.git/patch/?id=" - + "e5198a902996b27bf9abde0ad24af82d55ab5dc1"; - sha256 = "1h2f1xznf7343s26fh94x8n2ci0pijk5j86f24lvghawsw848316"; - }); - # Hidden dependency that wasn't included in CMakeLists.txt: NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; @@ -41,6 +36,7 @@ stdenv.mkDerivation rec { akonadi alkimia aqbanking gmp gwenhywfar kactivities karchive kcmutils kcontacts kdewebkit kdiagram kholidays kidentitymanagement kitemmodels libical libofx qgpgme + sqlcipher # Put it into buildInputs so that CMake can find it, even though we patch # it into the interface later. diff --git a/pkgs/applications/office/libreoffice/xdg-open.patch b/pkgs/applications/office/libreoffice/xdg-open.patch deleted file mode 100644 index 3ff7e5d80f7..00000000000 --- a/pkgs/applications/office/libreoffice/xdg-open.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx ---- a/shell/source/unix/exec/shellexec.cxx -+++ b/shell/source/unix/exec/shellexec.cxx -@@ -150,7 +150,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar - if (std::getenv("LIBO_FLATPAK") != nullptr) { - aBuffer.append("/app/bin/xdg-open"); - } else { -- aBuffer.append("/usr/bin/xdg-open"); -+ aBuffer.append("xdg-open"); - } - #endif - aBuffer.append(" "); -diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh -index 4519e01f26e2..8985711a2c01 100755 ---- a/shell/source/unix/misc/senddoc.sh -+++ b/shell/source/unix/misc/senddoc.sh -@@ -393,6 +393,8 @@ case `basename "$MAILER" | sed 's/-.*$//'` in - MAILER=/usr/bin/kde-open - elif [ -x /usr/bin/xdg-open ] ; then - MAILER=/usr/bin/xdg-open -+ elif type -p xdg-open >/dev/null 2>&1 ; then -+ MAILER="$(type -p xdg-open)" - else - echo "Unsupported mail client: `basename $MAILER | sed 's/-.*^//'`" - exit 2 diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index c992724b815..589f583e4e3 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -42,14 +42,14 @@ let then "i386" else "amd64"; - shortVersion = "1.19.1-stable"; + shortVersion = "1.19.5-stable"; version = "${shortVersion}_${arch}"; url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; sha256 = if stdenv.hostPlatform.system == arch32 - then "0fcyl5i8xdgb5j0x1643qc0j74d8p11jczvqmgqkqh0wgid1y1ad" - else "1dzwa2cnn9xakrhhq159fhh71gw5wlbf017rrikdlia694m8akq6"; + then "01x83a44qlxi937b128y8y0px0q4w37g72z652lc42kv50dhyy3f" + else "1cagqq0xziznaj97z30bqfhrwjv3a4h83ckhwigq35nhk1ggq1ry"; deps = [ qtbase diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix new file mode 100644 index 00000000000..0b6ae285bc0 --- /dev/null +++ b/pkgs/applications/office/paperless/default.nix @@ -0,0 +1,170 @@ +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, callPackage + +, python3 +, file +, imagemagick7 +, ghostscript +, optipng +, poppler +, tesseract +, unpaper +}: + +## Usage + +# ${paperless}/bin/paperless wraps manage.py + +# ${paperless}/share/paperless/setup-env.sh can be sourced from a +# shell script to setup a Paperless environment + +# paperless.withConfig is a convenience function to setup a +# configured Paperless instance. (See ./withConfig.nix) + +# For WSGI with gunicorn, use a shell script like this: +# let +# pythonEnv = paperless.python.withPackages (ps: paperless.runtimePackages ++ [ ps.gunicorn ]); +# in +# writers.writeBash "run-gunicorn" '' +# source ${paperless}/share/paperless/setup-env.sh +# PYTHONPATH=$paperlessSrc ${pythonEnv}/bin/gunicorn paperless.wsgi +# '' + +let + paperless = stdenv.mkDerivation rec { + name = "paperless-${version}"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "the-paperless-project"; + repo = "paperless"; + rev = version; + sha256 = "0pkmyky1crjnsg7r0gfk0fadisfsgzlsq6afpz16wx4hp6yvkkf7"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + doCheck = true; + dontInstall = true; + + pythonEnv = python.withPackages (_: runtimePackages); + pythonCheckEnv = python.withPackages (_: (runtimePackages ++ checkPackages)); + + unpackPhase = '' + srcDir=$out/share/paperless + mkdir -p $srcDir + cp -r --no-preserve=mode $src/src/* $src/LICENSE $srcDir + ''; + + buildPhase = let + # Paperless has explicit runtime checks that expect these binaries to be in PATH + extraBin = lib.makeBinPath [ imagemagick7 ghostscript optipng tesseract unpaper ]; + in '' + ${python.interpreter} -m compileall $srcDir + + makeWrapper $pythonEnv/bin/python $out/bin/paperless \ + --set PATH ${extraBin} --add-flags $out/share/paperless/manage.py + + # A shell snippet that can be sourced to setup a paperless env + cat > $out/share/paperless/setup-env.sh < {}).paperless.withConfig { +# dataDir = /tmp/paperless-data; +# config = { +# PAPERLESS_DISABLE_LOGIN = "true"; +# }; +# }' +# +# Setup DB +# ./paperless migrate +# +# Consume documents in ${dataDir}/consume +# ./paperless document_consumer --oneshot +# +# Start web interface +# ./paperless runserver --noreload localhost:8000 + +{ config ? {}, dataDir ? null, ocrLanguages ? null +, paperlessPkg ? paperless, extraCmds ? "" }: +with lib; +let + paperless = if ocrLanguages == null then + paperlessPkg + else + (paperlessPkg.override { + tesseract = paperlessPkg.tesseract.override { + enableLanguages = ocrLanguages; + }; + }).overrideDerivation (_: { + # `ocrLanguages` might be missing some languages required by the tests. + doCheck = false; + }); + + envVars = (optionalAttrs (dataDir != null) { + PAPERLESS_CONSUMPTION_DIR = "${dataDir}/consume"; + PAPERLESS_MEDIADIR = "${dataDir}/media"; + PAPERLESS_STATICDIR = "${dataDir}/static"; + PAPERLESS_DBDIR = "${dataDir}"; + }) // config; + + envVarDefs = mapAttrsToList (n: v: ''export ${n}="${toString v}"'') envVars; + setupEnvVars = builtins.concatStringsSep "\n" envVarDefs; + + setupEnv = '' + source ${paperless}/share/paperless/setup-env.sh + ${setupEnvVars} + ${optionalString (dataDir != null) '' + mkdir -p "$PAPERLESS_CONSUMPTION_DIR" \ + "$PAPERLESS_MEDIADIR" \ + "$PAPERLESS_STATICDIR" \ + "$PAPERLESS_DBDIR" + ''} + ''; + + runPaperless = writers.writeBash "paperless" '' + set -e + ${setupEnv} + ${extraCmds} + exec python $paperlessSrc/manage.py "$@" + ''; +in + runPaperless // { + inherit paperless setupEnv; + } diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 24971b500d3..7f68a8e647e 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz" - "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}.tgz" + "http://tptp.cs.miami.edu/TPTP/Distribution/TPTP-v${version}.tgz" + "http://tptp.cs.miami.edu/TPTP/Archive/TPTP-v${version}.tgz" ]; sha256 = "0yq8452b6mym4yscy46pshg0z2my8xi74b5bp2qlxd5bjwcrg6rl"; }; diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 8ad70531d54..08ab243fb96 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { owner = "vprover"; repo = "vampire"; rev = version; - sha256 = "0d1klprlgqrcn8r5ywgvsahr4qz96ayl67ry5jks946v0k94m1k1"; - fetchSubmodules = true; - leaveDotGit = true; + sha256 = "03dqjxr3cwz4h6sn9074kc6b6wjz12kpsvsi0mq2w0j5l9f8d80y"; + #fetchSubmodules = true; + #leaveDotGit = true; }; nativeBuildInputs = [ git ]; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/0001-fix-gcc-cmath-namespace-issues.patch b/pkgs/applications/science/robotics/qgroundcontrol/0001-fix-gcc-cmath-namespace-issues.patch deleted file mode 100644 index e6c9ca38a98..00000000000 --- a/pkgs/applications/science/robotics/qgroundcontrol/0001-fix-gcc-cmath-namespace-issues.patch +++ /dev/null @@ -1,140 +0,0 @@ -From fffc383c10c7c194e427d78c83802c3b910fa1c2 Mon Sep 17 00:00:00 2001 -From: Patrick Callahan -Date: Thu, 24 Mar 2016 18:17:57 -0700 -Subject: [PATCH] fix gcc cmath namespace issues - ---- - src/Vehicle/Vehicle.cc | 6 +++--- - src/comm/QGCFlightGearLink.cc | 4 ++-- - src/comm/QGCJSBSimLink.cc | 4 ++-- - src/uas/UAS.cc | 8 ++++---- - src/ui/QGCDataPlot2D.cc | 4 ++-- - 5 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc -index a0d3605..205b1de 100644 ---- a/src/Vehicle/Vehicle.cc -+++ b/src/Vehicle/Vehicle.cc -@@ -638,17 +638,17 @@ void Vehicle::setLongitude(double longitude){ - - void Vehicle::_updateAttitude(UASInterface*, double roll, double pitch, double yaw, quint64) - { -- if (isinf(roll)) { -+ if (std::isinf(roll)) { - _rollFact.setRawValue(0); - } else { - _rollFact.setRawValue(roll * (180.0 / M_PI)); - } -- if (isinf(pitch)) { -+ if (std::isinf(pitch)) { - _pitchFact.setRawValue(0); - } else { - _pitchFact.setRawValue(pitch * (180.0 / M_PI)); - } -- if (isinf(yaw)) { -+ if (std::isinf(yaw)) { - _headingFact.setRawValue(0); - } else { - yaw = yaw * (180.0 / M_PI); -diff --git a/src/comm/QGCFlightGearLink.cc b/src/comm/QGCFlightGearLink.cc -index 2a520fb..886aecf 100644 ---- a/src/comm/QGCFlightGearLink.cc -+++ b/src/comm/QGCFlightGearLink.cc -@@ -230,7 +230,7 @@ void QGCFlightGearLink::updateControls(quint64 time, float rollAilerons, float p - Q_UNUSED(systemMode); - Q_UNUSED(navMode); - -- if(!isnan(rollAilerons) && !isnan(pitchElevator) && !isnan(yawRudder) && !isnan(throttle)) -+ if(!std::isnan(rollAilerons) && !std::isnan(pitchElevator) && !std::isnan(yawRudder) && !std::isnan(throttle)) - { - QString state("%1\t%2\t%3\t%4\t%5\n"); - state = state.arg(rollAilerons).arg(pitchElevator).arg(yawRudder).arg(true).arg(throttle); -@@ -240,7 +240,7 @@ void QGCFlightGearLink::updateControls(quint64 time, float rollAilerons, float p - } - else - { -- qDebug() << "HIL: Got NaN values from the hardware: isnan output: roll: " << isnan(rollAilerons) << ", pitch: " << isnan(pitchElevator) << ", yaw: " << isnan(yawRudder) << ", throttle: " << isnan(throttle); -+ qDebug() << "HIL: Got NaN values from the hardware: std::isnan output: roll: " << std::isnan(rollAilerons) << ", pitch: " << std::isnan(pitchElevator) << ", yaw: " << std::isnan(yawRudder) << ", throttle: " << std::isnan(throttle); - } - } - -diff --git a/src/comm/QGCJSBSimLink.cc b/src/comm/QGCJSBSimLink.cc -index 1210621..89db371 100644 ---- a/src/comm/QGCJSBSimLink.cc -+++ b/src/comm/QGCJSBSimLink.cc -@@ -242,7 +242,7 @@ void QGCJSBSimLink::updateControls(quint64 time, float rollAilerons, float pitch - Q_UNUSED(systemMode); - Q_UNUSED(navMode); - -- if(!isnan(rollAilerons) && !isnan(pitchElevator) && !isnan(yawRudder) && !isnan(throttle)) -+ if(!std::isnan(rollAilerons) && !std::isnan(pitchElevator) && !std::isnan(yawRudder) && !std::isnan(throttle)) - { - QString state("%1\t%2\t%3\t%4\t%5\n"); - state = state.arg(rollAilerons).arg(pitchElevator).arg(yawRudder).arg(true).arg(throttle); -@@ -250,7 +250,7 @@ void QGCJSBSimLink::updateControls(quint64 time, float rollAilerons, float pitch - } - else - { -- qDebug() << "HIL: Got NaN values from the hardware: isnan output: roll: " << isnan(rollAilerons) << ", pitch: " << isnan(pitchElevator) << ", yaw: " << isnan(yawRudder) << ", throttle: " << isnan(throttle); -+ qDebug() << "HIL: Got NaN values from the hardware: isnan output: roll: " << std::isnan(rollAilerons) << ", pitch: " << std::isnan(pitchElevator) << ", yaw: " << std::isnan(yawRudder) << ", throttle: " << std::isnan(throttle); - } - //qDebug() << "Updated controls" << state; - } -diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc -index 4d5c1c2..ac88852 100644 ---- a/src/uas/UAS.cc -+++ b/src/uas/UAS.cc -@@ -558,7 +558,7 @@ void UAS::receiveMessage(mavlink_message_t message) - - setAltitudeAMSL(hud.alt); - setGroundSpeed(hud.groundspeed); -- if (!isnan(hud.airspeed)) -+ if (!std::isnan(hud.airspeed)) - setAirSpeed(hud.airspeed); - speedZ = -hud.climb; - emit altitudeChanged(this, altitudeAMSL, altitudeRelative, -speedZ, time); -@@ -654,7 +654,7 @@ void UAS::receiveMessage(mavlink_message_t message) - - float vel = pos.vel/100.0f; - // Smaller than threshold and not NaN -- if ((vel < 1000000) && !isnan(vel) && !isinf(vel)) { -+ if ((vel < 1000000) && !std::isnan(vel) && !std::isinf(vel)) { - setGroundSpeed(vel); - emit speedChanged(this, groundSpeed, airSpeed, time); - } else { -@@ -1439,8 +1439,8 @@ void UAS::setExternalControlSetpoint(float roll, float pitch, float yaw, float t - if (countSinceLastTransmission++ >= 5) { - sendCommand = true; - countSinceLastTransmission = 0; -- } else if ((!isnan(roll) && roll != manualRollAngle) || (!isnan(pitch) && pitch != manualPitchAngle) || -- (!isnan(yaw) && yaw != manualYawAngle) || (!isnan(thrust) && thrust != manualThrust) || -+ } else if ((!std::isnan(roll) && roll != manualRollAngle) || (!std::isnan(pitch) && pitch != manualPitchAngle) || -+ (!std::isnan(yaw) && yaw != manualYawAngle) || (!std::isnan(thrust) && thrust != manualThrust) || - buttons != manualButtons) { - sendCommand = true; - -diff --git a/src/ui/QGCDataPlot2D.cc b/src/ui/QGCDataPlot2D.cc -index 2e530b2..9d5a774 100644 ---- a/src/ui/QGCDataPlot2D.cc -+++ b/src/ui/QGCDataPlot2D.cc -@@ -535,7 +535,7 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil - { - bool okx = true; - x = text.toDouble(&okx); -- if (okx && !isnan(x) && !isinf(x)) -+ if (okx && !std::isnan(x) && !std::isinf(x)) - { - headerfound = true; - } -@@ -561,7 +561,7 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil - y = text.toDouble(&oky); - // Only INF is really an issue for the plot - // NaN is fine -- if (oky && !isnan(y) && !isinf(y) && text.length() > 0 && text != " " && text != "\n" && text != "\r" && text != "\t") -+ if (oky && !std::isnan(y) && !std::isinf(y) && text.length() > 0 && text != " " && text != "\n" && text != "\r" && text != "\t") - { - // Only append definitely valid values - xValues.value(curveName)->append(x); --- -2.7.4 - diff --git a/pkgs/applications/search/recoll/nodeblayout.patch b/pkgs/applications/search/recoll/nodeblayout.patch deleted file mode 100644 index 39988423ae1..00000000000 --- a/pkgs/applications/search/recoll/nodeblayout.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru recoll-1.21.3-orig/recollinstall.in recoll-1.21.3/recollinstall.in ---- recoll-1.21.3-orig/recollinstall.in 2015-09-28 08:08:42.000000000 +0100 -+++ recoll-1.21.3/recollinstall.in 2015-12-13 22:48:30.361776374 +0000 -@@ -45,9 +45,6 @@ - mandir=$DESTDIR/$mandir - ROOTFORPYTHON="--root=${DESTDIR}" - fi --if test -f /etc/debian_version ; then -- OPTSFORPYTHON=--install-layout=deb --fi - - echo "Installing to $PREFIX" diff --git a/pkgs/applications/search/recoll/versionawk.patch b/pkgs/applications/search/recoll/versionawk.patch deleted file mode 100644 index a03ffbc16df..00000000000 --- a/pkgs/applications/search/recoll/versionawk.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru recoll-1.21.3-orig/filters/rclpdf recoll-1.21.3/filters/rclpdf ---- recoll-1.21.3-orig/filters/rclpdf 2015-09-28 08:08:15.000000000 +0100 -+++ recoll-1.21.3/filters/rclpdf 2015-12-14 21:37:01.984945925 +0000 -@@ -129,7 +129,7 @@ - { - # Test poppler version: at some point before 0.24, poppler began - # to properly escape text inside the header (but not the body). -- XYZ=`pdftotext -v 2>&1 | awk '/pdftotext/{print $3}'` -+ XYZ=`pdftotext -v 2>&1 | awk '/version/{print $3}'` - MAJOR=`echo $XYZ | cut -d. -f 1` - MINOR=`echo $XYZ | cut -d. -f 2` - escapeheader=1 diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 25d839e1361..fd07d657b4f 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1x5r732rh1g23smgvvk10nlqbv14m7cf3y6zgwwl2bwkvax4z49b"; + sha256 = "1gsismjhcgz7zk8zvyva4cgnq4wsh4cs7mdabpas9djz34sa1nr1"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' @@ -64,6 +64,6 @@ buildGoPackage rec { description = "Git with a cup of tea"; homepage = https://gitea.io; license = licenses.mit; - maintainers = [ maintainers.disassembler ]; + maintainers = with maintainers; [ disassembler kolaente ]; }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index e5940c93956..81949f95106 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -38,9 +38,10 @@ let patches = [ ./apr-1.patch ]; - # SVN build seems broken on gcc5: - # https://gcc.gnu.org/gcc-5/porting_to.html - CPPFLAGS = "-P"; + # We are hitting the following issue even with APR 1.6.x + # -> https://issues.apache.org/jira/browse/SVN-4813 + # "-P" CPPFLAG is needed to build Python bindings and subversionClient + CPPFLAGS = [ "-P" ]; configureFlags = [ (stdenv.lib.withFeature bdbSupport "berkeley-db") @@ -110,14 +111,9 @@ let }); in { - subversion18 = common { - version = "1.8.19"; - sha256 = "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n"; - }; - subversion19 = common { - version = "1.9.9"; - sha256 = "1ll13ychbkp367c7zsrrpda5nygkryma5k18qfr8wbaq7dbvxzcd"; + version = "1.9.10"; + sha256 = "1mwwbjs8nqr8qyc0xzy7chnylh4q3saycvly8rzq32swadbcca5f"; }; subversion_1_10 = common { @@ -126,9 +122,9 @@ in { extraBuildInputs = [ lz4 utf8proc ]; }; - subversion_1_11 = common { - version = "1.11.1"; - sha256 = "1fv0psjxx5nxb4zmddyrma2bnv1bfff4p8ii6j8fqwjdr982gzcy"; + subversion = common { + version = "1.12.0"; + sha256 = "1prfbrd1jnndb5fcsvwnzvdi7c0bpirb6pmfq03w21x0v1rprbkz"; extraBuildInputs = [ lz4 utf8proc ]; }; } diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix new file mode 100644 index 00000000000..15db28b05e4 --- /dev/null +++ b/pkgs/applications/video/olive-editor/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, pkgconfig, which, qmake, + qtbase, qtmultimedia, frei0r, opencolorio, hicolor-icon-theme, ffmpeg-full, + CoreFoundation }: + +stdenv.mkDerivation rec { + pname = "olive-editor"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "olive-editor"; + repo = "olive"; + rev = version; + sha256 = "191nk4c35gys4iypykcidn6h27c3sbjfy117q7h9h1qilz2wm94z"; + }; + + nativeBuildInputs = [ + pkgconfig + which + qmake + ]; + + buildInputs = [ + ffmpeg-full + frei0r + opencolorio + qtbase + qtmultimedia + qtmultimedia.dev + hicolor-icon-theme + ] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation; + + meta = with stdenv.lib; { + description = "Professional open-source NLE video editor"; + homepage = "https://www.olivevideoeditor.org/"; + downloadPage = "https://www.olivevideoeditor.org/download.php"; + license = licenses.gpl3; + maintainers = [ maintainers.balsoft ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index fd572a9f2eb..5c6510e8cab 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,11 +1,11 @@ -{ config, stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2 +{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2 , libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap , libpng, glib, lvm2, libXrandr, libXinerama, libopus , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus , makeself, perl , javaBindings ? false, jdk ? null -, pythonBindings ? false, python2 ? null +, pythonBindings ? false, python3 ? null , extensionPack ? null, fakeroot ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , enableHardening ? false @@ -17,12 +17,12 @@ with stdenv.lib; let - python = python2; + python = python3; buildType = "release"; # Remember to change the extpackRev and version in extpack.nix and # guest-additions/default.nix as well. - main = "0jmrbyhs92lyarpvylxqn2ajxdg9b290w5nd4g0i4h83d28bwbw0"; - version = "5.2.28"; + main = "0lp584a350ya1zn03lhgmdbi91yp8yfja9hlg2jz1xyfj2dc869l"; + version = "6.0.6"; in stdenv.mkDerivation { name = "virtualbox-${version}"; @@ -76,11 +76,12 @@ in stdenv.mkDerivation { optional enableHardening ./hardened.patch ++ [ ./qtx11extras.patch - (fetchpatch { - name = "010-qt-5.11.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/010-qt-5.11.patch?h=packages/virtualbox"; - sha256 = "0hjx99pg40wqyggnrpylrp5zngva4xrnk7r90i0ynrqc7n84g9pn"; - }) + # https://www.virtualbox.org/ticket/18620 + ./fix_kbuild.patch + # https://www.virtualbox.org/ticket/18621 + ./fix_module_makefile_sed.patch + # https://forums.virtualbox.org/viewtopic.php?f=7&t=92815 + ./fix_printk_test.patch ]; postPatch = '' @@ -192,6 +193,6 @@ in stdenv.mkDerivation { license = licenses.gpl2; homepage = https://www.virtualbox.org/; maintainers = with maintainers; [ flokli sander ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 0e8a6eb25da..d26909ad79a 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -2,7 +2,7 @@ with lib; -let version = "5.2.28"; +let version = "6.0.6"; in fetchurl rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; @@ -10,7 +10,7 @@ fetchurl rec { sha256 = # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. - let value = "376e07cbf2ff2844c95c800346c8e4697d7bc671ae0e21e46153b2e7b4ccc1d6"; + let value = "794f023a186bd217c29c3d30bd1434b6e9de3b242c7bf740d06d10f2d3d981c6"; in assert (builtins.stringLength value) == 64; value; meta = { @@ -18,6 +18,6 @@ fetchurl rec { license = licenses.virtualbox-puel; homepage = https://www.virtualbox.org/; maintainers = with maintainers; [ flokli sander cdepillabout ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch b/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch new file mode 100644 index 00000000000..7cafeada7d9 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch @@ -0,0 +1,12 @@ +diff -urN a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile +--- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile ++++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile +@@ -58,7 +58,7 @@ + RT_WITH_VBOX \ + VBOX_WITH_HARDENING \ + VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk! +-VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement ++VBOXMOD_CFLAGS = -include $(VBOXNETADPT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement + + include $(obj)/Makefile-footer.gmk + diff --git a/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch b/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch new file mode 100644 index 00000000000..6bfa5a4404b --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch @@ -0,0 +1,36 @@ +diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk +--- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2019-04-16 12:16:38.000000000 +0200 ++++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2019-05-04 15:19:14.545497602 +0200 +@@ -175,7 +175,7 @@ + | $$(dir $$@) + $(QUIET)$(RM) -f -- $@ + ifndef VBOX_WITH_HARDENING +- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< ++ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< + else + $(QUIET)$(CP) -f $< $@ + endif +diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk +--- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2019-04-16 12:16:39.000000000 +0200 ++++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2019-05-04 15:19:13.809493324 +0200 +@@ -525,7 +525,7 @@ + | $$(dir $$@) + $(QUIET)$(RM) -f -- $@ + ifndef VBOX_WITH_HARDENING +- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< ++ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< + else + $(QUIET)$(CP) -f $< $@ + endif +diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxPci/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxPci/Makefile.kmk +--- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxPci/Makefile.kmk 2019-04-16 12:16:40.000000000 +0200 ++++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxPci/Makefile.kmk 2019-05-04 15:42:12.029664987 +0200 +@@ -67,7 +67,7 @@ + | $$(dir $$@) + $(QUIET)$(RM) -f -- $@ + ifndef VBOX_WITH_HARDENING +- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< ++ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< + else + $(QUIET)$(CP) -f $< $@ + endif diff --git a/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch b/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch new file mode 100644 index 00000000000..eceaff2dc61 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch @@ -0,0 +1,14 @@ +diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c VirtualBox-6.0.6.new/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +--- VirtualBox-6.0.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2019-04-16 12:16:37.000000000 +0200 ++++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2019-05-04 15:59:44.439905223 +0200 +@@ -426,10 +426,8 @@ + int rc; + PSUPDRVSESSION pSession; + Log(("VBoxDrvLinuxCreate: pFilp=%p pid=%d/%d %s\n", pFilp, RTProcSelf(), current->pid, current->comm)); +- printk("test1\n"); + + #ifdef VBOX_WITH_HARDENING +- printk("test2\n"); + /* + * Only root is allowed to access the unrestricted device, enforce it! + */ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ecefc9bc07e..1a5c6c670c8 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper -, xorg, dbus, virtualbox }: +, zlib, xorg, dbus, virtualbox }: let version = virtualbox.version; @@ -19,32 +19,23 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "0cwdmdgcd1jysyw7c9b3cdk1ngk5nq7slh1zkhxkvvq142cnm1v9"; + sha256 = "1srcsf9264l5yxbq2x83z66j38blbfrywq5lkzwb5kih6sv548c3"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; - patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ]; - - patches = [ - ./fix_kerndir.patch - ./fix_kernincl.patch - ]; + # If you add a patch you probably need this. + #patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ]; hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; nativeBuildInputs = [ patchelf makeWrapper ]; - buildInputs = [ cdrkit dbus ] ++ kernel.moduleBuildDependencies; + buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies; - installPhase = '' - mkdir -p $out - cp -r install/* $out - ''; - - buildCommand = with xorg; '' + unpackPhase = '' ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run chmod 755 ./VBoxLinuxAdditions.run @@ -63,39 +54,30 @@ stdenv.mkDerivation { '' else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions") } + ''; - cd ../ - patchPhase - cd install/src - - # Build kernel modules - export INSTALL_MOD_PATH=$out + doConfigure = false; + buildPhase = '' + # Build kernel modules. + cd src find . -type f | xargs sed 's/depmod -a/true/' -i - cd vboxguest-${version} - + # Run just make first. If we only did make install, we get symbol warnings during build. make - cd ../.. # Change the interpreter for various binaries - for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} other/mount.vboxsf - do - ${if stdenv.hostPlatform.system == "i686-linux" then '' - patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $i - '' - else if stdenv.hostPlatform.system == "x86_64-linux" then '' - patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 $i - '' - else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions") - } - patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc dbus libX11 libXt libXext libXmu libXfixes libXrandr libXcursor ]} $i + for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} other/mount.vboxsf; do + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} $i + patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc zlib + xorg.libX11 xorg.libXt xorg.libXext xorg.libXmu xorg.libXfixes xorg.libXrandr xorg.libXcursor ]} $i done for i in lib/VBoxOGL*.so do - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" dbus libXcomposite libXdamage libXext libXfixes ]} $i + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" + xorg.libXcomposite xorg.libXdamage xorg.libXext xorg.libXfixes ]} $i done # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions @@ -105,6 +87,13 @@ stdenv.mkDerivation { # Remove references to /usr from various scripts and files sed -i -e "s|/usr/bin|$out/bin|" other/vboxclient.desktop sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all + ''; + + installPhase = '' + # Install kernel modules. + cd src/vboxguest-${version} + make install INSTALL_MOD_PATH=$out + cd ../.. # Install binaries install -D -m 755 other/mount.vboxsf $out/bin/mount.vboxsf @@ -131,21 +120,18 @@ stdenv.mkDerivation { # Install Xorg drivers mkdir -p $out/lib/xorg/modules/{drivers,input} install -m 644 other/vboxvideo_drv_${xserverABI}.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so + ''; - # Install kernel modules - cd src + # Stripping breaks these binaries for some reason. + dontStrip = true; - for i in * - do - cd $i - kernelVersion=$(cd ${kernel.dev}/lib/modules; ls) - export MODULE_DIR=$out/lib/modules/$kernelVersion/misc - find . -type f | xargs sed -i -e "s|-o root||g" \ - -e "s|-g root||g" - make install - cd .. + # Some code dlopen() libdbus, patch RUNPATH in fixupPhase so it isn't stripped. + postFixup = '' + for i in $(grep -F libdbus-1.so -l -r $out/{lib,bin}); do + origRpath=$(patchelf --print-rpath "$i") + patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ dbus ]}" "$i" done - ''; # */ + ''; meta = { description = "Guest additions for VirtualBox"; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch deleted file mode 100644 index 0be949f63c9..00000000000 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/vboxsf/Makefile.include.header b/vboxsf/Makefile.include.header -index 8df1eb4d25..5a3e5604e7 100644 ---- a/vboxsf/Makefile.include.header -+++ b/vboxsf/Makefile.include.header -@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) - endif # neq($(KERNELRELEASE),) - - # Kernel build folder --KERN_DIR := /lib/modules/$(KERN_VER)/build - ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) - $(error Error: unable to find the headers of the Linux kernel to build against. \ - Specify KERN_VER= and run Make again) - -diff --git a/vboxguest/Makefile.include.header b/vboxguest/Makefile.include.header -index 8df1eb4d25..5a3e5604e7 100644 ---- a/vboxguest/Makefile.include.header -+++ b/vboxguest/Makefile.include.header -@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) - endif # neq($(KERNELRELEASE),) - - # Kernel build folder --KERN_DIR := /lib/modules/$(KERN_VER)/build - ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) - $(error Error: unable to find the headers of the Linux kernel to build against. \ - Specify KERN_VER= and run Make again) - -diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header -index 8df1eb4d25..5a3e5604e7 100644 ---- a/vboxvideo/Makefile.include.header -+++ b/vboxvideo/Makefile.include.header -@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) - endif # neq($(KERNELRELEASE),) - - # Kernel build folder --KERN_DIR := /lib/modules/$(KERN_VER)/build - ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) - $(error Error: unable to find the headers of the Linux kernel to build against. \ - Specify KERN_VER= and run Make again) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch deleted file mode 100644 index e59e2e98c1b..00000000000 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header -index 8df1eb4d25..5a3e5604e7 100644 ---- a/vboxvideo/Makefile.include.header -+++ b/vboxvideo/Makefile.include.header -@@ -122,7 +122,6 @@ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) - Specify KERN_VER= and run Make again) - endif - # Kernel include folder --KERN_INCL := $(KERN_DIR)/include - # module install folder - INSTALL_MOD_DIR ?= misc - MODULE_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KERN_VER)/$(INSTALL_MOD_DIR) diff --git a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch index 6ed74e3e23e..a3aa98b081d 100644 --- a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch +++ b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch @@ -2,30 +2,15 @@ diff --git a/kBuild/units/qt5.kmk b/kBuild/units/qt5.kmk index 71b96a3..73391f0 100644 --- a/kBuild/units/qt5.kmk +++ b/kBuild/units/qt5.kmk -@@ -1019,9 +1019,10 @@ else +@@ -1054,9 +1054,9 @@ else $(eval $(target)_LIBS += $(PATH_SDK_QT5_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) ) endif else - $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) ) -+ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) \ -+ $(PATH_QT5_X11_EXTRAS_LIB)/lib$(qt_prefix)Qt5X11Extras$(qt_infix)$(SUFF_DLL)) ++ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(if $(filter X11Extras,$(module)),$(PATH_QT5_X11_EXTRAS_LIB),$(PATH_SDK_QT5_LIB))/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) ) endif - $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) ) + $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras ) endif $(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) ) -diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk -index 3295bfefe7..796370623c 100644 ---- a/src/VBox/Frontends/VirtualBox/Makefile.kmk -+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk -@@ -916,9 +916,6 @@ endif - # The Qt modules we're using. - # (The include directory and lib/framework for each module will be added by the Qt unit.) - VirtualBox_QT_MODULES = Core Gui Widgets PrintSupport --VirtualBox_QT_MODULES.linux += X11Extras --VirtualBox_QT_MODULES.solaris += X11Extras --VirtualBox_QT_MODULES.freebsd += X11Extras - VirtualBox_QT_MODULES.darwin += MacExtras - VirtualBox_QT_MODULES.win += WinExtras - if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index bbe514144a1..58b80aae0cf 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -5,6 +5,7 @@ , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs , libxkbcommon, xcbutilxrm, hicolor-icon-theme , asciidoctor +, fontsConf }: with luaPackages; stdenv.mkDerivation rec { @@ -27,8 +28,13 @@ with luaPackages; stdenv.mkDerivation rec { xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs asciidoctor + ldoc ]; + outputs = [ "out" "doc" ]; + + FONTCONFIG_FILE = toString fontsConf; + propagatedUserEnvPkgs = [ hicolor-icon-theme ]; buildInputs = [ cairo librsvg dbus gdk_pixbuf gobject-introspection git lgi libpthreadstubs libstartup_notification diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 635265b04ab..9abbd891e31 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libmatchbox, pkgconfig}: +{ stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }: stdenv.mkDerivation rec { name = "matchbox-${version}"; @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libmatchbox ]; + NIX_LDFLAGS = "-lX11 -L${libX11}/lib -lXext -L${libXext}/lib"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2"; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; - homepage = http://matchbox-project.org/; + homepage = "https://www.yoctoproject.org/software-item/matchbox/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/window-managers/tabbed/xft.patch b/pkgs/applications/window-managers/tabbed/xft.patch deleted file mode 100644 index f4f1e82e705..00000000000 --- a/pkgs/applications/window-managers/tabbed/xft.patch +++ /dev/null @@ -1,234 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index b3da7f0..ce43686 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -1,7 +1,7 @@ - /* See LICENSE file for copyright and license details. */ - - /* appearance */ --static const char font[] = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*"; -+static const char font[] = "monospace-9"; - static const char* normbgcolor = "#222222"; - static const char* normfgcolor = "#cccccc"; - static const char* selbgcolor = "#555555"; -diff --git a/config.mk b/config.mk -index dd741e4..ed3a2e9 100644 ---- a/config.mk -+++ b/config.mk -@@ -9,7 +9,7 @@ MANPREFIX = ${PREFIX}/share/man - - # includes and libs - INCS = -I. -I/usr/include --LIBS = -L/usr/lib -lc -lX11 -+LIBS = -L/usr/lib -lc -lXft -lX11 - - # flags - CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -diff --git a/tabbed.c b/tabbed.c -index b15f9cb..6e50c41 100644 ---- a/tabbed.c -+++ b/tabbed.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - - #include "arg.h" - -@@ -64,17 +65,16 @@ typedef struct { - - typedef struct { - int x, y, w, h; -- unsigned long norm[ColLast]; -- unsigned long sel[ColLast]; -- unsigned long urg[ColLast]; -+ XftColor norm[ColLast]; -+ XftColor sel[ColLast]; -+ XftColor urg[ColLast]; - Drawable drawable; - GC gc; - struct { - int ascent; - int descent; - int height; -- XFontSet set; -- XFontStruct *xfont; -+ XftFont *xfont; - } font; - } DC; /* draw context */ - -@@ -97,7 +97,7 @@ static void unmapnotify(const XEvent *e); - static void destroynotify(const XEvent *e); - static void die(const char *errstr, ...); - static void drawbar(void); --static void drawtext(const char *text, unsigned long col[ColLast]); -+static void drawtext(const char *text, XftColor col[ColLast]); - static void *ecalloc(size_t n, size_t size); - static void *erealloc(void *o, size_t size); - static void expose(const XEvent *e); -@@ -107,7 +107,7 @@ static void focusonce(const Arg *arg); - static void fullscreen(const Arg *arg); - static char* getatom(int a); - static int getclient(Window w); --static unsigned long getcolor(const char *colstr); -+static XftColor getcolor(const char *colstr); - static int getfirsttab(void); - static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size); - static void initfont(const char *fontstr); -@@ -220,12 +220,6 @@ cleanup(void) { - free(clients); - clients = NULL; - -- if(dc.font.set) { -- XFreeFontSet(dpy, dc.font.set); -- } else { -- XFreeFont(dpy, dc.font.xfont); -- } -- - XFreePixmap(dpy, dc.drawable); - XFreeGC(dpy, dc.gc); - XDestroyWindow(dpy, win); -@@ -315,7 +309,7 @@ die(const char *errstr, ...) { - - void - drawbar(void) { -- unsigned long *col; -+ XftColor *col; - int c, cc, fc, width; - char *name = NULL; - -@@ -368,12 +362,13 @@ drawbar(void) { - } - - void --drawtext(const char *text, unsigned long col[ColLast]) { -+drawtext(const char *text, XftColor col[ColLast]) { - int i, x, y, h, len, olen; - char buf[256]; -+ XftDraw *d; - XRectangle r = { dc.x, dc.y, dc.w, dc.h }; - -- XSetForeground(dpy, dc.gc, col[ColBG]); -+ XSetForeground(dpy, dc.gc, col[ColBG].pixel); - XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); - if(!text) - return; -@@ -394,13 +389,12 @@ drawtext(const char *text, unsigned long col[ColLast]) { - for(i = len; i && i > len - 3; buf[--i] = '.'); - } - -- XSetForeground(dpy, dc.gc, col[ColFG]); -- if(dc.font.set) { -- XmbDrawString(dpy, dc.drawable, dc.font.set, -- dc.gc, x, y, buf, len); -- } else { -- XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); -- } -+ XSetForeground(dpy, dc.gc, col[ColFG].pixel); -+ -+ d = XftDrawCreate(dpy, dc.drawable, DefaultVisual(dpy, screen), DefaultColormap(dpy,screen)); -+ -+ XftDrawStringUtf8(d, &col[ColFG], dc.font.xfont, x, y, (XftChar8 *) buf, len); -+ XftDrawDestroy(d); - } - - void * -@@ -537,15 +531,14 @@ getclient(Window w) { - return -1; - } - --unsigned long -+XftColor - getcolor(const char *colstr) { -- Colormap cmap = DefaultColormap(dpy, screen); -- XColor color; -+ XftColor color; - -- if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color)) -+ if(!XftColorAllocName(dpy, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen), colstr, &color)) - die("tabbed: cannot allocate color '%s'\n", colstr); - -- return color.pixel; -+ return color; - } - - int -@@ -594,41 +587,11 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) { - - void - initfont(const char *fontstr) { -- char *def, **missing, **font_names; -- int i, n; -- XFontStruct **xfonts; -- -- missing = NULL; -- if(dc.font.set) -- XFreeFontSet(dpy, dc.font.set); -- -- dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); -- if(missing) { -- while(n--) -- fprintf(stderr, "tabbed: missing fontset: %s\n", missing[n]); -- XFreeStringList(missing); -- } -- -- if(dc.font.set) { -- dc.font.ascent = dc.font.descent = 0; -- n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); -- for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { -- dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent); -- dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent); -- xfonts++; -- } -- } else { -- if(dc.font.xfont) -- XFreeFont(dpy, dc.font.xfont); -- dc.font.xfont = NULL; -- if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)) -- && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed"))) { -- die("tabbed: cannot load font: '%s'\n", fontstr); -- } -+ if(!(dc.font.xfont = XftFontOpenName(dpy,screen,fontstr)) && !(dc.font.xfont = XftFontOpenName(dpy,screen,"fixed"))) -+ die("error, cannot load font: '%s'\n", fontstr); - -- dc.font.ascent = dc.font.xfont->ascent; -- dc.font.descent = dc.font.xfont->descent; -- } -+ dc.font.ascent = dc.font.xfont->ascent; -+ dc.font.descent = dc.font.xfont->descent; - dc.font.height = dc.font.ascent + dc.font.descent; - } - -@@ -1000,11 +963,9 @@ setup(void) { - dc.drawable = XCreatePixmap(dpy, root, ww, wh, - DefaultDepth(dpy, screen)); - dc.gc = XCreateGC(dpy, root, 0, 0); -- if(!dc.font.set) -- XSetFont(dpy, dc.gc, dc.font.xfont->fid); - - win = XCreateSimpleWindow(dpy, root, wx, wy, ww, wh, 0, -- dc.norm[ColFG], dc.norm[ColBG]); -+ dc.norm[ColFG].pixel, dc.norm[ColBG].pixel); - XMapRaised(dpy, win); - XSelectInput(dpy, win, SubstructureNotifyMask|FocusChangeMask| - ButtonPressMask|ExposureMask|KeyPressMask|PropertyChangeMask| -@@ -1070,15 +1031,9 @@ spawn(const Arg *arg) { - - int - textnw(const char *text, unsigned int len) { -- XRectangle r; -- -- if(dc.font.set) { -- XmbTextExtents(dc.font.set, text, len, NULL, &r); -- -- return r.width; -- } -- -- return XTextWidth(dc.font.xfont, text, len); -+ XGlyphInfo ext; -+ XftTextExtentsUtf8(dpy, dc.font.xfont, (XftChar8 *) text, len, &ext); -+ return ext.xOff; - } - - void diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 280202c2200..04130f25f30 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "5.00"; + version = "5.01"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "006rcqhs4ay9q8wip2kbgk3065gwvfbzrqgv2dsydwvcnwv50bss"; + sha256 = "09xn8d8xxwgms6h1bvjlgn3mxz51vxf3ra0ry9f5dqi29qry3z3x"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index 51f1d668cd2..312cef61ec7 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "5.8.1"; + version = "5.8.2"; in fetchzip rec { name = "font-awesome-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "1fc177sgf4qd231dmpr7cwr1j03wzb927ylpng2gn94iksln924d"; + sha256 = "1h0qhvkfyfs4579jvrk3gwc7dp4i9s46bkj406b493dvmxxhv986"; meta = with stdenv.lib; { description = "Font Awesome - OTF font"; diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix new file mode 100644 index 00000000000..12adfcb9136 --- /dev/null +++ b/pkgs/data/fonts/public-sans/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip }: + +let + version = "1.003"; +in fetchzip rec { + name = "public-sans-${version}"; + + url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip"; + + postFetch = '' + mkdir -p $out/share + unzip $downloadedFile fonts/{otf,variable}/\*.\[ot\]tf -d $out/share/ + ''; + + sha256 = "02ranwr1bw4n9n1ljw234nzhj2a0hgradniib37nh10maark5wg3"; + + meta = with stdenv.lib; { + description = "A strong, neutral, principles-driven, open source typeface for text or display"; + homepage = https://public-sans.digital.gov/; + license = licenses.ofl; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 11be8acc259..d1652be90d6 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f0c3944190bf34286e4e80620fede11dd688f68.tar.gz"; - sha256 = "1i4k4wjm6w8hgwia1axwdr3ij0ckxh3ikc1f0nlk8sb0j3yrmxa6"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/00d16ba60110e6956b6f7d31d520d0a34377b047.tar.gz"; + sha256 = "1f6d0a06g51r01mgg6fm9b8nd2bzkijf6jm6ljm5c62qgi4fkc7k"; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 4e6a5bde55d..0cb3ae5136f 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20190301"; + version = "20190504"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1rjqizsglgdcjxi7kpbwm26krdkrlxacinjp9684sfzhqwdqi4as"; + sha256 = "1yik26gbm3y3wviyabfpyx7pnqx72z5j7267hdgfscdvrwwmyi5z"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index edb1113a696..31d4a068908 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matcha-${version}"; - version = "2018-12-24"; + version = "2019_05_09"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "matcha"; rev = version; - sha256 = "178y5s5jfprkw8y6clqb8ss4kvfswivfrh6cn67fk4z7wg72i3yc"; + sha256 = "0xnv89appivrnbppyjqaa35pls120mkz253p2lblyxzbvi5kgn73"; }; buildInputs = [ gdk_pixbuf librsvg ]; diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix index 78948a1813a..35ad998e859 100644 --- a/pkgs/data/themes/shades-of-gray/default.nix +++ b/pkgs/data/themes/shades-of-gray/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "shades-of-gray-theme"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "WernerFP"; repo = pname; rev = version; - sha256 = "0jp4p0wdmac5dkz1hqhzqmn59zgxqd77gn0napy3wbqr5yc60pp1"; + sha256 = "09r26izbx9sj9czc95cn4r0c1v9yj2qm84zdl047fiqa49czwbzq"; }; buildInputs = [ gtk_engines ]; diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix index 37e4cb2002b..986bee2f0dd 100644 --- a/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/pkgs/desktops/deepin/deepin-wm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, - bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3, libwnck3, - deepin-menu, deepin-mutter, deepin-wallpapers, + dbus, bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3, + libwnck3, deepin-menu, deepin-mutter, deepin-wallpapers, deepin-desktop-schemas, wrapGAppsHook, deepin }: stdenv.mkDerivation rec { @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ bamf clutter-gtk + dbus deepin-desktop-schemas deepin-menu deepin-mutter @@ -40,10 +41,15 @@ stdenv.mkDerivation rec { ]; postPatch = '' - searchHardCodedPaths - fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala + searchHardCodedPaths # debugging + # fix background path + fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala sed -i 's|default_background.jpg|deepin/desktop.jpg|' src/Background/BackgroundSource.vala + + # fix executable paths in desktop files + sed -i -e "s,Exec=dbus-send,Exec=${dbus}/bin/dbus-send," data/gala-multitaskingview.desktop.in + sed -i -e "s,Exec=deepin-wm,Exec=$out/bin/deepin-wm," data/gala.desktop ''; NIX_CFLAGS_COMPILE = "-DWNCK_I_KNOW_THIS_IS_UNSTABLE"; @@ -52,6 +58,10 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; + postFixup = '' + searchHardCodedPaths $out # debugging + ''; + enableParallelBuilding = true; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/enlightenment/elementary.patch b/pkgs/desktops/enlightenment/elementary.patch deleted file mode 100644 index 32080c81cb3..00000000000 --- a/pkgs/desktops/enlightenment/elementary.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/elementary.pc.in 2015-05-16 21:08:14.321148417 +0200 -+++ b/elementary.pc.in 2015-05-16 21:08:30.643412725 +0200 -@@ -14,4 +14,4 @@ - Requires.private: @requirement_elm_pc@ - Version: @VERSION@ - Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@ --Cflags: -I${includedir}/elementary-@VMAJ@ -+Cflags: -I${includedir}/elementary-@VMAJ@ @ELEMENTARY_PC_CFLAGS@ ---- a/Makefile.am 2015-05-16 21:08:14.322148433 +0200 -+++ b/Makefile.am 2015-05-16 21:08:30.643412725 +0200 -@@ -84,6 +84,7 @@ - -e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \ - -e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \ - -e 's,@ELEMENTARY_PC_LIBS\@,$(ELEMENTARY_PC_LIBS),g' \ -+-e 's,@ELEMENTARY_PC_CFLAGS\@,$(ELEMENTARY_PC_CFLAGS),g' \ - < $< > $@ || rm $@ - - pc_verbose = $(pc_verbose_@AM_V@) diff --git a/pkgs/desktops/gnustep/back/fixup-tools.patch b/pkgs/desktops/gnustep/back/fixup-tools.patch deleted file mode 100644 index a47de5478e3..00000000000 --- a/pkgs/desktops/gnustep/back/fixup-tools.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -c gnustep-back-0.24.0/Tools/GNUmakefile.preamble gnustep-back-0.24.0.patched/Tools/GNUmakefile.preamble ---- gnustep-back-0.24.0/Tools/GNUmakefile.preamble 2013-07-04 22:44:28.000000000 +0600 -+++ gnustep-back-0.24.0.patched/Tools/GNUmakefile.preamble 2014-12-01 16:40:37.000000000 +0600 -@@ -52,6 +52,9 @@ - # Additional libraries when linking applications - #ADDITIONAL_GUI_LIBS += - -+# Additional libraries when linking tools -+gpbs_TOOL_LIBS += -lgnustep-gui -lgnustep-base $(SYSTEM_LIBS) -+ - # - # Flags dealing with installing and uninstalling - # - diff --git a/pkgs/desktops/gnustep/base/fixup-base-makefile-installdir.patch b/pkgs/desktops/gnustep/base/fixup-base-makefile-installdir.patch deleted file mode 100644 index 482c72a5190..00000000000 --- a/pkgs/desktops/gnustep/base/fixup-base-makefile-installdir.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- gnustep-base-1.24.7/Makefile.postamble 2011-07-15 19:53:45.000000000 +0600 -+++ gnustep-base-1.24.7.patched/Makefile.postamble 2014-11-29 22:25:07.000000000 +0600 -@@ -38,13 +38,13 @@ - # Things to do after compiling - # after-all:: - --$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional: -- $(ECHO_CREATING)$(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional$(END_ECHO) -+$(DESTDIR_GNUSTEP_MAKEFILES)/Additional: -+ $(ECHO_CREATING)$(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional$(END_ECHO) - - # Things to do before installing --before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional -+before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional - $(ECHO_NOTHING)$(INSTALL_DATA) base.make \ -- $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) -+ $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) - - # Things to do after installing - # after-install:: -@@ -54,7 +54,7 @@ - - # Things to do after uninstalling - after-uninstall:: -- $(ECHO_NOTHING)rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) -+ $(ECHO_NOTHING)rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) - - # Things to do before cleaning - # before-clean:: diff --git a/pkgs/desktops/gnustep/gorm/fix-gs-makefiles.patch b/pkgs/desktops/gnustep/gorm/fix-gs-makefiles.patch deleted file mode 100644 index c4b3d1e1d81..00000000000 --- a/pkgs/desktops/gnustep/gorm/fix-gs-makefiles.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ru gorm-1.2.20/GNUmakefile gorm-1.2.20.patched/GNUmakefile ---- gorm-1.2.20/GNUmakefile 2010-05-30 12:55:26.000000000 +0600 -+++ gorm-1.2.20.patched/GNUmakefile 2014-12-10 22:21:18.000000000 +0600 -@@ -24,6 +24,23 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - # - -+ifeq ($(GNUSTEP_MAKEFILES),) -+ GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) -+ ifeq ($(GNUSTEP_MAKEFILES),) -+ $(warning ) -+ $(warning Unable to obtain GNUSTEP_MAKEFILES setting from gnustep-config!) -+ $(warning Perhaps gnustep-make is not properly installed,) -+ $(warning so gnustep-config is not in your PATH.) -+ $(warning ) -+ $(warning Your PATH is currently $(PATH)) -+ $(warning ) -+ endif -+endif -+ -+ifeq ($(GNUSTEP_MAKEFILES),) -+ $(error You need to set GNUSTEP_MAKEFILES before compiling!) -+endif -+ - PACKAGE_NAME = gorm - export PACKAGE_NAME - include $(GNUSTEP_MAKEFILES)/common.make diff --git a/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch b/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch deleted file mode 100644 index 30c6f56c032..00000000000 --- a/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- gnustep-gui-0.24.0/GNUmakefile.postamble 2010-05-17 22:38:59.000000000 +0600 -+++ gnustep-gui-0.24.0.patched/GNUmakefile.postamble 2014-12-01 13:44:05.000000000 +0600 -@@ -40,20 +40,20 @@ - # The following rule is important mainly for packaging, because in that case - # you install into a fake system tree, and the directory is not there. - # --$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional: -- $(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional -+$(DESTDIR_GNUSTEP_MAKEFILES)/Additional: -+ $(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional - - # Things to do before installing --before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional -+before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional - $(INSTALL_DATA) gui.make \ -- $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make -+ $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make - - # Things to do after installing - # after-install:: - - # Things to do before uninstalling - before-uninstall:: -- rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make -+ rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make - - # Things to do after uninstalling - # after-uninstall:: diff --git a/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch b/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch deleted file mode 100644 index 23ec2db0fbd..00000000000 --- a/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnustep-gui-0.24.0/TextConverters/RTF/GNUmakefile.preamble 2008-06-10 10:01:49.000000000 +0600 -+++ gnustep-gui-0.24.0.patched/TextConverters/RTF/GNUmakefile.preamble 2014-12-01 13:02:11.000000000 +0600 -@@ -49,7 +49,7 @@ - ADDITIONAL_INCLUDE_DIRS +=-I../../Headers/Additions -I../../Headers - - # Additional LDFLAGS to pass to the linker --#ADDITIONAL_LDFLAGS += -+ADDITIONAL_LDFLAGS += -lgnustep-gui - - # Additional library directories the linker should search - ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) diff --git a/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch b/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch deleted file mode 100644 index e57ddec75ad..00000000000 --- a/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gnustep-gui-0.24.0/Tools/GNUmakefile.preamble 2006-02-22 12:43:48.000000000 +0600 -+++ gnustep-gui-0.24.0.patched/Tools/GNUmakefile.preamble 2014-12-01 12:52:41.000000000 +0600 -@@ -32,9 +32,11 @@ - ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR) -L../Model/$(GNUSTEP_OBJ_DIR) - - # Additional libraries when linking tools -+make_services_TOOL_LIBS += -lgnustep-base - gpbs_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) - set_show_service_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) - gopen_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) -+gclose_TOOL_LIBS += -lgnustep-base - gcloseall_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) - GSspell_TOOL_LIBS += $(ADDITIONAL_DEPENDS) - diff --git a/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch b/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch deleted file mode 100644 index 98e22f37ee7..00000000000 --- a/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -ru gnustep-make-2.6.6/common.make gnustep-make-2.6.6.patched/common.make ---- gnustep-make-2.6.6/common.make 2013-03-04 17:21:55.000000000 +0600 -+++ gnustep-make-2.6.6.patched/common.make 2014-12-09 21:29:10.000000000 +0600 -@@ -135,7 +135,9 @@ - endif - # Then include makefiles with flags/config options installed by the - # libraries themselves ---include $(GNUSTEP_MAKEFILES)/Additional/*.make -+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),) -+-include $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL) -+endif - - # - # Determine target specific settings -diff -ru gnustep-make-2.6.6/GNUmakefile.in gnustep-make-2.6.6.patched/GNUmakefile.in ---- gnustep-make-2.6.6/GNUmakefile.in 2013-09-20 12:13:15.000000000 +0600 -+++ gnustep-make-2.6.6.patched/GNUmakefile.in 2014-12-07 20:35:27.000000000 +0600 -@@ -173,7 +173,6 @@ - "$(makedir)/$(GNUSTEP_TARGET_CPU)" \ - "$(makedir)/$(GNUSTEP_TARGET_DIR)" \ - "$(makedir)/$(GNUSTEP_TARGET_LDIR)" \ -- "$(makedir)/Additional" \ - "$(makedir)/Auxiliary" \ - "$(makedir)/Master" \ - "$(makedir)/Instance" \ -@@ -314,7 +313,6 @@ - -rmdir "$(makedir)/Instance" - -rmdir "$(makedir)/Master" - -rmdir "$(makedir)/Auxiliary" -- -rmdir "$(makedir)/Additional" - -rmdir "$(makedir)/$(GNUSTEP_TARGET_LDIR)" - -rmdir "$(makedir)/$(GNUSTEP_TARGET_DIR)" - -rmdir "$(makedir)/$(GNUSTEP_TARGET_CPU)" -diff -ru gnustep-make-2.6.6/gnustep-config.in gnustep-make-2.6.6.patched/gnustep-config.in ---- gnustep-make-2.6.6/gnustep-config.in 2013-07-02 16:06:24.000000000 +0600 -+++ gnustep-make-2.6.6.patched/gnustep-config.in 2014-12-09 21:29:49.000000000 +0600 -@@ -66,6 +66,7 @@ - echo " --variable=OBJCXX" - echo " --variable=GNUMAKE" - echo " --variable=GNUSTEP_MAKEFILES" -+ echo " --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL" - echo " --variable=GNUSTEP_USER_DEFAULTS_DIR" - echo " --variable=GNUSTEP_HOST" - echo " --variable=GNUSTEP_HOST_CPU" -@@ -153,6 +154,8 @@ - - export GNUSTEP_MAKEFILES - -+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL -+ - # - # If all they want to know if GNUSTEP_MAKEFILES or anything that - # we can compute only using GNUSTEP_MAKEFILES, we can print it out -@@ -168,6 +171,8 @@ - exit 0;; - --variable=GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES" - exit 0;; -+ --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL) echo "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" -+ exit 0;; - --variable=GNUMAKE) echo "@GNUMAKE@" - exit 0;; - --debug-flags) @GNUMAKE@ -s -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes debug=yes 2>/dev/null -diff -ru gnustep-make-2.6.6/GNUstep.csh.in gnustep-make-2.6.6.patched/GNUstep.csh.in ---- gnustep-make-2.6.6/GNUstep.csh.in 2011-05-03 13:40:10.000000000 +0600 -+++ gnustep-make-2.6.6.patched/GNUstep.csh.in 2014-12-09 20:14:05.000000000 +0600 -@@ -130,6 +130,10 @@ - setenv GNUSTEP_MAKEFILES "@GNUSTEP_MAKEFILES@" - endif - -+if ( ! ${?NIX_GNUSTEP_MAKEFILES_ADDITIONAL} ) then -+ setenv NIX_GNUSTEP_MAKEFILES_ADDITIONAL "@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@" -+endif -+ - if ( "${GNUSTEP_MAKE_STRICT_V2_MODE}" == "yes" ) then - unsetenv GNUSTEP_USER_DIR - unsetenv GNUSTEP_USER_ROOT -diff -ru gnustep-make-2.6.6/GNUstep.sh.in gnustep-make-2.6.6.patched/GNUstep.sh.in ---- gnustep-make-2.6.6/GNUstep.sh.in 2012-02-21 20:21:38.000000000 +0600 -+++ gnustep-make-2.6.6.patched/GNUstep.sh.in 2014-12-09 20:14:19.000000000 +0600 -@@ -173,6 +173,10 @@ - fi - export GNUSTEP_MAKEFILES - -+if [ -z "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" ]; then -+ NIX_GNUSTEP_MAKEFILES_ADDITIONAL=@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@ -+fi -+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL - - if [ "$GNUSTEP_MAKE_STRICT_V2_MODE" = "yes" ]; then - # Make sure this is never set in gnustep-make v2 strict mode; it -diff -ru gnustep-make-2.6.6/GNUstep-strict-v2.conf.in gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in ---- gnustep-make-2.6.6/GNUstep-strict-v2.conf.in 2008-01-15 20:35:36.000000000 +0600 -+++ gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in 2014-12-07 22:04:56.000000000 +0600 -@@ -47,7 +47,6 @@ - # Traditionally, this is /usr/GNUstep/System/Library/Makefiles - GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@ - -- - # This is where the user home directories are. Only used to provide - # NSUserDirectory in gnustep-base. Never used anywhere else. - GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@ -diff -ru gnustep-make-2.6.6/library-combo.make gnustep-make-2.6.6.patched/library-combo.make ---- gnustep-make-2.6.6/library-combo.make 2012-02-21 19:53:02.000000000 +0600 -+++ gnustep-make-2.6.6.patched/library-combo.make 2014-12-09 20:15:05.000000000 +0600 -@@ -142,7 +142,7 @@ - # - # Third-party foundations not using make package - # Our own foundation will install a base.make file into --# $GNUSTEP_MAKEFILES/Additional/ to set the needed flags -+# $NIX_GNUSTEP_MAKEFILES_ADDITIONAL to set the needed flags - # - ifeq ($(FOUNDATION_LIB), nx) - # -framework Foundation is used both to find headers, and to link -@@ -166,7 +166,7 @@ - - # - # FIXME - Ask Helge to move this inside his libFoundation, and have --# it installed as a $(GNUSTEP_MAKEFILES)/Additional/libFoundation.make -+# it installed as a $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/libFoundation.make - # - ifeq ($(FOUNDATION_LIB),fd) - -include $(GNUSTEP_MAKEFILES)/libFoundation.make -@@ -193,7 +193,7 @@ - GUI_LIBS = - # - # Third-party GUI libraries - our own sets its flags into --# $(GNUSTEP_MAKEFILES)/Additional/gui.make -+# $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/gui.make - # - ifeq ($(GUI_LIB), nx) - GUI_DEFINE = -DNeXT_GUI_LIBRARY=1 -diff -ru gnustep-make-2.6.6/rules.make gnustep-make-2.6.6.patched/rules.make ---- gnustep-make-2.6.6/rules.make 2013-07-04 16:05:44.000000000 +0600 -+++ gnustep-make-2.6.6.patched/rules.make 2014-12-09 21:31:04.000000000 +0600 -@@ -667,7 +667,9 @@ - exit 1$(END_ECHO) - endif - --$(GNUSTEP_MAKEFILES)/Additional/*.make: ; -+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),) -+$(NIX_GNUSTEP_MAKEFILES_ADDITIONAL): ; -+endif - - $(GNUSTEP_MAKEFILES)/Master/*.make: ; - diff --git a/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch b/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch deleted file mode 100644 index 3fe19a6a58b..00000000000 --- a/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -c ProjectCenter-0.6.2/GNUmakefile.preamble ProjectCenter-0.6.2.patched/GNUmakefile.preamble ---- ProjectCenter-0.6.2/GNUmakefile.preamble 2010-08-08 03:56:04.000000000 +0600 -+++ artyom/ProjectCenter-0.6.2.patched/GNUmakefile.preamble 2014-12-01 20:08:31.000000000 +0600 -@@ -39,7 +39,7 @@ - ADDITIONAL_INCLUDE_DIRS += -I./ -I./Headers - - # Additional LDFLAGS to pass to the linker --ADDITIONAL_LDFLAGS += -+ADDITIONAL_LDFLAGS += -lgnustep-base -lgnustep-gui - - # Additional library directories the linker should search - ADDITIONAL_LIB_DIRS += -L./Framework/ProjectCenter.framework/$(GNUSTEP_TARGET_LDIR) - -Diff finished. Mon Dec 1 20:08:50 2014 diff --git a/pkgs/desktops/xfce4-13/exo/gtk3-only.patch b/pkgs/desktops/xfce4-13/exo/gtk3-only.patch deleted file mode 100644 index 74e6f812e3c..00000000000 --- a/pkgs/desktops/xfce4-13/exo/gtk3-only.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urNZ a/configure.ac.in b/configure.ac.in ---- a/configure.ac.in 2017-11-20 02:57:40.476664918 +0000 -+++ b/configure.ac.in 2017-11-20 03:07:18.999128370 +0000 -@@ -165,11 +165,9 @@ - dnl *********************************** - XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) - XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) --XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) - XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0]) - XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) - XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) --XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0]) - XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) - XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features]) - -diff -urNZ a/exo/Makefile.am b/exo/Makefile.am ---- a/exo/Makefile.am 2017-11-20 02:57:34.444785202 +0000 -+++ b/exo/Makefile.am 2017-11-20 03:00:49.402897465 +0000 -@@ -117,7 +117,7 @@ - - libexo_2_includedir = $(includedir)/exo-2/exo - --lib_LTLIBRARIES += libexo-2.la -+lib_LTLIBRARIES = libexo-2.la - - libexo_2_include_HEADERS = \ - exo.h \ -Binary files a/.git/index and b/.git/index differ diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index 4e8ab34b101..b4f35b1c4c0 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -12,25 +12,21 @@ let rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ]; in stdenv.mkDerivation rec { - version = "2.2.103"; - netCoreVersion = "2.2.1"; - name = "dotnet-sdk-${version}"; + version = "2.2.203"; + netCoreVersion = "2.2.4"; + pname = "dotnet-sdk"; src = fetchurl { - url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz"; + url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-x64.tar.gz"; # use sha512 from the download page - sha512 = "777AC6DCD0200BA447392E451A1779F0FBFA548BD620A7BBA3EEBDF35892236C3F10B19FF81D4F64B5BC134923CB47F9CC45EE6B004140E1249582249944DB69"; + sha512 = "8DA955FA0AEEBB6513A6E8C4C23472286ED78BD5533AF37D79A4F2C42060E736FDA5FD48B61BF5AEC10BBA96EB2610FACC0F8A458823D374E1D437B26BA61A5C"; }; - unpackPhase = '' - mkdir src - cd src - tar xvzf $src - ''; + sourceRoot = "."; buildPhase = '' runHook preBuild - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./dotnet + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ./dotnet patchelf --set-rpath "${rpath}" ./dotnet find -type f -name "*.so" -exec patchelf --set-rpath "${rpath}" {} \; echo -n "dotnet-sdk version: " diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index d03c2b64894..8fba9be4901 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -411,7 +411,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ peti ]; + maintainers = with stdenv.lib.maintainers; [ peti veprbl ]; platforms = stdenv.lib.platforms.linux ++ diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix new file mode 100644 index 00000000000..0d75de7557b --- /dev/null +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -0,0 +1,384 @@ +{ stdenv, targetPackages, fetchurl, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langObjC ? stdenv.targetPlatform.isDarwin +, langObjCpp ? stdenv.targetPlatform.isDarwin +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man) +, gmp, mpfr, libmpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, isl ? null # optional, for the Graphite optimization framework. +, zlib ? null +, enableMultilib ? false +, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins +, name ? "gcc" +, libcCross ? null +, crossStageStatic ? false +, # Strip kills static libs of other archs (hence no cross) + stripped ? stdenv.hostPlatform == stdenv.buildPlatform + && stdenv.targetPlatform == stdenv.hostPlatform +, gnused ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, buildPackages +}: + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert stdenv.hostPlatform.isDarwin -> gnused != null; + +# The go frontend is written in c++ +assert langGo -> langCC; + +with stdenv.lib; +with builtins; + +let version = "9.1.0"; + + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + patches = + optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch + /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied + url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; + sha256 = ""; # TODO: uncomment and check hash when available. + }) */ + ++ optional langFortran ../gfortran-driving.patch + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch; + + /* Cross-gcc settings (build == host != target) */ + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; + crossConfigureFlags = + # Ensure that -print-prog-name is able to find the correct programs. + [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ + (if crossMingw && crossStageStatic then [ + "--with-headers=${libcCross}/include" + "--with-gcc" + "--with-gnu-as" + "--with-gnu-ld" + "--with-gnu-ld" + "--disable-shared" + "--disable-nls" + "--disable-debug" + "--enable-sjlj-exceptions" + "--enable-threads=win32" + "--disable-win32-registry" + "--disable-libmpx" # requires libc + ] else if crossStageStatic then [ + "--disable-libssp" + "--disable-nls" + "--without-headers" + "--disable-threads" + "--disable-libgomp" + "--disable-libquadmath" + "--disable-shared" + "--disable-libatomic" # requires libc + "--disable-decimal-float" # requires libc + "--disable-libmpx" # requires libc + ] else [ + (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" + else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}") + "--enable-__cxa_atexit" + "--enable-long-long" + ] ++ + (if crossMingw then [ + "--enable-threads=win32" + "--enable-sjlj-exceptions" + "--enable-hash-synchronization" + "--enable-libssp" + "--disable-nls" + "--with-dwarf2" + # To keep ABI compatibility with upstream mingw-w64 + "--enable-fully-dynamic-string" + ] else + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ + # libsanitizer requires netrom/netrom.h which is not + # available in uclibc. + "--disable-libsanitizer" + # In uclibc cases, libgomp needs an additional '-ldl' + # and as I don't know how to pass it, I disable libgomp. + "--disable-libgomp" + # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 + "--disable-libmpx" + ] + ++ optional (targetPlatform.libc == "newlib") "--with-newlib" + ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" + ++ [ + "--enable-threads=${if targetPlatform.isUnix then "posix" + else if targetPlatform.isWindows then "win32" + else "single"}" + "--enable-nls" + "--disable-decimal-float" # No final libdecnumber (it may work only in 386) + ])); + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; + crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; + + bootstrap = targetPlatform == hostPlatform; + +in + +stdenv.mkDerivation ({ + name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + + builder = ../builder.sh; + + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "1817nc2bqdc251k0lpc51cimna7v68xjrnvqzvc50q3ax4s6i9kr"; + }; + + inherit patches; + + outputs = [ "out" "lib" "man" "info" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + + hardeningDisable = [ "format" "pie" ]; + + # This should kill all the stdinc frameworks that gcc and friends like to + # insert into default search paths. + prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + + substituteInPlace libgcc/config/t-slibgcc-darwin \ + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)" + + substituteInPlace libgfortran/configure \ + --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" + ''; + + postPatch = '' + configureScripts=$(find . -name configure) + for configureScript in $configureScripts; do + patchShebangs $configureScript + done + '' + ( + if targetPlatform != hostPlatform || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q _DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' + done + '' + + stdenv.lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) + else ""); + + inherit noSysDirs staticCompiler crossStageStatic + libcCross crossMingw; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl); + + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional hostPlatform.isDarwin gnused) + ; + + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + + preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` + export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" + export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" + export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" + ''; + + dontDisableStatic = true; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + + configureFlags = + # Basic dependencies + [ + "--with-gmp-include=${gmp.dev}/include" + "--with-gmp-lib=${gmp.out}/lib" + "--with-mpfr-include=${mpfr.dev}/include" + "--with-mpfr-lib=${mpfr.out}/lib" + "--with-mpc=${libmpc}" + ] ++ + optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ + + # Basic configuration + [ + "--enable-lto" + "--disable-libstdcxx-pch" + "--without-included-gettext" + "--with-system-zlib" + "--enable-static" + "--enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + }" + ] ++ + + (if (enableMultilib || targetPlatform.isAvr) + then ["--enable-multilib" "--disable-libquadmath"] + else ["--disable-multilib"]) ++ + optional (!enableShared) "--disable-shared" ++ + (if enablePlugin + then ["--enable-plugin"] + else ["--disable-plugin"]) ++ + + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + + (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++ + optional (targetPlatform != hostPlatform) crossConfigureFlags ++ + optional (!bootstrap) "--disable-bootstrap" ++ + + # Platform-specific flags + optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++ + optionals hostPlatform.isSunOS [ + "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" + # On Illumos/Solaris GNU as is preferred + "--with-gnu-as" "--without-gnu-ld" + ] + ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [ + "--disable-libsanitizer" + "--disable-symvers" + "libat_cv_have_ifunc=no" + "--disable-gnu-indirect-function" + ] + ; + + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + + buildFlags = optional + (bootstrap && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; + + installTargets = + if stripped + then "install-strip" + else "install"; + + # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. + + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + )); + + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); + + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}${libcCross.libdir or "/lib"}" + ]); + + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" + ] ++ (if crossStageStatic then [ + "-B${libcCross.out}${libcCross.libdir or "/lib"}" + ] else [ + "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" + "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" + ])); + + passthru = { + inherit langC langCC langObjC langObjCpp langFortran langGo version; + isGNU = true; + }; + + enableParallelBuilding = true; + inherit enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = https://gcc.gnu.org/; + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = with stdenv.lib.maintainers; [ synthetica ]; + + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ + stdenv.lib.platforms.darwin; + }; +} + +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/development/compilers/graalvm/001_mx.py.patch b/pkgs/development/compilers/graalvm/001_mx.py.patch new file mode 100644 index 00000000000..25a9efa9641 --- /dev/null +++ b/pkgs/development/compilers/graalvm/001_mx.py.patch @@ -0,0 +1,257 @@ +diff --git a/mx.py b/mx.py +index d119b62..471fe98 100644 +--- a/mx.py ++++ b/mx.py +@@ -4961,30 +4961,6 @@ class PackedResourceLibrary(ResourceLibrary): + + def get_path(self, resolve): + extract_path = _make_absolute(self.extract_path, self.suite.dir) +- download_path = super(PackedResourceLibrary, self).get_path(resolve) +- if resolve and self._check_extract_needed(extract_path, download_path): +- extract_path_tmp = tempfile.mkdtemp(suffix=basename(extract_path), dir=dirname(extract_path)) +- try: +- # extract archive +- Extractor.create(download_path).extract(extract_path_tmp) +- # ensure modification time is up to date +- os.utime(extract_path_tmp, None) +- logv("Moving temporary directory {} to {}".format(extract_path_tmp, extract_path)) +- try: +- # attempt atomic overwrite +- os.rename(extract_path_tmp, extract_path) +- except OSError: +- # clean destination & re-try for cases where atomic overwrite doesn't work +- rmtree(extract_path, ignore_errors=True) +- os.rename(extract_path_tmp, extract_path) +- except OSError as ose: +- # Rename failed. Race with other process? +- if self._check_extract_needed(extract_path, download_path): +- # ok something really went wrong +- abort("Extracting {} failed!".format(download_path), context=ose) +- finally: +- rmtree(extract_path_tmp, ignore_errors=True) +- + return extract_path + + def _check_download_needed(self): +@@ -5885,7 +5861,7 @@ class HgConfig(VC): + + def update_to_branch(self, vcdir, branch, abortOnError=True): + cmd = ['update', branch] +- self.hg_command(vcdir, cmd, abortOnError=abortOnError) ++ self.run(['hg', vcdir] + cmd) + + def add(self, vcdir, path, abortOnError=True): + return self.run(['hg', '-q', '-R', vcdir, 'add', path]) == 0 +@@ -5922,7 +5898,7 @@ class HgConfig(VC): + return None + + def parent_info(self, vcdir, abortOnError=True): +- out = self.hg_command(vcdir, ["log", "-r", ".", "--template", "{author}|||{date|hgdate}"], abortOnError=abortOnError) ++ out = _check_output_str(["hg", '-R', vcdir, "log", "-r", ".", "--template", "{author}|||{date|hgdate}"]) + author, date = out.split("|||") + ts, _ = date.split(" ") + return self._sanitize_parent_info({ +@@ -8287,46 +8263,8 @@ class SuiteImport: + version = import_dict.get("version") + suite_dir = None + version_from = import_dict.get("versionFrom") +- if version_from and version: +- abort("In import for '{}': 'version' and 'versionFrom' can not be both set".format(name), context=context) +- if version is None and version_from is None: +- if not (in_subdir and (importer.vc_dir != importer.dir or isinstance(importer, BinarySuite))): +- abort("In import for '{}': No version given and not a 'subdir' suite of the same repository".format(name), context=context) +- if importer.isSourceSuite(): +- suite_dir = join(importer.vc_dir, name) +- version = importer.version() +- if urls is None: +- if not in_subdir: +- if import_dict.get("subdir") is None and importer.vc_dir != importer.dir: +- warn("In import for '{}': No urls given but 'subdir' is not set, assuming 'subdir=True'".format(name), context) +- in_subdir = True +- else: +- abort("In import for '{}': No urls given and not a 'subdir' suite".format(name), context=context) +- return SuiteImport(name, version, None, None, dynamicImport=dynamicImport, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir) +- # urls a list of alternatives defined as dicts +- if not isinstance(urls, list): +- abort('suite import urls must be a list', context=context) +- urlinfos = [] +- mainKind = None +- for urlinfo in urls: +- if isinstance(urlinfo, dict) and urlinfo.get('url') and urlinfo.get('kind'): +- kind = urlinfo.get('kind') +- if not VC.is_valid_kind(kind): +- abort('suite import kind ' + kind + ' illegal', context=context) +- else: +- abort('suite import url must be a dict with {"url", kind", attributes', context=context) +- vc = vc_system(kind) +- if kind != 'binary': +- assert not mainKind or mainKind == kind, "Only expecting one non-binary kind" +- mainKind = kind +- url = mx_urlrewrites.rewriteurl(urlinfo.get('url')) +- urlinfos.append(SuiteImportURLInfo(url, kind, vc)) +- vc_kind = None +- if mainKind: +- vc_kind = mainKind +- elif urlinfos: +- vc_kind = 'binary' +- return SuiteImport(name, version, urlinfos, vc_kind, dynamicImport=dynamicImport, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir) ++ suite_dir = join(get_env('MX_GIT_CACHE_DIR'), name) ++ return SuiteImport(name, version, [], None, True, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir) + + @staticmethod + def get_source_urls(source, kind=None): +@@ -8367,8 +8305,6 @@ class Suite(object): + :type dists: list[Distribution] + """ + def __init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=False): +- if primary is True and vc_dir is None: +- abort("The primary suite must be in a vcs repository") + self.imported_by = [] if primary else [importing_suite] + self.mxDir = mxDir + self.dir = dirname(mxDir) +@@ -8396,7 +8332,7 @@ class Suite(object): + self._outputRoot = None + self._preloaded_suite_dict = None + self.vc = vc +- self.vc_dir = vc_dir ++ self.vc_dir = get_env('MX_GIT_CACHE_DIR') + self._preload_suite_dict() + self._init_imports() + if load: +@@ -9295,7 +9231,9 @@ def get_dynamic_imports(): + class SourceSuite(Suite): + """A source suite""" + def __init__(self, mxDir, primary=False, load=True, internal=False, importing_suite=None, dynamicallyImported=False): +- vc, vc_dir = VC.get_vc_root(dirname(mxDir), abortOnError=False) ++ vc, vc_dir_test = VC.get_vc_root(dirname(mxDir), abortOnError=False) ++ vc_dir = get_env('MX_GIT_CACHE_DIR') ++ warn("LOOKING FOR: " + mxDir) + Suite.__init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=dynamicallyImported) + logvv("SourceSuite.__init__({}), got vc={}, vc_dir={}".format(mxDir, self.vc, self.vc_dir)) + self.projects = [] +@@ -9344,17 +9282,7 @@ class SourceSuite(Suite): + """ + Gets the release tag from VC or create a time based once if VC is unavailable + """ +- if snapshotSuffix not in self._releaseVersion: +- _version = self._get_early_suite_dict_property('version') +- if _version and self.getMxCompatibility().addVersionSuffixToExplicitVersion(): +- if not self.is_release(): +- _version = _version + '-' + snapshotSuffix +- if not _version: +- _version = self.vc.release_version_from_tags(self.vc_dir, self.name, snapshotSuffix=snapshotSuffix) +- if not _version: +- _version = 'unknown-{0}-{1}'.format(platform.node(), time.strftime('%Y-%m-%d_%H-%M-%S_%Z')) +- self._releaseVersion[snapshotSuffix] = _version +- return self._releaseVersion[snapshotSuffix] ++ return get_env('version') + + def scm_metadata(self, abortOnError=False): + scm = self.scm +@@ -12526,55 +12454,8 @@ def _attempt_download(url, path, jarEntryName=None): + return False + + def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False): +- """ +- Attempts to downloads content for each URL in a list, stopping after the first successful download. +- If the content cannot be retrieved from any URL, the program is aborted, unless abortOnError=False. +- The downloaded content is written to the file indicated by `path`. +- """ +- if not verifyOnly: +- ensure_dirname_exists(path) +- assert not path.endswith(os.sep) +- +- # https://docs.oracle.com/javase/7/docs/api/java/net/JarURLConnection.html +- jarURLPattern = re.compile('jar:(.*)!/(.*)') +- verify_errors = {} +- for url in urls: +- if not verifyOnly or verbose: +- log('Downloading ' + url + ' to ' + path) +- m = jarURLPattern.match(url) +- jarEntryName = None +- if m: +- url = m.group(1) +- jarEntryName = m.group(2) +- +- if verifyOnly: +- try: +- conn = _urlopen(url, timeout=10) +- conn.close() +- return True +- except (IOError, socket.timeout) as e: +- _suggest_tlsv1_error(e) +- verify_errors[url] = e +- continue +- +- for i in range(4): +- if i != 0: +- time.sleep(1) +- warn('Retry {} to download from {}'.format(i, url)) +- res = _attempt_download(url, path, jarEntryName) +- if res is True: +- return True +- if res is False: +- break +- +- if abortOnError: +- msg = 'Could not download to ' + path + ' from any of the following URLs: ' + ', '.join(urls) +- if verifyOnly: +- for url, e in verify_errors.items(): +- msg += '\n ' + url + ': ' + str(e) +- abort(msg) +- else: +- return False ++ print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly)) ++ return True + + def update_file(path, content, showDiff=False): + """ +@@ -13378,6 +13259,7 @@ class Archiver(SafeFileCreation): + + def _add_zip(self, filename, archive_name, provenance): + self._add_provenance(archive_name, provenance) ++ os.utime(filename, (315532800, 315532800)) + self.zf.write(filename, archive_name) + + def _add_str_zip(self, data, archive_name, provenance): +@@ -18526,12 +18408,35 @@ def _find_suite_import(importing_suite, suite_import, fatalIfMissing=True, load= + Attempts to locate an existing suite in the local context + Returns the path to the mx.name dir if found else None + """ +- if mode == 'binary': +- # binary suites are always stored relative to the importing suite in mx-private directory +- return importing_suite._find_binary_suite_dir(suite_import.name) ++ warn("FAKE CLONE: " + str(suite_import)) ++ if (suite_import.name == "truffle"): ++ return join(get_env('TMP'), "source", "truffle", "mx.truffle") ++ if (suite_import.name == "graal-nodejs"): ++ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-nodejs", "mx.graal-nodejs") ++ if (suite_import.name == "truffleruby"): ++ return join(get_env('MX_GIT_CACHE_DIR'), "truffleruby", "mx.truffleruby") ++ if (suite_import.name == "graalpython"): ++ return join(get_env('MX_GIT_CACHE_DIR'), "graalpython", "mx.graalpython") ++ if (suite_import.name == "vm"): ++ return join(get_env('TMP'), "source", "vm", "mx.vm") ++ if (suite_import.name == "fastr"): ++ return join(get_env('MX_GIT_CACHE_DIR'), "fastr", "mx.fastr") ++ if (suite_import.name == "sdk"): ++ return join(get_env('TMP'), "source", "sdk", "mx.sdk") ++ if (suite_import.name == "graal-js"): ++ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-js", "mx.graal-js") ++ if (suite_import.name == "regex"): ++ return join(get_env('TMP'), "source", "regex", "mx.regex") ++ if (suite_import.name == "substratevm"): ++ return join(get_env('TMP'), "source", "substratevm", "mx.substratevm") ++ if (suite_import.name == "tools"): ++ return join(get_env('TMP'), "source", "tools", "mx.tools") ++ if (suite_import.name == "sulong"): ++ return join(get_env('TMP'), "source", "sulong", "mx.sulong") ++ if (suite_import.name == "compiler"): ++ return join(get_env('TMP'), "source", "compiler", "mx.compiler") + else: +- # use the SuiteModel to locate a local source copy of the suite +- return _suitemodel.find_suite_dir(suite_import) ++ return join(get_env('MX_GIT_CACHE_DIR'), suite_import.name) + + def _get_import_dir(url, mode): + """Return directory where the suite will be cloned to""" diff --git a/pkgs/development/compilers/graalvm/002_setjmp.c.patch b/pkgs/development/compilers/graalvm/002_setjmp.c.patch new file mode 100644 index 00000000000..38a29fd8fbf --- /dev/null +++ b/pkgs/development/compilers/graalvm/002_setjmp.c.patch @@ -0,0 +1,16 @@ +diff --git a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c +index 16b869354d8..3691739d13b 100644 +--- a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c ++++ b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c +@@ -41,11 +41,3 @@ int sigsetjmp(sigjmp_buf env, int savesigs) { + WARN_UNSUPPORTED(sigsetjmp); + return 0; + } +- +-void longjmp(jmp_buf env, int val) { +- ERR_UNSUPPORTED(longjmp); +-} +- +-void siglongjmp(sigjmp_buf env, int val) { +- ERR_UNSUPPORTED(siglongjmp); +-} diff --git a/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch b/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch new file mode 100644 index 00000000000..bb9a0068712 --- /dev/null +++ b/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch @@ -0,0 +1,12 @@ +diff --git a/truffle/mx.truffle/mx_truffle.py b/truffle/mx.truffle/mx_truffle.py +index 8889c5ad810..add211a45c5 100644 +--- a/truffle/mx.truffle/mx_truffle.py ++++ b/truffle/mx.truffle/mx_truffle.py +@@ -695,6 +695,7 @@ class LibffiBuildTask(mx.AbstractNativeBuildTask): + os.path.relpath(self.subject.delegate.dir, self.subject.suite.vc_dir)] + for patch in self.subject.patches: + mx.run(git_apply + [patch], cwd=self.subject.suite.vc_dir) ++ mx.run(['cp', os.path.join(os.getenv('TMP'), 'truffle.make'), os.path.join(self.subject.delegate.dir, 'Makefile')]) + + self.delegate.logBuild() + self.delegate.build() diff --git a/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch b/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch new file mode 100644 index 00000000000..0aa1bc9b88d --- /dev/null +++ b/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch @@ -0,0 +1,12 @@ +diff --git a/mx.jvmci/mx_jvmci.py b/mx.jvmci/mx_jvmci.py +index 491fc19ab9..b4ddc03abb 100644 +--- a/mx.jvmci/mx_jvmci.py ++++ b/mx.jvmci/mx_jvmci.py +@@ -192,6 +192,7 @@ class HotSpotVMJDKDeployedDist(JDKDeployedDist): + if m.name in _hs_deploy_map: + targetDir = join(jdkDir, _hs_deploy_map[m.name]) + mx.logv('Deploying {} from {} to {}'.format(m.name, dist.name, targetDir)) ++ subprocess.call(["chmod", "-R", "+rw", targetDir]) + tar.extract(m, targetDir) + + """ diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index f051b24065a..96a7f74f265 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -1,31 +1,90 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: +{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial, python27, + zlib, makeWrapper, openjdk, unzip, git, clang, llvm, which, icu, ruby, bzip2 + # gfortran, readline, bzip2, lzma, pcre, curl, ed, tree ## WIP: fastr deps +}: let + version = "1.0.0-rc15"; + truffleMake = ./truffle.make; + R = fetchurl { + url = "http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz"; + sha256 = "1vap2k8kj5icy9naw61f9zyphf4rs0c9rxvil0zxkwx0xvsvyqq4"; + }; + makeMxGitCache = list: out: '' + mkdir ${out} + ${lib.concatMapStrings ({ url, name, rev, sha256 }: '' + mkdir -p ${out}/${name} + cp -rf ${fetchgit { inherit url rev sha256; }}/* ${out}/${name} + '' + ) list} + + # # GRAAL-NODEJS # # + chmod -R +rw ${out} + sed -i "s|#include \"../../../../mxbuild/trufflenode/coremodules/node_snapshots.h\"| \ + #include \"$NIX_BUILD_TOP/mxbuild/graal-nodejs/trufflenode/coremodules/node_snapshots.h\"|g" \ + ${out}/graaljs/graal-nodejs/deps/v8/src/graal/callbacks.cc + + # patch the shebang in python script runner + chmod -R +rw ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2 + patchShebangs ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2/python + + cd ${out} + hg init + hg add + hg commit -m 'dummy commit' + hg tag ${lib.escapeShellArg "vm${version}"} + hg checkout ${lib.escapeShellArg "vm${version}"} + ''; + # pre-download some cache entries ('mx' will not be able to download under nixbld1) makeMxCache = list: stdenv.mkDerivation { name = "mx-cache"; - buildCommand = '' + buildInputs = [ unzip ]; + buildCommand = with lib; '' mkdir $out - ${lib.concatMapStrings ({url, name, sha1}: '' - install -D ${fetchurl { inherit url sha1; }} $out/${name} - echo -n ${sha1} > $out/${name}.sha1 - '') list} + ${lib.concatMapStrings + ({url, name, sha1, isNinja ? false}: '' + install -D ${fetchurl { inherit url sha1; }} $out/${name} + echo -n ${sha1} > $out/${name}.sha1 + ${if isNinja then '' + export BASENAME=${removeSuffix ".zip" name} + mkdir "$out/$BASENAME.extracted" && + unzip "$out/${name}" -d "$out/$BASENAME.extracted" + + # Ninja is called later in the build process + if [ -f $out/$BASENAME.extracted/ninja ]; then + patchelf --set-interpreter \ + "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${stdenv.cc.cc.lib}/lib64" \ + $out/$BASENAME.extracted/ninja + fi + '' + else ""} + '') list} ''; }; jvmci8-mxcache = [ - rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}/jacococore.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; } - rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE_${sha1}/jacococore.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; } - rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}/jacocoreport.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; } - rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT_${sha1}/jacocoreport.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; } + rec { sha1 = "977b33afe2344a9ee801fd3317c54d8e1f9d7a79"; name = "JACOCOCORE_0.8.2_${sha1}/jacococore-0.8.2.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.8.2/org.jacoco.core-0.8.2.jar; } + rec { sha1 = "46f38efb779fb08216379e1a196396f4e22bbe41"; name = "JACOCOCORE_0.8.2_${sha1}/jacococore-0.8.2.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.8.2/org.jacoco.core-0.8.2-sources.jar; } + rec { sha1 = "50e133cdfd2d31ca5702b73615be70f801d3ae26"; name = "JACOCOREPORT_0.8.2_${sha1}/jacocoreport-0.8.2.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.8.2/org.jacoco.report-0.8.2.jar; } + rec { sha1 = "7488cd6e42cc4fa85b51200b7f451465692e033b"; name = "JACOCOREPORT_0.8.2_${sha1}/jacocoreport-0.8.2.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.8.2/org.jacoco.report-0.8.2-sources.jar; } + rec { sha1 = "4806883004063feb978b8811f00d5ea2138750bb"; name = "JACOCOAGENT_0.8.2_${sha1}/jacocoagent-0.8.2.jar"; url = mirror://maven/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2-runtime.jar; } rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; } rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; } rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}/jmh-generator-annprocess-1-18.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; } rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}/jmh-generator-annprocess-1-18.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; } rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; } rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; } - rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}/asm-debug-all.jar"; url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; } + rec { sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7"; name = "ASM_6.2.1_${sha1}/asm-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1.jar; } + rec { sha1 = "cee28077ac7a63d3de0b205ec314d83944ff6267"; name = "ASM_6.2.1_${sha1}/asm-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1-sources.jar; } + rec { sha1 = "332b022092ecec53cdb6272dc436884b2d940615"; name = "ASM_TREE_6.2.1_${sha1}/asm-tree-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1.jar; } + rec { sha1 = "072bd64989090e4ed58e4657e3d4481d96f643af"; name = "ASM_TREE_6.2.1_${sha1}/asm-tree-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1-sources.jar; } + rec { sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d"; name = "ASM_ANALYSIS_6.2.1_${sha1}/asm-analysis-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1.jar; } + rec { sha1 = "b0b249bd185677648692e7c57b488b6d7c2a6653"; name = "ASM_ANALYSIS_6.2.1_${sha1}/asm-analysis-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1-sources.jar; } + rec { sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3"; name = "ASM_COMMONS_6.2.1_${sha1}/asm-commons-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1.jar; } + rec { sha1 = "667fa0f9d370e7848b0e3d173942855a91fd1daf"; name = "ASM_COMMONS_6.2.1_${sha1}/asm-commons-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1-sources.jar; } rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; } rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; } rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}/jmh-1-18.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; } @@ -36,63 +95,125 @@ let rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar"; url = mirror://maven/junit/junit/4.12/junit-4.12-sources.jar; } rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; } rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar; } - rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "jvmci/intel-hsdis-amd64-linux-${sha1}.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; } + rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; } ]; graal-mxcache = jvmci8-mxcache ++ [ + rec { sha1 = "a990b2dba1c706f5c43c56fedfe70bad9a695852"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2.jar; } + rec { sha1 = "decbd95d46092fa9afaf2523b5b23d07ad7ad6bc"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.sources.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-sources.jar; } + rec { sha1 = "344483aefa15147c121a8fb6fb35a2406768cc5c"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-linux-x86_64.jar; } + rec { sha1 = "503402aa0cf80fd95ede043c0011152c2b4556fd"; name = "LLVM_PLATFORM_${sha1}/llvm-platform.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm-platform/6.0.1-1.4.2/llvm-platform-6.0.1-1.4.2.jar; } + rec { sha1 = "cfa6a0259d98bff5aa8d41ba11b4d1dad648fbaa"; name = "JAVACPP_${sha1}/javacpp.jar"; url = mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2.jar; } + rec { sha1 = "fdb2d2c17f6b91cdd5421554396da8905f0dfed2"; name = "JAVACPP_${sha1}/javacpp.sources.jar"; url = mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2-sources.jar; } + rec { sha1 = "702ca2d0ae93841c5ab75e4d119b29780ec0b7d9"; name = "NINJA_SYNTAX_${sha1}/ninja-syntax.tar.gz"; url = "https://pypi.org/packages/source/n/ninja_syntax/ninja_syntax-1.7.2.tar.gz"; } + rec { sha1 = "987234c4ce45505c21302e097c24efef4873325c"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip"; + isNinja = true; } rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; } rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; } - rec { sha1 = "30b13b7efc55b7feea667691509cf59902375001"; name = "ANTLR4_${sha1}/antlr4.jar"; url = mirror://maven/org/antlr/antlr4-runtime/4.7/antlr4-runtime-4.7.jar; } - rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}/jline.jar"; url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; } + rec { sha1 = "946f8aa9daa917dd81a8b818111bec7e288f821a"; name = "ANTLR4_${sha1}/antlr4.jar"; url = mirror://maven/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar; } + rec { sha1 = "c3aeac59c022bdc497c8c48ed86fa50450e4896a"; name = "JLINE_${sha1}/jline.jar"; url = mirror://maven/jline/jline/2.14.6/jline-2.14.6.jar; } rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar"; url = mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar; } - rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar; } + rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar; } rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar"; url = mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar; } - rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}/libffi.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } + rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_SOURCES_${sha1}/libffi-sources.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; } rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar; } - rec { sha1 = "a828a4f32caf9ac0b74f2548f87310959558c526"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-612.tar.gz; } - rec { sha1 = "7ac829f0c9a37f5cc39afd2265588a365480720d"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-612-linux-amd64.tar.gz; } + rec { sha1 = "5a5574f03b58465226166a638641a384b9f44445"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-655.tar.gz; } + rec { sha1 = "64f07398bac9897e9b8123edeaf5cf9ff19517b5"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-655-linux-amd64.tar.gz; } rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar"; url = mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar; } + rec { sha1 = "7a4d00d5ec5febd252a6182e8b6e87a0a9821f81"; name = "ICU4J_${sha1}/icu4j.jar"; url = mirror://maven/com/ibm/icu/icu4j/62.1/icu4j-62.1.jar; } + # This duplication of asm with underscore and minus is totally weird + rec { sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1.jar; } + rec { sha1 = "cee28077ac7a63d3de0b205ec314d83944ff6267"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1-sources.jar; } + rec { sha1 = "332b022092ecec53cdb6272dc436884b2d940615"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1.jar; } + rec { sha1 = "072bd64989090e4ed58e4657e3d4481d96f643af"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1-sources.jar; } + rec { sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1.jar; } + rec { sha1 = "b0b249bd185677648692e7c57b488b6d7c2a6653"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1-sources.jar; } + rec { sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1.jar; } + rec { sha1 = "667fa0f9d370e7848b0e3d173942855a91fd1daf"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1-sources.jar; } + # From here on the deps are new + rec { sha1 = "400d664d7c92a659d988c00cb65150d1b30cf339"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1.jar; } + rec { sha1 = "c9f7246bf93bb0dc7fe9e7c9eca531a8fb98d252"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1-sources.jar; } + rec { sha1 = "4b52bd03014f6d080ef0528865c1ee50621e35c6"; name = "NETBEANS_PROFILER_${sha1}/netbeans-profiler.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/org-netbeans-lib-profiler-8.2-201609300101.jar; } + rec { sha1 = "b5840706cc8ce639fcafeab1bc61da2d8aa37afd"; name = "NASHORN_INTERNAL_TESTS_${sha1}/nashorn-internal-tests.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/nashorn-internal-tests-700f5e3f5ff2.jar; } + rec { sha1 = "9577018f9ce3636a2e1cb0a0c7fe915e5098ded5"; name = "JACKSON_ANNOTATIONS_${sha1}/jackson-annotations.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-annotations/2.8.6/jackson-annotations-2.8.6.jar; } + rec { sha1 = "2ef7b1cc34de149600f5e75bc2d5bf40de894e60"; name = "JACKSON_CORE_${sha1}/jackson-core.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-core/2.8.6/jackson-core-2.8.6.jar; } + rec { sha1 = "c43de61f74ecc61322ef8f402837ba65b0aa2bf4"; name = "JACKSON_DATABIND_${sha1}/jackson-databind.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-databind/2.8.6/jackson-databind-2.8.6.jar; } + rec { sha1 = "2838952e91baa37ac73ed817451268a193ba440a"; name = "JCODINGS_${sha1}/jcodings.jar"; url = mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40.jar; } + rec { sha1 = "0ed89e096c83d540acac00d6ee3ea935b4c905ff"; name = "JCODINGS_${sha1}/jcodings.sources.jar"; url = mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40-sources.jar; } + rec { sha1 = "5dbb09787a9b8780737b71fbf942235ef59051b9"; name = "JONI_${sha1}/joni.jar"; url = mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25.jar; } + rec { sha1 = "505a09064f6e2209616f38724f6d97d8d889aa92"; name = "JONI_${sha1}/joni.sources.jar"; url = mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25-sources.jar; } + rec { sha1 = "c4f7d054303948eb6a4066194253886c8af07128"; name = "XZ-1.8_${sha1}/xz-1.8.jar"; url = mirror://maven/org/tukaani/xz/1.8/xz-1.8.jar; } + rec { sha1 = "9314d3d372b05546a33791fbc8dd579c92ebd16b"; name = "GNUR_${sha1}/gnur.tar.gz"; url = http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz; } + rec { sha1 = "90aa8308da72ae610207d8f6ca27736921be692a"; name = "ANTLR4_COMPLETE_${sha1}/antlr4-complete.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/antlr-4.7.1-complete.jar; } ]; + graal-mxcachegit = [ + { sha256 = "0siryzvmj9h8zkyr0d3gy9fqgyxb9s5xs15rf7lnx9zh3ykq549y"; name = "graaljs"; + url = "http://github.com/graalvm/graaljs.git"; rev = "vm-${version}"; } + { sha256 = "1ii3mwa0c2zk9vm51hyrymdz3whfihm6sccd2r5ja2v53jcdc1a3"; name = "truffleruby"; + url = "http://github.com/oracle/truffleruby.git"; rev = "vm-${version}"; } + { sha256 = "1nz8yqg2k9shpmhj3jv7k2icfg72cm55baf354rsh1pqanay8qb7"; name = "fastr"; + url = "http://github.com/oracle/fastr.git"; rev = "vm-${version}"; } + { sha256 = "1c8nnrl30fys22gk3y6dvxzq0fq1a5hjkqrw15p68cwpz9wma4gi"; name = "graalpython"; + url = "https://github.com/graalvm/graalpython.git"; rev = "vm-${version}"; } + ]; + + ninja-syntax = python27.pkgs.buildPythonPackage rec { + version = "1.7.2"; + pname = "ninja_syntax"; + doCheck = false; + src = python27.pkgs.fetchPypi { + inherit pname version; + sha256 = "07zg30m0khx55fv2gxxn7pqd549z0vk3x592mrdlk9l8krxwjb9l"; + }; + }; + findbugs = fetchzip { name = "findbugs-3.0.0"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip; sha256 = "0sf5f9h1s6fmhfigjy81i109j1ani5kzdr4njlpq0mnkkh9fpr7m"; }; + python27withPackages = python27.withPackages (ps: [ ninja-syntax ]); + in rec { mx = stdenv.mkDerivation rec { - version = "5.192.0"; + version = "5.215.4"; pname = "mx"; src = fetchFromGitHub { owner = "graalvm"; repo = "mx"; rev = version; - sha256 = "04gdf1gzlc8a6li8lcnrs2j9zicj11fs1vqqf7cmhb4pm2h72hml"; + sha256 = "0wrwfiwqjw6xp0bvp2g15jn6yrjb9w6jw1xnwvkyhkw1s6m0w0z1"; }; nativeBuildInputs = [ makeWrapper ]; + prePatch = '' + cp mx.py bak_mx.py + ''; + patches = [ ./001_mx.py.patch ]; + postPatch = '' + mv mx.py internal_mx.py + mv bak_mx.py mx.py + ''; buildPhase = '' substituteInPlace mx --replace /bin/pwd pwd - # forbid network access while simulate success for passing obligatory "VerifyLibraryURL" - substituteInPlace mx.py --replace \ - 'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):' \ - 'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False): - print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly)) - return True' - # avoid crash with 'ValueError: ZIP does not support timestamps before 1980' - substituteInPlace mx.py --replace \ - 'zipfile.ZipInfo(arcname, time.localtime(os.path.getmtime(join(root, f)))[:6])' \ + substituteInPlace internal_mx.py --replace \ + 'zipfile.ZipInfo(arcname, time.localtime(getmtime(join(root, f)))[:6])' \ 'zipfile.ZipInfo(arcname, time.strptime ("1 Jan 1980", "%d %b %Y" )[:6])' ''; installPhase = '' mkdir -p $out/bin cp -dpR * $out/bin wrapProgram $out/bin/mx \ - --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} \ + --prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \ + --set FINDBUGS_HOME ${findbugs} + makeWrapper ${python27}/bin/python $out/bin/mx-internal \ + --add-flags "$out/bin/internal_mx.py" \ + --prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \ --set FINDBUGS_HOME ${findbugs} ''; meta = with stdenv.lib; { @@ -103,22 +224,16 @@ in rec { }; }; - # copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too) jvmci8 = stdenv.mkDerivation rec { - version = "0.49"; - name = let - n = "jvmci${/*"8u191"*/ lib.removePrefix "oraclejdk-" oraclejdk8.name}-${version}"; - in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then - n - else - throw "length of string `${n}' must be equal to the length of `${oraclejdk8.name}'"; + version = "0.58"; + name = "jvmci-${version}"; src = fetchFromGitHub { owner = "graalvm"; repo = "graal-jvmci-8"; rev = "jvmci-${version}"; - sha256 = "1zgin0w1qa7wmfhcisx470fhnmddfxxp5nyyix31yaa7dznql82k"; + sha256 = "0p8icn3d99zggsh6pqb15dz1j186ck442sjpn2cv43n4nvdmmp1m"; }; - buildInputs = [ mx mercurial ]; + buildInputs = [ mx mercurial openjdk ]; postUnpack = '' # a fake mercurial dir to prevent mx crash and supply the version to mx ( cd $sourceRoot @@ -129,46 +244,55 @@ in rec { hg checkout ${lib.escapeShellArg src.rev} ) ''; + patches = [ ./004_mx_jvmci.py.patch ]; + postPatch ='' + # The hotspot version name regex fix + substituteInPlace mx.jvmci/mx_jvmci.py \ + --replace "\\d+.\\d+-b\\d+" "\\d+.\\d+-bga" + ''; hardeningDisable = [ "fortify" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" # newly detected by gcc7 "-Wno-error=nonnull" ]; buildPhase = '' - cp -dpR ${oraclejdk8} writable-copy-of-jdk - chmod +w -R writable-copy-of-jdk - export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache} - mx --java-home $(pwd)/writable-copy-of-jdk build + + mx-internal --primary-suite . --vm=server -v build -DFULL_DEBUG_SYMBOLS=0 + mx-internal --primary-suite . --vm=server -v vm -version + mx-internal --primary-suite . --vm=server -v unittest ''; installPhase = '' - mv jdk1.8.0_*/linux-amd64/product $out - find $out -type f -exec sed -i "s#${oraclejdk8}#$out#g" {} \; - - install -v -m0555 -D $MX_CACHE_DIR/jvmci/*hsdis*.so $out/jre/lib/amd64/hsdis-amd64.so + mkdir -p $out + mv openjdk1.8.0_*/linux-amd64/product/* $out + install -v -m0555 -D $MX_CACHE_DIR/hsdis*/hsdis.so $out/jre/lib/amd64/hsdis-amd64.so ''; dontFixup = true; # do not nuke path of ffmpeg etc dontStrip = true; # why? see in oraclejdk derivation - inherit (oraclejdk8) meta; + inherit (openjdk) meta; + inherit (openjdk) postFixup; }; graalvm8 = stdenv.mkDerivation rec { - version = "1.0.0-rc8"; - name = let - n = "graal-${version}"; - in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then - n - else - throw "length of string `${n}' must be equal to the length of `${jvmci8.name}'"; + inherit version; + name = "graal-${version}"; src = fetchFromGitHub { owner = "oracle"; repo = "graal"; rev = "vm-${version}"; - sha256 = "1fada4awrr8bhw294xdiq4bagvgrlcr44mw6338gaal0ky3vkm0p"; + sha256 = "18fqah8x7gwz02ji40b4vyqav9x5dw703xwikjc117wlyymb1k56"; }; - buildInputs = [ mx zlib mercurial jvmci8 ]; + patches = [ ./002_setjmp.c.patch ./003_mx_truffle.py.patch ]; + buildInputs = [ mx zlib mercurial jvmci8 git clang llvm + python27withPackages which icu ruby bzip2 + # gfortran readline bzip2 lzma pcre.dev curl ed ## WIP: fastr dependencies + ]; postUnpack = '' + cp ${stdenv.cc.cc}/include/c++/${stdenv.cc.cc.version}/stdlib.h \ + $sourceRoot/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include + cp ${truffleMake} $TMP && mv *truffle.make truffle.make + rm $sourceRoot/truffle/src/libffi/patches/others/0001-Add-mx-bootstrap-Makefile.patch # a fake mercurial dir to prevent mx crash and supply the version to mx ( cd $sourceRoot hg init @@ -188,58 +312,54 @@ in rec { 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${stdenv.cc}/bin/gcc");' substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \ --replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";' + # prevent cyclical imports caused by identical names + substituteInPlace sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include/stdlib.h \ + --replace '# include ' '# include "${stdenv.cc.cc}/include/c++/${stdenv.cc.cc.version}/cstdlib"' + # dragonegg can't seem to compile on nix, so let's not require it + substituteInPlace sulong/mx.sulong/suite.py \ + --replace '"requireDragonegg" : True,' '"requireDragonegg" : False,' + substituteInPlace truffle/mx.truffle/mx_truffle.py \ + --replace 'os.path.relpath(self.subject.delegate.dir, self.subject.suite.vc_dir)' \ + 'self.subject.delegate.dir' + + # Patch the native-image template, as it will be run during build + chmod +x vm/mx.vm/launcher_template.sh && patchShebangs vm/mx.vm ''; + buildPhase = '' # make a copy of jvmci8 - cp -dpR ${jvmci8} $out - chmod +w -R $out - find $out -type f -exec sed -i "s#${jvmci8}#$out#g" {} \; + mkdir $NIX_BUILD_TOP/jvmci8 + cp -dpR ${jvmci8}/* $NIX_BUILD_TOP/jvmci8 + chmod +w -R $NIX_BUILD_TOP/jvmci8 export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild export MX_CACHE_DIR=${makeMxCache graal-mxcache} + export MX_GIT_CACHE='refcache' + export MX_GIT_CACHE_DIR=$NIX_BUILD_TOP/mxgitcache + export JVMCI_VERSION_CHECK='ignore' + export JAVA_HOME=$NIX_BUILD_TOP/jvmci8 + # export FASTR_RELEASE=true ## WIP + ${makeMxGitCache graal-mxcachegit "$MX_GIT_CACHE_DIR"} + cd $NIX_BUILD_TOP/source - ( cd substratevm - - mkdir -p clibraries - mx --java-home $out build - - # bootstrap native-image (that was removed from mx build in https://github.com/oracle/graal/commit/140d7a7edf54ec5872a8ff45869cd1ae499efde4) - mx --java-home $out native-image -cp $MX_ALT_OUTPUT_ROOT/substratevm/dists/jdk1.8/svm-driver.jar com.oracle.svm.driver.NativeImage - ) - ( cd tools - mx --java-home $out build + ( cd vm + mx-internal -v --dynamicimports /substratevm,/tools,sulong,/graal-nodejs,graalpython build ) ''; + installPhase = '' - # add graal files modelling after directory structure of "graalvm-ce" binary distribution - mkdir -p $out/jre/tools/{profiler,chromeinspector,truffle/builder} $out/jre/lib/{graal,include,truffle/include} - cp -vpLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks - cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/bin/* $out/jre/lib/amd64/ - cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/jdk1.8/graal-*processor*.jar $out/jre/lib/graal/ - cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/include/ - cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/jdk1.8/graal-management.jar $out/jre/lib/jvmci/ - cp -vdpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/ - cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/dists/jdk1.8/* $out/jre/lib/truffle/ - cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/truffle/include/ - cp -vpLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/ - cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/ - cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/ - cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/* $out/jre/tools/truffle/ - cp -vp $MX_ALT_OUTPUT_ROOT/truffle/dists/jdk1.8/truffle-nfi.jar $out/jre/tools/truffle/builder/ - - echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties - echo -n "graal" > $out/jre/lib/jvmci/compiler-name - echo -n "../truffle/truffle-api.jar:../truffle/truffle-nfi.jar" > $out/jre/lib/jvmci/parentClassLoader.classpath - - install -v -m0555 -D substratevm/com.oracle.svm.driver.nativeimage $out/jre/lib/svm/bin/native-image - ln -s ../lib/svm/bin/native-image $out/jre/bin/native-image - ln -s ../jre/bin/native-image $out/bin/native-image + mkdir -p $out + cp -rf $MX_ALT_OUTPUT_ROOT/vm/linux-amd64/GRAALVM_CMP_GU_GVM_INS_JS_LIBPOLY_NFI_NJS_POLY_POLYNATIVE_PRO_PYN_RGX_SLG_SVM_SVMAG_SVMCF_SVML_TFL_VVM/graalvm-unknown-${version}/* $out # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html substituteInPlace $out/jre/lib/security/java.security \ --replace file:/dev/random file:/dev/./urandom \ --replace NativePRNGBlocking SHA1PRNG + # Organize the out dir + mkdir -p $out/share && mv $out/man $out/share + rm $out/ASSEMBLY_EXCEPTION $out/release $out/LICENSE $out/THIRD_PARTY_README ''; + dontFixup = true; # do not nuke path of ffmpeg etc dontStrip = true; # why? see in oraclejdk derivation doInstallCheck = true; @@ -268,8 +388,8 @@ in rec { meta = with stdenv.lib; { homepage = https://github.com/oracle/graal; description = "High-Performance Polyglot VM"; - license = licenses.unfree; - maintainers = with maintainers; [ volth ]; + license = licenses.gpl2; + maintainers = with maintainers; [ volth hlolli ]; platforms = [ "x86_64-linux" ]; }; }; diff --git a/pkgs/development/compilers/graalvm/truffle.make b/pkgs/development/compilers/graalvm/truffle.make new file mode 100644 index 00000000000..da887c14240 --- /dev/null +++ b/pkgs/development/compilers/graalvm/truffle.make @@ -0,0 +1,14 @@ +# This Makefile is used by mx to bootstrap libffi build. + +# `make MX_VERBOSE=y` will report all lines executed. The actual value doesn't +# matter as long as it's not empty. +QUIETLY$(MX_VERBOSE) = @ + +.PHONY: default + +default: + $(QUIETLY) echo CONFIGURE libffi + $(QUIETLY) mkdir ../$(OUTPUT) + $(QUIETLY) cd ../$(OUTPUT) && ../$(SOURCES)/configure $(CONFIGURE_ARGS) > ../libffi.configure.log + $(QUIETLY) echo MAKE libffi + $(QUIETLY) $(MAKE) -C ../$(OUTPUT) > ../libffi.build.log diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 8709e47dd3a..c0a0e085145 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -42,7 +42,7 @@ let # Backport for -static-pie, which the latter touches, and which is nice in # its own right. ./static-pie.patch - # Backport for the `--unwindlib=[libgcc|complier-rt]` flag, which is + # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is # needed for our bootstrapping to not interfere with C. ./unwindlib.patch ]; diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index f883500eeb9..eee4507d6ce 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -1,21 +1,35 @@ -{stdenv, fetchFromGitHub, yacc}: +{stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}: + +# TODO: byacc is the recommended parser generator but due to https://github.com/rednex/rgbds/issues/333 +# it does not work for the moment. We should switch back to byacc as soon as the fix is integrated +# in a published version. stdenv.mkDerivation rec { name = "rgbds-${version}"; - version = "0.2.4"; + version = "0.3.8"; src = fetchFromGitHub { - owner = "bentley"; + owner = "rednex"; repo = "rgbds"; rev = "v${version}"; - sha256 = "0dwq0p9g1lci8sm12a2rfk0g33z2vr75x78zdf1g84djwbz8ipc6"; + sha256 = "0db37z886026svhj6qnc3wk56sndbnz1vi41gn2k3bl6ppbnjlpk"; }; - nativeBuildInputs = [ yacc ]; + nativeBuildInputs = [ bison flex pkg-config libpng ]; installFlags = "PREFIX=\${out}"; meta = with stdenv.lib; { - homepage = https://www.anjbe.name/rgbds/; - description = "An assembler/linker package that produces Game Boy programs"; - license = licenses.free; + homepage = https://rednex.github.io/rgbds/; + description = "A free assembler/linker package for the Game Boy and Game Boy Color"; + license = licenses.mit; + longDescription = + ''RGBDS (Rednex Game Boy Development System) is a free assembler/linker package for the Game Boy and Game Boy Color. It consists of: + + - rgbasm (assembler) + - rgblink (linker) + - rgbfix (checksum/header fixer) + - rgbgfx (PNG‐to‐Game Boy graphics converter) + + This is a fork of the original RGBDS which aims to make the programs more like other UNIX tools. + ''; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; }; diff --git a/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch b/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch deleted file mode 100644 index ed9b7adbef2..00000000000 --- a/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj.old 2015-01-11 06:46:39.000000000 +0000 -+++ Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj 2015-05-25 21:29:40.546808622 +0100 -@@ -52,6 +52,8 @@ - - - -+ -+ - - - diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index db7aa06d6de..1ab376ab103 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -84,7 +84,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "08gw3b5gbbxs2dr3b4zf9xsvhbvpqjj4ikmvzmcvs3fh1q65xbgl"; + sha256 = "0arripb1w3dcabjipdjrdq46q2z0l4b7jp0vl5iyhq7j0blg13xh"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 8693b235211..474b5f54d92 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -45,12 +45,20 @@ self: super: { cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; }); # Ignore overly restrictive upper version bounds. - cryptohash-sha256 = doJailbreak super.cryptohash-sha256; - doctest = doJailbreak super.doctest; - split = doJailbreak super.split; - test-framework = doJailbreak super.test-framework; - hashable = doJailbreak super.hashable; async = doJailbreak super.async; + ChasingBottoms = doJailbreak super.ChasingBottoms; + cryptohash-sha256 = doJailbreak super.cryptohash-sha256; + Diff = dontCheck super.Diff; + doctest = doJailbreak super.doctest; + hashable = doJailbreak super.hashable; + hashable-time = doJailbreak super.hashable-time; + integer-logarithms = doJailbreak super.integer-logarithms; + lucid = doJailbreak super.lucid; + quickcheck-instances = doJailbreak super.quickcheck-instances; + split = doJailbreak super.split; + tasty-expected-failure = doJailbreak super.tasty-expected-failure; + test-framework = doJailbreak super.test-framework; + th-lift = doJailbreak super.th-lift_0_8; # These packages don't work and need patching and/or an update. primitive = overrideSrc (doJailbreak super.primitive) { @@ -85,14 +93,18 @@ self: super: { buildTools = with pkgs; [autoconf]; preConfigure = "autoreconf --install"; }); - colour = appendPatch super.colour (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/colour-2.3.4.patch"; - sha256 = "1h318dczml9qrmfvlz1d12iji86klaxvz63k9g9awibwz8lw2i79"; - }); dlist = appendPatch super.dlist (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch"; sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc"; }); + vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch"; + sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19"; + }); + cabal-doctest = appendPatch (doJailbreak super.cabal-doctest) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cabal-doctest-1.0.6.patch"; + sha256 = "0735mkxhv557pgnfvdjakkw9r85l5gy28grdwg929m26ghbf9s8j"; + }); QuickCheck = appendPatch super.QuickCheck (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/QuickCheck-2.13.1.patch"; sha256 = "138yrp3x5cnvncimrnhnkawz6clyk7fj3sr3y93l5szfr11kcvbl"; @@ -105,22 +117,18 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch"; sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2"; }); - exceptions = appendPatch (doJailbreak super.exceptions) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/exceptions-0.10.1.patch"; - sha256 = "0427jg027dcckiy21zk29c49fzx4q866rqbabmh4wvqwwkz8yk37"; - }); th-abstraction = appendPatch (doJailbreak super.th-abstraction) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/th-abstraction-0.2.11.0.patch"; sha256 = "0czqfszfblz6bvsybcd1z5jijj79f9czqq6dn992wp2gibsbrgj3"; }); - logict = appendPatch (doJailbreak super.logict) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/logict-0.6.0.2.patch"; - sha256 = "0my2n0r9pb35994q0xka96fv5jdpjdfwqppi5lily3rgzkajsixn"; - }); zlib = appendPatch super.zlib (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/zlib-0.6.2.patch"; sha256 = "13fy730z9ihyc9kw3qkh642mi0bdbd7bz01dksj1zz845pr9jjif"; }); + haskell-src-exts = appendPatch super.haskell-src-exts_1_21_0 (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch"; + sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3"; + }); optparse-applicative = appendPatch super.optparse-applicative (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch"; sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y"; @@ -133,5 +141,23 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch"; sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; }); + happy = appendPatch super.happy (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.9.patch"; + sha256 = "1zmcb7dgcwivq2mddcy1f20djw2kds1m7ahwsa4xpbbwnijc6zjx"; + }); + hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch"; + sha256 = "04xwznd3lfgracfz68ls6vfm19rhq8fb74r6ii0grpv6cx4rr21i"; + }); + easytest = self.easytest_0_3; + regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch"; + sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7"; + }); + unordered-containers = self.unordered-containers_0_2_10_0; + attoparsec = appendPatch super.attoparsec (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch"; + sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl"; + }); } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ee67a5f1d24..b61d13f37c2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.19 + # LTS Haskell 13.20 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -64,14 +64,14 @@ default-package-overrides: - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.1.0 - aeson-compat ==0.3.9 - - aeson-diff ==1.1.0.5 + - aeson-diff ==1.1.0.7 - aeson-extra ==0.4.1.1 - aeson-generic-compat ==0.0.1.3 - aeson-iproute ==0.2 - aeson-picker ==0.1.0.4 - aeson-pretty ==0.8.7 - aeson-qq ==0.8.2 - - aeson-typescript ==0.1.1.0 + - aeson-typescript ==0.1.2.0 - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 - al ==0.1.4.2 @@ -220,7 +220,7 @@ default-package-overrides: - async-refresh-tokens ==0.4.0.0 - async-timer ==0.2.0.0 - atom-basic ==0.2.5 - - atomic-primops ==0.8.2 + - atomic-primops ==0.8.3 - atomic-write ==0.2.0.6 - attoparsec ==0.13.2.2 - attoparsec-base64 ==0.0.0 @@ -293,7 +293,7 @@ default-package-overrides: - bitcoin-script ==0.11.1 - bitcoin-tx ==0.13.1 - bitcoin-types ==0.9.2 - - bits ==0.5.1 + - bits ==0.5.2 - bitset-word8 ==0.1.1.1 - bits-extra ==0.0.1.3 - bit-stream ==0.1.0.2 @@ -351,7 +351,7 @@ default-package-overrides: - cabal2spec ==2.2.2.1 - cabal-doctest ==1.0.6 - cabal-rpm ==0.12.6 - - cache ==0.1.1.1 + - cache ==0.1.1.2 - cachix ==0.2.0 - cachix-api ==0.2.0 - cacophony ==0.10.1 @@ -428,11 +428,11 @@ default-package-overrides: - colonnade ==1.2.0.1 - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - - colour ==2.3.4 + - colour ==2.3.5 - combinatorial ==0.1.0.1 - comfort-graph ==0.0.3.1 - commutative ==0.0.2 - - comonad ==5.0.4 + - comonad ==5.0.5 - compactmap ==0.1.4.2.1 - compensated ==0.7.2 - compiler-warnings ==0.1.0 @@ -466,7 +466,7 @@ default-package-overrides: - console-style ==0.0.2.1 - constraint ==0.1.3.0 - constraints ==0.10.1 - - contravariant ==1.5 + - contravariant ==1.5.1 - contravariant-extras ==0.3.4 - control-bool ==0.2.1 - control-dsl ==0.2.1.3 @@ -486,7 +486,7 @@ default-package-overrides: - cql-io ==1.0.1.1 - crackNum ==2.3 - credential-store ==0.1.2 - - criterion ==1.5.4.0 + - criterion ==1.5.5.0 - criterion-measurement ==0.1.1.0 - cron ==0.6.1 - crypto-api ==0.13.3 @@ -519,7 +519,7 @@ default-package-overrides: - cubicspline ==0.1.2 - cublas ==0.5.0.0 - cuckoo-filter ==0.2.0.2 - - cuda ==0.10.0.0 + - cuda ==0.10.1.0 - cue-sheet ==2.0.1 - cufft ==0.9.0.1 - curl ==1.3.8 @@ -579,13 +579,13 @@ default-package-overrides: - dependent-sum-template ==0.0.0.6 - deque ==0.2.7 - deriveJsonNoPrefix ==0.1.0.1 - - deriving-compat ==0.5.5 + - deriving-compat ==0.5.6 - derulo ==1.0.5 - detour-via-sci ==1.0.0 - dhall ==1.19.1 - dhall-bash ==1.0.18 - dhall-json ==1.2.6 - - dhall-text ==1.0.16 + - dhall-text ==1.0.17 - diagrams ==1.4 - diagrams-contrib ==1.4.3 - diagrams-core ==1.4.1.1 @@ -643,7 +643,7 @@ default-package-overrides: - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - - either ==5.0.1 + - either ==5.0.1.1 - either-both ==0.1.0.0 - ekg ==0.4.0.15 - ekg-core ==0.1.1.6 @@ -673,7 +673,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - error-util ==0.0.1.2 - - ersatz ==0.4.4 + - ersatz ==0.4.5 - esqueleto ==2.6.0 - etc ==0.4.1.0 - eventful-core ==0.2.0 @@ -688,7 +688,7 @@ default-package-overrides: - exact-pi ==0.5.0.1 - exceptional ==0.3.0.0 - exception-mtl ==0.4.0.1 - - exceptions ==0.10.1 + - exceptions ==0.10.2 - exception-transformers ==0.4.0.7 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 @@ -718,7 +718,7 @@ default-package-overrides: - filecache ==0.4.1 - file-embed ==0.0.11 - file-embed-lzma ==0 - - filelock ==0.1.1.2 + - filelock ==0.1.1.3 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - filepattern ==0.1.1 @@ -758,11 +758,11 @@ default-package-overrides: - force-layout ==0.4.0.6 - foreign-store ==0.2 - forkable-monad ==0.2.0.3 - - forma ==1.1.1 + - forma ==1.1.2 - format-numbers ==0.1.0.0 - formatting ==6.3.7 - foundation ==0.0.23 - - free ==5.1 + - free ==5.1.1 - freenect ==1.2.1 - freer-simple ==1.2.1.0 - freetype2 ==0.1.2 @@ -782,7 +782,7 @@ default-package-overrides: - fuzzy-dates ==0.1.1.1 - fuzzyset ==0.1.0.8 - gauge ==0.2.4 - - gc ==0.0.2 + - gc ==0.0.3 - gd ==3000.7.3 - gdp ==0.0.0.2 - general-games ==1.1.1 @@ -965,7 +965,7 @@ default-package-overrides: - hmatrix-morpheus ==0.1.1.2 - hmatrix-vector-sized ==0.1.1.3 - hmpfr ==0.4.4 - - hoauth2 ==1.8.4 + - hoauth2 ==1.8.5 - Hoed ==0.5.1 - hOpenPGP ==2.7.4.1 - hopfli ==0.2.2.1 @@ -1000,9 +1000,9 @@ default-package-overrides: - hsinstall ==2.2 - HSlippyMap ==3.0.1 - hslogger ==1.2.12 - - hslua ==1.0.2 + - hslua ==1.0.3 - hslua-aeson ==1.0.0 - - hslua-module-text ==0.2.0 + - hslua-module-text ==0.2.1 - HsOpenSSL ==0.11.4.16 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 @@ -1044,7 +1044,7 @@ default-package-overrides: - http-client ==0.5.14 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - - http-conduit ==2.3.7 + - http-conduit ==2.3.7.1 - http-date ==0.0.8 - http-directory ==0.1.1 - httpd-shed ==0.4.0.3 @@ -1126,11 +1126,11 @@ default-package-overrides: - interpolate ==0.2.0 - interpolatedstring-perl6 ==1.0.1 - interpolation ==0.1.1 - - interpolator ==0.1.1 + - interpolator ==0.1.2 - IntervalMap ==0.6.1.1 - intervals ==0.8.1 - intset-imperative ==0.1.0.0 - - invariant ==0.5.2 + - invariant ==0.5.3 - invertible ==0.2.0.5 - io-choice ==0.0.7 - io-machine ==0.2.0.0 @@ -1180,10 +1180,10 @@ default-package-overrides: - kazura-queue ==0.1.0.4 - kdt ==0.2.4 - keycode ==0.2.2 - - keys ==3.12.1 - - kind-apply ==0.3.0.0 + - keys ==3.12.2 + - kind-apply ==0.3.1.0 - kind-generics ==0.3.0.0 - - kind-generics-th ==0.1.0.0 + - kind-generics-th ==0.1.1.0 - kleene ==0 - kmeans ==0.1.3 - koofr-client ==1.0.0.3 @@ -1199,7 +1199,7 @@ default-package-overrides: - language-ecmascript ==0.19 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - - language-javascript ==0.6.0.11 + - language-javascript ==0.6.0.12 - language-puppet ==1.4.4 - lapack-ffi ==0.0.2 - lapack-ffi-tools ==0.1.2 @@ -1234,15 +1234,15 @@ default-package-overrides: - libraft ==0.1.1.0 - libyaml ==0.1.1.0 - LibZip ==1.0.1 - - lifted-async ==0.10.0.3 + - lifted-async ==0.10.0.4 - lifted-base ==0.2.3.12 - lift-generics ==0.1.2 - line ==4.0.1 - - linear ==1.20.8 + - linear ==1.20.9 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.6 + - ListLike ==4.6.2 - listsafe ==0.1.0.1 - list-t ==1.0.3.1 - ListTree ==0.2.3 @@ -1260,7 +1260,7 @@ default-package-overrides: - logging-effect ==1.3.3 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - - logict ==0.6.0.2 + - logict ==0.6.0.3 - long-double ==0.1 - loop ==0.3.0 - lrucaching ==0.3.3 @@ -1297,7 +1297,7 @@ default-package-overrides: - mbug ==1.3.2 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - - megaparsec ==7.0.4 + - megaparsec ==7.0.5 - mega-sdist ==0.3.3.2 - memory ==0.14.18 - MemoTrie ==0.6.9 @@ -1335,10 +1335,10 @@ default-package-overrides: - mixpanel-client ==0.1.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - - mmark ==0.0.6.2 + - mmark ==0.0.7.0 - mmark-cli ==0.0.5.0 - mmark-ext ==0.2.1.2 - - mmorph ==1.1.2 + - mmorph ==1.1.3 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - modern-uri ==0.3.0.1 @@ -1377,7 +1377,7 @@ default-package-overrides: - mono-traversable-instances ==0.1.0.0 - mountpoints ==1.0.2 - mtl ==2.2.2 - - mtl-compat ==0.2.1.3 + - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - multiarg ==0.30.0.10 - multimap ==1.2.1 @@ -1506,7 +1506,7 @@ default-package-overrides: - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - parser-combinators ==1.0.2 - - parsers ==0.12.9 + - parsers ==0.12.10 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - partial-semigroup ==0.5.1.0 @@ -1653,7 +1653,7 @@ default-package-overrides: - quickcheck-classes ==0.6.0.0 - quickcheck-instances ==0.3.19 - quickcheck-io ==0.2.0 - - quickcheck-simple ==0.1.0.4 + - quickcheck-simple ==0.1.1.0 - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.4.3 - quickcheck-text ==0.1.2.1 @@ -1680,7 +1680,7 @@ default-package-overrides: - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 - - rcu ==0.2.3 + - rcu ==0.2.4 - re2 ==0.3 - readable ==0.3.1 - read-editor ==0.1.0.2 @@ -1707,7 +1707,7 @@ default-package-overrides: - regex-tdfa ==1.2.3.1 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.3.5 + - registry ==0.1.3.6 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.1.0 @@ -1719,7 +1719,7 @@ default-package-overrides: - repa ==3.4.1.4 - repa-algorithms ==3.4.1.3 - repa-io ==3.4.1.1 - - repline ==0.2.0.0 + - repline ==0.2.1.0 - req ==1.2.1 - req-conduit ==1.0.0 - req-url-extra ==0.1.0.0 @@ -1769,7 +1769,7 @@ default-package-overrides: - scanf ==0.1.0.0 - scanner ==0.3 - scientific ==0.3.6.2 - - scotty ==0.11.3 + - scotty ==0.11.4 - scrypt ==0.5.0 - sdl2 ==2.4.1.0 - sdl2-gfx ==0.2 @@ -1901,7 +1901,7 @@ default-package-overrides: - sql-words ==0.1.6.2 - srcloc ==0.5.1.2 - stache ==2.0.1 - - stack2nix ==0.2.2 + - stack2nix ==0.2.3 - starter ==0.3.0 - state-codes ==0.1.3 - stateref ==0.3 @@ -1917,7 +1917,7 @@ default-package-overrides: - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - stm-split ==0.0.2.1 - - stopwatch ==0.1.0.5 + - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-record ==0.0.4 - storable-tuple ==0.0.3.3 @@ -1946,7 +1946,7 @@ default-package-overrides: - stringsearch ==0.3.6.6 - string-transform ==1.1.0 - strive ==5.0.8 - - structs ==0.1.1 + - structs ==0.1.2 - stylish-haskell ==0.9.2.1 - summoner ==1.2.0 - sum-type-boilerplate ==0.1.1 @@ -1975,7 +1975,7 @@ default-package-overrides: - tagged-identity ==0.1.2 - tagged-transformer ==0.8.1 - tagshare ==0.0 - - tagsoup ==0.14.7 + - tagsoup ==0.14.8 - tagstream-conduit ==0.5.5.3 - tao ==1.0.0 - tao-example ==1.0.0 @@ -2182,7 +2182,7 @@ default-package-overrides: - valor ==0.1.0.0 - vault ==0.3.1.2 - vec ==0.1.1 - - vector ==0.12.0.2 + - vector ==0.12.0.3 - vector-algorithms ==0.8.0.1 - vector-binary-instances ==0.2.5.1 - vector-buffer ==0.4.1 @@ -2209,7 +2209,7 @@ default-package-overrides: - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.25 + - wai-extra ==3.0.26 - wai-handler-launch ==3.0.2.4 - wai-logger ==2.3.4 - wai-middleware-auth ==0.1.2.1 @@ -2263,7 +2263,7 @@ default-package-overrides: - wrap ==0.0.0 - wreq ==0.5.3.1 - ws ==0.0.5 - - wuss ==1.1.12 + - wuss ==1.1.13 - X11 ==1.9 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2328,7 +2328,7 @@ default-package-overrides: - yesod-recaptcha2 ==0.3.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - - yesod-test ==1.6.6 + - yesod-test ==1.6.6.1 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.1 - yes-precure5-command ==5.5.3 @@ -3550,6 +3550,7 @@ broken-packages: - cmt - cmv - cnc-spec-compiler + - co-log-polysemy - co-log-sys - Coadjute - coalpit @@ -3560,6 +3561,7 @@ broken-packages: - codecov-haskell - codemonitor - codepad + - codeworld-api - codex - coin - coinbase-exchange @@ -3653,6 +3655,7 @@ broken-packages: - conduit-tokenize-attoparsec - conduit-zstd - conf + - confcrypt - conffmt - confide - config-parser @@ -5092,6 +5095,7 @@ broken-packages: - hakyll-ogmarkup - hakyll-R - hakyll-shortcode + - hakyll-shortcut-links - halberd - halfs - halipeto @@ -5814,6 +5818,7 @@ broken-packages: - hslinks - hslogger-reader - hslogstash + - hslua-module-system - hsluv-haskell - hsmagick - HSmarty @@ -6381,6 +6386,7 @@ broken-packages: - ktx - kure - kure-your-boilerplate + - kurita - KyotoCabinet - l-bfgs-b - L-seed @@ -6843,6 +6849,7 @@ broken-packages: - median-stream - mediawiki - medium-sdk-haskell + - megaparsec-tests - mellon-core - mellon-gpio - mellon-web @@ -7218,6 +7225,7 @@ broken-packages: - neural-network-hmatrix - newhope - newports + - newsletter - newsletter-mailgun - newt - newtype-deriving @@ -7535,6 +7543,7 @@ broken-packages: - persistent-audit - persistent-cereal - persistent-database-url + - persistent-documentation - persistent-equivalence - persistent-hssqlppp - persistent-map @@ -8814,6 +8823,7 @@ broken-packages: - stackage-cli - stackage-curator - stackage-metadata + - stackage-query - stackage-sandbox - stackage-setup - stackage-to-hackage diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8a418be8b76..2e27285c2e2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10440,8 +10440,8 @@ self: { pname = "HsOpenSSL"; version = "0.11.4.16"; sha256 = "1jbbrhbvl3y1l0g1wv5h7l59bj7w8ajl8bfpxfwjypgmqlrlks19"; - revision = "1"; - editedCabalFile = "0hc113g6jp7ci5gxx2chhp1h64nzx47c4ahwisyqgs3f6prm6dqr"; + revision = "2"; + editedCabalFile = "1cg28q793cg4w8c574yzzfxcn1r8595vs77mlrkw68j8hzgs6lj3"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -12200,29 +12200,6 @@ self: { }) {}; "ListLike" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string - , vector - }: - mkDerivation { - pname = "ListLike"; - version = "4.6"; - sha256 = "16jsj979mzjrgmpa20pls9ganym3wsps49paks1sb1gmlmwyrkf1"; - revision = "2"; - editedCabalFile = "1mca2r4gjznqdh4kck5cjkn53isgkhvkf3ri09qsn7nsssvgki0g"; - libraryHaskellDepends = [ - array base bytestring containers deepseq dlist fmlist text - utf8-string vector - ]; - testHaskellDepends = [ - array base bytestring containers dlist fmlist HUnit QuickCheck - random text utf8-string vector - ]; - description = "Generic support for list-like structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ListLike_4_6_2" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string , vector @@ -12241,7 +12218,6 @@ self: { ]; description = "Generalized support for list-like structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListT" = callPackage @@ -13919,8 +13895,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "NoTrace"; - version = "0.3.0.3"; - sha256 = "0cdva0d5xp0fw4jfwmhaz8m4pm1d00wazg32hcqjli4blc9s1hvf"; + version = "0.3.0.4"; + sha256 = "0nb7cqqd7p62gnmcp1hhjv113faihwps6m8xds5ng6zi7jdzz6n1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Remove all the functions come from Debug.Trace after debugging"; @@ -14542,6 +14518,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "OpenGL_3_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName + , OpenGLRaw, StateVar, text, transformers + }: + mkDerivation { + pname = "OpenGL"; + version = "3.0.3.0"; + sha256 = "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as"; + libraryHaskellDepends = [ + base bytestring containers GLURaw ObjectName OpenGLRaw StateVar + text transformers + ]; + description = "A binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "OpenGLCheck" = callPackage ({ mkDerivation, base, checkers, haskell98, OpenGL, QuickCheck }: mkDerivation { @@ -23074,35 +23067,6 @@ self: { }) {}; "aeson-diff" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest - , edit-distance-vector, filepath, Glob, hashable, mtl - , optparse-applicative, QuickCheck, quickcheck-instances - , scientific, text, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-diff"; - version = "1.1.0.5"; - sha256 = "1kzvqzbl6pp5g49dp4qqc7cbisnkpqz0i18b6nmdb7f1nrhdvnb1"; - revision = "1"; - editedCabalFile = "0a29nph4a1ny365nhsxlm73mk6zgaam4sfx6knzqjy8dxp1gkj48"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring edit-distance-vector hashable mtl scientific - text unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring optparse-applicative text - ]; - testHaskellDepends = [ - aeson base bytestring directory doctest filepath Glob QuickCheck - quickcheck-instances text unordered-containers vector - ]; - description = "Extract and apply patches to JSON documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-diff_1_1_0_7" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , edit-distance-vector, filepath, Glob, hashable, mtl , optparse-applicative, QuickCheck, quickcheck-instances @@ -23127,7 +23091,6 @@ self: { ]; description = "Extract and apply patches to JSON documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-diff-generic" = callPackage @@ -23647,32 +23610,6 @@ self: { }) {}; "aeson-typescript" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, hspec, interpolate, mtl, process, template-haskell - , temporary, text, th-abstraction, unordered-containers - }: - mkDerivation { - pname = "aeson-typescript"; - version = "0.1.1.0"; - sha256 = "0sx4gavp0pvnxlxwix1di34vm2bfi5d02mzgzs402grqhh1v38vp"; - revision = "1"; - editedCabalFile = "1y5baadwfpyszd78dfbcln93ypg7ai6qvbdz7r95ili8p0vwikbk"; - libraryHaskellDepends = [ - aeson base containers interpolate mtl template-haskell text - th-abstraction unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath hspec - interpolate mtl process template-haskell temporary text - th-abstraction unordered-containers - ]; - description = "Generate TypeScript definition files from your ADTs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "aeson-typescript_0_1_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, hspec, interpolate, mtl, process, template-haskell , temporary, text, th-abstraction, unordered-containers @@ -24670,6 +24607,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "algebraic-graphs_0_4" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, containers + , deepseq, extra, inspection-testing, mtl, QuickCheck + }: + mkDerivation { + pname = "algebraic-graphs"; + version = "0.4"; + sha256 = "1dyk8qgaahrvcp4gsl9c6s3hwmwys4xvznwnh0y1x8bqc4md61f9"; + libraryHaskellDepends = [ + array base base-compat containers deepseq mtl + ]; + testHaskellDepends = [ + array base base-compat base-orphans containers extra + inspection-testing QuickCheck + ]; + description = "A library for algebraic graph construction and transformation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "algebraic-prelude" = callPackage ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }: mkDerivation { @@ -28571,14 +28528,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_7_0_1" = callPackage + "antiope-athena_7_0_2" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "7.0.1"; - sha256 = "1dmpsxkgk7wbzl5bhnz5fnx911pvwmrcplnbqqsf90x2fpaaxcgx"; + version = "7.0.2"; + sha256 = "0jnw1r2qxdsgb2a96ibayy504ndmgwnr083y3hxvsf081bi72n03"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28596,8 +28553,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.0.1"; - sha256 = "1s00kvwhxhcismzd2vcnhg2nqc4p4nhwh4brz5xfbm7bhgy8dnms"; + version = "7.0.2"; + sha256 = "0pf9dqx4px93fvq9rsl13ckngylj9dywzapn8largccvw0j5g8zk"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -28629,7 +28586,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-core_7_0_1" = callPackage + "antiope-core_7_0_2" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet @@ -28637,8 +28594,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.0.1"; - sha256 = "08pcrafsf4kkr8hr0l478yv2nxdlcqar19zmkm6j4d8gyayygsmx"; + version = "7.0.2"; + sha256 = "1rybjb99sqgs2qa0b2mjrfwi5h8112ipwjphapcbgzg2y7nicw60"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28675,15 +28632,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-dynamodb_7_0_1" = callPackage + "antiope-dynamodb_7_0_2" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.0.1"; - sha256 = "1za5x7ap2af85zv3gcg2pwqyhry2899n6zj0s43i9y540bkn3iqf"; + version = "7.0.2"; + sha256 = "0apbpikpcj400qn4jq0s29rmsbk3ngi7drd8jmkpnnlqvz7g4cyv"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28721,7 +28678,7 @@ self: { broken = true; }) {}; - "antiope-messages_7_0_1" = callPackage + "antiope-messages_7_0_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens , lens-aeson, monad-loops, network-uri, scientific, text @@ -28729,8 +28686,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.0.1"; - sha256 = "0n6p54cd2cvr3ycr6a99qf2ib41jggkdh4b9hrid6132xvysfbp2"; + version = "7.0.2"; + sha256 = "1v0wfhniy5gaqnn8b39vc8whzmj9a58zh6l0zz234n5yghggz7fq"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28792,7 +28749,7 @@ self: { broken = true; }) {}; - "antiope-s3_7_0_1" = callPackage + "antiope-s3_7_0_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec @@ -28801,8 +28758,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.0.1"; - sha256 = "04c6fdi45g9pqbinzfjqzjda94h65q3ch3fxmbp8iy33wmhhgldv"; + version = "7.0.2"; + sha256 = "1g46qy0xxwszx7mnsyd04yi83wf0kv57h4sb1jfq6ds6sh9l0xnc"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -28840,15 +28797,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-sns_7_0_1" = callPackage + "antiope-sns_7_0_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog , lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "7.0.1"; - sha256 = "0a2knafiq48xp8lxsfzvh1kkf0k3dschvhhxw3avs4s8ycfap7kk"; + version = "7.0.2"; + sha256 = "19l0sl33ywr2j5kxkqk0bbpqiahlzn1k883vhyki585hhgh2dad1"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -28887,7 +28844,7 @@ self: { broken = true; }) {}; - "antiope-sqs_7_0_1" = callPackage + "antiope-sqs_7_0_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl @@ -28895,8 +28852,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "7.0.1"; - sha256 = "0w4fy5dlsf650i672iwa5ixi9pi4n9g3iyn42hf5zbnbdxc0m6yf"; + version = "7.0.2"; + sha256 = "0wpfcr3z3vpsy1m0zwrzszpsa4w4p9261ys8bnmvwg1qa8fpg278"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit generic-lens lens lens-aeson monad-loops mtl network-uri text @@ -29733,6 +29690,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "appar_0_1_8" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "appar"; + version = "0.1.8"; + sha256 = "07v3h766q9mnhphsm53718h1lds147ix7dj15kc5hnsj4vffvkn4"; + libraryHaskellDepends = [ base bytestring ]; + description = "A simple applicative parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "appc" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , hspec-smallcheck, optparse-applicative, semver, smallcheck, text @@ -32289,19 +32258,6 @@ self: { }) {}; "atomic-primops" = callPackage - ({ mkDerivation, base, ghc-prim, primitive }: - mkDerivation { - 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; - }) {}; - - "atomic-primops_0_8_3" = callPackage ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "atomic-primops"; @@ -32310,7 +32266,6 @@ self: { libraryHaskellDepends = [ base ghc-prim primitive ]; description = "A safe approach to CAS and other atomic ops in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atomic-primops-foreign" = callPackage @@ -39311,23 +39266,6 @@ self: { }) {}; "bits" = callPackage - ({ mkDerivation, base, bytes, Cabal, cabal-doctest, doctest, mtl - , transformers - }: - mkDerivation { - pname = "bits"; - version = "0.5.1"; - sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5"; - revision = "5"; - editedCabalFile = "012qycmsfz5l6y82d3zgjmp1k3pgvhlpjdk6rwlpc1wlfbpdqiaw"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base bytes mtl transformers ]; - testHaskellDepends = [ base doctest ]; - description = "Various bit twiddling and bitwise serialization primitives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bits_0_5_2" = callPackage ({ mkDerivation, base, bytes, Cabal, cabal-doctest, doctest, mtl , transformers }: @@ -39340,7 +39278,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Various bit twiddling and bitwise serialization primitives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bits-atomic" = callPackage @@ -41501,6 +41438,18 @@ self: { broken = true; }) {}; + "bounded-queue" = callPackage + ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit }: + mkDerivation { + pname = "bounded-queue"; + version = "1.0.0"; + sha256 = "18jlkdzfkw0v6ifz8fzqkzagc3g97kg13ng8yldq869casnmcw5d"; + libraryHaskellDepends = [ base containers deepseq ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "A strict, immutable, thread-safe, single-ended, bounded queue"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bounded-tchan" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -44174,12 +44123,12 @@ self: { , hspec-discover, http-client, http-types, hw-hedgehog , hw-hspec-hedgehog, lens, mtl, optparse-applicative, process , raw-strings-qq, resourcet, selective, stm, stringsearch, tar - , temporary, text, time, unliftio, zlib + , temporary, text, time, topograph, unliftio, zlib }: mkDerivation { pname = "cabal-cache"; - version = "1.0.0.2"; - sha256 = "15m83x0bnk47cmcpni5qlln9caj742ggb36fhw1pp1fjfkard00m"; + version = "1.0.0.3"; + sha256 = "0gp81yd418chcy06dhp24vh54ji509k3jriks4xyc9dp4vblsnss"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44188,7 +44137,7 @@ self: { conduit-extra containers cryptonite deepseq directory exceptions filepath generic-lens http-client http-types lens mtl optparse-applicative process resourcet selective stm stringsearch - tar temporary text time unliftio zlib + tar temporary text time topograph unliftio zlib ]; executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ @@ -45060,8 +45009,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.14.2"; - sha256 = "0fa0rhglp3xlv8zr9pnx2l14bz7jvdvdxwiy63rpvf44jzjdknkr"; + version = "2.14.3"; + sha256 = "09qwv83fv2gq9j21hpr22bxpqwi5xlv0dr09xgwvk1r4dzjl8gbr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45264,22 +45213,6 @@ self: { }) {cabocha = null;}; "cache" = callPackage - ({ mkDerivation, base, clock, hashable, hspec, stm, transformers - , unordered-containers - }: - mkDerivation { - pname = "cache"; - version = "0.1.1.1"; - sha256 = "04azn2g1rndfpf6zl3sachzz471hhxykxh4clrz0vl5da8frja8h"; - libraryHaskellDepends = [ - base clock hashable stm transformers unordered-containers - ]; - testHaskellDepends = [ base clock hspec stm transformers ]; - description = "An in-memory key/value store with expiration support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cache_0_1_1_2" = callPackage ({ mkDerivation, base, clock, hashable, hspec, stm, transformers , unordered-containers }: @@ -45293,7 +45226,6 @@ self: { testHaskellDepends = [ base clock hspec stm transformers ]; description = "An in-memory key/value store with expiration support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cached" = callPackage @@ -48834,29 +48766,36 @@ self: { }) {}; "chessIO" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, directory, haskeline - , megaparsec, mtl, parallel, parser-combinators, process, split - , stm, time, unordered-containers, vector + ({ mkDerivation, attoparsec, base, bytestring, containers + , directory, extra, file-embed, haskeline, megaparsec, MonadRandom + , mtl, o-clock, optparse-applicative, parallel, parser-combinators + , prettyprinter, process, random, stm, text, time + , unordered-containers, vector }: mkDerivation { pname = "chessIO"; - version = "0.2.0.0"; - sha256 = "01vgr2h1m5ww9j0239lv4k75sshhaa42kzi0bg8134j64i5k8ghd"; + version = "0.3.0.0"; + sha256 = "18ni11hlcd4mkd6s0a22afiads83vhspxabchspnjyn9vm75spfg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring megaparsec parser-combinators process - stm unordered-containers vector + attoparsec base bytestring containers file-embed megaparsec + MonadRandom o-clock parser-combinators prettyprinter process random + stm text unordered-containers vector ]; executableHaskellDepends = [ - attoparsec base bytestring haskeline megaparsec mtl - parser-combinators process split stm unordered-containers vector + attoparsec base bytestring containers extra file-embed haskeline + megaparsec MonadRandom mtl o-clock optparse-applicative + parser-combinators prettyprinter process random stm text time + unordered-containers vector ]; testHaskellDepends = [ - attoparsec base bytestring directory megaparsec parallel - parser-combinators process stm time unordered-containers vector + attoparsec base bytestring containers directory file-embed + megaparsec MonadRandom o-clock parallel parser-combinators + prettyprinter process random stm text time unordered-containers + vector ]; - description = "Basic chess move generation and UCI client library"; + description = "Basic chess library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -52167,6 +52106,8 @@ self: { executableHaskellDepends = [ base co-log-core polysemy ]; description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "co-log-sys" = callPackage @@ -52409,6 +52350,8 @@ self: { ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "codex" = callPackage @@ -52982,23 +52925,6 @@ self: { }) {}; "colour" = callPackage - ({ mkDerivation, base, QuickCheck, random, test-framework - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "colour"; - version = "2.3.4"; - sha256 = "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base QuickCheck random test-framework test-framework-quickcheck2 - ]; - description = "A model for human colour/color perception"; - license = stdenv.lib.licenses.mit; - }) {}; - - "colour_2_3_5" = callPackage ({ mkDerivation, base, QuickCheck, random, test-framework , test-framework-quickcheck2 }: @@ -53013,7 +52939,6 @@ self: { ]; description = "A model for human colour/color perception"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colour-accelerate" = callPackage @@ -53521,25 +53446,6 @@ self: { }) {}; "comonad" = 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; - }) {}; - - "comonad_5_0_5" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers , distributive, doctest, tagged, transformers, transformers-compat }: @@ -53555,7 +53461,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Comonads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comonad-extras" = callPackage @@ -55604,6 +55509,8 @@ self: { text transformers ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "confcrypt_0_2_3_0" = callPackage @@ -55640,6 +55547,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "confetti" = callPackage @@ -56410,8 +56318,8 @@ self: { }: mkDerivation { pname = "constraints-extras"; - version = "0.2.3.4"; - sha256 = "1xkivpkjgnnrs5fyg0g77f84zh3sxqgxif0l2rhcq1wdad709q55"; + version = "0.2.3.5"; + sha256 = "1p45847w48waqvwmsvk44bvg39p2ifzdrwhk5h3n7l1avsmks37w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; @@ -56823,17 +56731,6 @@ self: { }) {}; "contravariant" = 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; - }) {}; - - "contravariant_1_5_1" = callPackage ({ mkDerivation, base, StateVar, transformers }: mkDerivation { pname = "contravariant"; @@ -56842,7 +56739,6 @@ self: { libraryHaskellDepends = [ base StateVar transformers ]; description = "Contravariant functors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "contravariant-extras" = callPackage @@ -58972,41 +58868,6 @@ self: { }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat - , base-compat-batteries, binary, bytestring, cassava, code-page - , containers, criterion-measurement, deepseq, directory, exceptions - , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl - , mwc-random, optparse-applicative, parsec, QuickCheck, statistics - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-compat, vector, vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.5.4.0"; - sha256 = "1yh4dk4hi6d3jz2jmn8jc9i6jqb02w63g2rq3aagi16qfyanlqbg"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary bytestring - cassava code-page containers criterion-measurement deepseq - directory exceptions filepath Glob js-flot js-jquery microstache - mtl mwc-random optparse-applicative parsec statistics text time - transformers transformers-compat vector vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_5_5_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, bytestring, cassava, code-page , containers, criterion-measurement, deepseq, directory, exceptions @@ -59039,7 +58900,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-measurement" = callPackage @@ -60607,26 +60467,6 @@ self: { }) {}; "cuda" = callPackage - ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath - , pretty, template-haskell, uuid-types - }: - mkDerivation { - pname = "cuda"; - version = "0.10.0.0"; - sha256 = "17l482fnackx4081mxax0dx0bsaqbbg4rxy4zmi5iv5q6f6v37x7"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ - base bytestring filepath template-haskell uuid-types - ]; - libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base pretty ]; - description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cuda_0_10_1_0" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath , pretty, template-haskell, uuid-types }: @@ -60646,7 +60486,6 @@ self: { executableHaskellDepends = [ base pretty ]; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cudd" = callPackage @@ -63610,8 +63449,8 @@ self: { }: mkDerivation { pname = "datadog-tracing"; - version = "1.5.0"; - sha256 = "0iagsvaw5fhb0p13mvgg1w60zyzqhb75mkhvw1lxb667xjjwan7l"; + version = "1.5.1"; + sha256 = "1jjgavp9winbl2gyix61y30myvzhvzb500l2zwcb087cqzy7z6nb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66133,29 +65972,6 @@ self: { }) {}; "deriving-compat" = 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.5"; - sha256 = "1y1xy5w6ar4p6kc7g67fh93ccwnjnj81l6py1lkxlp8x4x5hpbca"; - 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; - }) {}; - - "deriving-compat_0_5_6" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged , template-haskell, th-abstraction, transformers @@ -66176,7 +65992,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derp" = callPackage @@ -66803,21 +66618,6 @@ self: { }) {}; "dhall-text" = callPackage - ({ mkDerivation, base, dhall, optparse-applicative, text }: - mkDerivation { - pname = "dhall-text"; - version = "1.0.16"; - sha256 = "1hjqm03vj89pkpnrl49jgqwzmlw6s4xr54ga7y50wkj5sd2lrwd1"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base dhall optparse-applicative text - ]; - description = "Template text using Dhall"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dhall-text_1_0_17" = callPackage ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { pname = "dhall-text"; @@ -66830,7 +66630,6 @@ self: { ]; description = "Template text using Dhall"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-to-cabal" = callPackage @@ -68410,16 +68209,14 @@ self: { }) {}; "dir-traverse" = callPackage - ({ mkDerivation, base, composition-prelude, criterion, directory - , dirstream, dlist, filepath, pipes, pipes-safe, system-filepath + ({ mkDerivation, base, criterion, directory, dirstream, pipes + , pipes-safe, system-filepath }: mkDerivation { pname = "dir-traverse"; - version = "0.1.0.0"; - sha256 = "1sxw6hr8ajs7gxqp7kwj5v635wb7m0gxix37navp3gddr34jhan2"; - libraryHaskellDepends = [ - base composition-prelude directory dlist filepath - ]; + version = "0.2.0.1"; + sha256 = "1asm4nrn3lj4nyl5ygiaqj11hjg3qsngs8jbcll7igs7xdr0pazy"; + libraryHaskellDepends = [ base directory ]; benchmarkHaskellDepends = [ base criterion dirstream pipes pipes-safe system-filepath ]; @@ -70456,6 +70253,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "doctest_0_16_1" = callPackage + ({ mkDerivation, base, base-compat, code-page, deepseq, directory + , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process + , QuickCheck, setenv, silently, stringbuilder, syb, transformers + }: + mkDerivation { + pname = "doctest"; + version = "0.16.1"; + sha256 = "1xnm1sbm9lpfxw5yav8qpqr85aap94k9df6n5kx70bp6h69qnrrq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + process syb transformers + ]; + executableHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + process syb transformers + ]; + testHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + hspec HUnit mockery process QuickCheck setenv silently + stringbuilder syb transformers + ]; + description = "Test interactive Haskell examples"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest-discover" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath @@ -73615,27 +73441,6 @@ self: { }) {}; "either" = callPackage - ({ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck - , semigroupoids, semigroups, test-framework - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "either"; - version = "5.0.1"; - sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc"; - revision = "2"; - editedCabalFile = "0859h2dc77fq0f14jh11h4i89hrg3iqvzk0yrk78516k6m7n96zc"; - libraryHaskellDepends = [ - base bifunctors mtl profunctors semigroupoids semigroups - ]; - testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - ]; - description = "Combinators for working with sums"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "either_5_0_1_1" = callPackage ({ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck , semigroupoids, test-framework, test-framework-quickcheck2 }: @@ -73651,7 +73456,6 @@ self: { ]; description = "Combinators for working with sums"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "either-both" = callPackage @@ -76138,34 +75942,6 @@ self: { }) {}; "ersatz" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, data-default, directory, doctest - , filepath, lens, mtl, parsec, process, semigroups, temporary - , transformers, unordered-containers - }: - mkDerivation { - pname = "ersatz"; - version = "0.4.4"; - sha256 = "06d0fc5s5yxk1q54fsbnnhmvf25m5g86fqdzb42f0ckc0h3sbp22"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array attoparsec base bytestring containers data-default lens mtl - process semigroups temporary transformers unordered-containers - ]; - executableHaskellDepends = [ - array base containers lens mtl parsec semigroups - ]; - testHaskellDepends = [ array base directory doctest filepath mtl ]; - description = "A monad for expressing SAT or QSAT problems using observable sharing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "ersatz_0_4_5" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, data-default, directory, doctest, fail , filepath, lens, mtl, parsec, process, semigroups, temporary @@ -77622,27 +77398,6 @@ self: { }) {}; "exceptions" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers, transformers-compat - }: - mkDerivation { - pname = "exceptions"; - version = "0.10.1"; - sha256 = "17fz74bi6qy3w7li7ifkcvsy3f9zyj69956jvaqvl5diyqnh791v"; - libraryHaskellDepends = [ - base mtl stm template-haskell transformers transformers-compat - ]; - testHaskellDepends = [ - base mtl QuickCheck stm template-haskell test-framework - test-framework-hunit test-framework-quickcheck2 transformers - transformers-compat - ]; - description = "Extensible optionally-pure exceptions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "exceptions_0_10_2" = callPackage ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell , test-framework, test-framework-hunit, test-framework-quickcheck2 , transformers, transformers-compat @@ -77661,7 +77416,6 @@ self: { ]; description = "Extensible optionally-pure exceptions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exchangerates" = callPackage @@ -81147,18 +80901,6 @@ self: { }) {}; "filelock" = callPackage - ({ mkDerivation, async, base, process, unix }: - mkDerivation { - pname = "filelock"; - version = "0.1.1.2"; - sha256 = "0g90wgm4bcfr5j44sc5s2jlcd7ggk092lph3jqjgf6f67sqxrw8g"; - libraryHaskellDepends = [ base unix ]; - testHaskellDepends = [ async base process ]; - description = "Portable interface to file locking (flock / LockFileEx)"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "filelock_0_1_1_3" = callPackage ({ mkDerivation, async, base, process, unix }: mkDerivation { pname = "filelock"; @@ -81168,7 +80910,6 @@ self: { testHaskellDepends = [ async base process ]; description = "Portable interface to file locking (flock / LockFileEx)"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filemanip" = callPackage @@ -84014,22 +83755,6 @@ self: { }) {}; "forma" = callPackage - ({ mkDerivation, aeson, base, containers, hspec, mtl, text - , unordered-containers - }: - mkDerivation { - pname = "forma"; - version = "1.1.1"; - sha256 = "10q06yjz66h92qm0569l172v0c6mp9m3jfyakyva5v7xdqr8rvxb"; - libraryHaskellDepends = [ - aeson base containers mtl text unordered-containers - ]; - testHaskellDepends = [ aeson base containers hspec mtl text ]; - description = "Parse and validate forms in JSON format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "forma_1_1_2" = callPackage ({ mkDerivation, aeson, base, containers, hspec, mtl, text , unordered-containers }: @@ -84043,7 +83768,6 @@ self: { testHaskellDepends = [ aeson base containers hspec mtl text ]; description = "Parse and validate forms in JSON format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "formal" = callPackage @@ -84753,23 +84477,6 @@ self: { }) {}; "free" = callPackage - ({ mkDerivation, base, comonad, containers, distributive - , exceptions, mtl, profunctors, semigroupoids, template-haskell - , transformers, transformers-base - }: - mkDerivation { - pname = "free"; - version = "5.1"; - sha256 = "117axvibwyz429ixdws6mm3sk5vm0jygdxf45456m8yyh9f4shkh"; - libraryHaskellDepends = [ - base comonad containers distributive exceptions mtl profunctors - semigroupoids template-haskell transformers transformers-base - ]; - description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "free_5_1_1" = callPackage ({ mkDerivation, base, comonad, containers, distributive , exceptions, mtl, profunctors, semigroupoids, template-haskell , transformers, transformers-base @@ -84784,7 +84491,6 @@ self: { ]; description = "Monads for free"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-algebras" = callPackage @@ -87283,23 +86989,6 @@ self: { }) {}; "gc" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest - , filepath, hlint, parallel - }: - mkDerivation { - pname = "gc"; - version = "0.0.2"; - sha256 = "03637njk3pqbqvng7zf370ykykm3nnsxvmp09qcfp6iihz45mk1r"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory doctest filepath hlint parallel - ]; - description = "Poor Richard's Memory Manager"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gc_0_0_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "gc"; @@ -87308,7 +86997,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Poor Richard's Memory Manager"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gc-monitoring-wai" = callPackage @@ -89348,6 +89036,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "geojson_4_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , hlint, lens, scientific, semigroups, tasty, tasty-hspec + , tasty-quickcheck, text, transformers, validation, vector + }: + mkDerivation { + pname = "geojson"; + version = "4.0.1"; + sha256 = "100k6j57r14yxxhfpqlgm9q1x5hrj3qdzm7cpbs5rfyqi5g7kyrj"; + libraryHaskellDepends = [ + aeson base containers deepseq lens scientific semigroups text + transformers validation vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hlint tasty tasty-hspec + tasty-quickcheck text validation + ]; + description = "A thin GeoJSON Layer above the aeson library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "geojson-types" = callPackage ({ mkDerivation, aeson, base, bson, bytestring, lens, text }: mkDerivation { @@ -92264,8 +91974,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190503"; - sha256 = "127zhk8hfmhac1m31mkazcml5c4hxnbw8c5bn059njycvgw5was4"; + version = "7.20190507"; + sha256 = "0klhqys8s6l6wh4safiyxxy3zpgzfmnn9gw14rbs89c6l18af0y4"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -92298,13 +92008,12 @@ self: { bup curl git gnupg lsof openssh perl rsync wget which ]; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - installPhase = "make PREFIX=$out BUILDER=: install"; - checkPhase = '' + postBuild = '' ln -sf dist/build/git-annex/git-annex git-annex ln -sf git-annex git-annex-shell - export PATH+=":$PWD" - git-annex test ''; + installPhase = "make PREFIX=$out BUILDER=: install install-completions"; + checkPhase = ''PATH+=":$PWD" git-annex test''; enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.agpl3; @@ -101691,6 +101400,17 @@ self: { broken = true; }) {}; + "haddock-cheatsheet" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "haddock-cheatsheet"; + version = "0.1.0.1"; + sha256 = "1nqq7k8ssl6h1d501d8ayzsdlihnbfrqy4l5z43msc6lr7ffvz2r"; + libraryHaskellDepends = [ base ]; + description = "A documentation-only package exemplifying haddock markup features"; + license = stdenv.lib.licenses.mit; + }) {}; + "haddock-leksah" = callPackage ({ mkDerivation, array, base, Cabal, containers, directory , filepath, ghc, ghc-paths, pretty @@ -102656,6 +102376,8 @@ self: { testHaskellDepends = [ base hspec mtl pandoc text ]; description = "Use shortcut-links in markdown file for Hakyll"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hal" = callPackage @@ -106006,23 +105728,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_12_0_0" = callPackage + "haskell-lsp_0_12_1_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, directory, filepath, hashable, haskell-lsp-types , hslogger, hspec, hspec-discover, lens, mtl, network-uri, parsec , QuickCheck, quickcheck-instances, rope-utf16-splay, sorted-list - , stm, text, time, transformers, unordered-containers, vector + , stm, temporary, text, time, transformers, unordered-containers + , vector }: mkDerivation { pname = "haskell-lsp"; - version = "0.12.0.0"; - sha256 = "1l328s0r3ya00pp33g6v8nwj23n009ki8gikrgja0wgj4hn35d2c"; + version = "0.12.1.0"; + sha256 = "12h8vq2gr62mwf230m1z7hvi3mpv69lwhbvhp21wnk1r77mipd5k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base bytestring containers data-default directory filepath hashable haskell-lsp-types hslogger lens mtl network-uri - parsec rope-utf16-splay sorted-list stm text time + parsec rope-utf16-splay sorted-list stm temporary text time unordered-containers ]; executableHaskellDepends = [ @@ -106080,15 +105803,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_12_0_0" = callPackage + "haskell-lsp-types_0_12_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, deepseq , filepath, hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.12.0.0"; - sha256 = "10f79vjknklp935lvd300gvvwbky8issgq5s68z4cg6v1xva5np0"; + version = "0.12.1.0"; + sha256 = "1657p73gyqhpb459qf349j0xx6icdj720x0v6x7nb6iyk63q6l6r"; libraryHaskellDepends = [ aeson base bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers @@ -108161,38 +107884,36 @@ self: { ({ mkDerivation, aeson, base, bytestring, cereal, conduit , containers, data-default, directory, filepath, hashable , haskoin-core, haskoin-node, hspec, http-types, monad-logger, mtl - , network, nqe, optparse-applicative, protocol-buffers - , protocol-buffers-descriptor, random, rocksdb-haskell + , network, nqe, optparse-applicative, random, rocksdb-haskell , rocksdb-query, scotty, string-conversions, text, time , transformers, unliftio, unordered-containers }: mkDerivation { pname = "haskoin-store"; - version = "0.14.3"; - sha256 = "1jjnymwaqd22dpciz2gnxynxz02gch13cvpgh66sny8vjwndcy07"; + version = "0.14.5"; + sha256 = "1l1rh9xjzyj6vg9v00fz38l66f1gxfys6l34f9b0wa5534dmg1nr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cereal conduit containers data-default hashable haskoin-core haskoin-node http-types monad-logger mtl - network nqe protocol-buffers protocol-buffers-descriptor random - rocksdb-haskell rocksdb-query scotty string-conversions text time - transformers unliftio unordered-containers + network nqe random rocksdb-haskell rocksdb-query scotty + string-conversions text time transformers unliftio + unordered-containers ]; executableHaskellDepends = [ aeson base bytestring cereal conduit containers data-default directory filepath hashable haskoin-core haskoin-node http-types - monad-logger mtl network nqe optparse-applicative protocol-buffers - protocol-buffers-descriptor random rocksdb-haskell rocksdb-query - scotty string-conversions text time transformers unliftio - unordered-containers + monad-logger mtl network nqe optparse-applicative random + rocksdb-haskell rocksdb-query scotty string-conversions text time + transformers unliftio unordered-containers ]; testHaskellDepends = [ aeson base bytestring cereal conduit containers data-default hashable haskoin-core haskoin-node hspec http-types monad-logger - mtl network nqe protocol-buffers protocol-buffers-descriptor random - rocksdb-haskell rocksdb-query scotty string-conversions text time - transformers unliftio unordered-containers + mtl network nqe random rocksdb-haskell rocksdb-query scotty + string-conversions text time transformers unliftio + unordered-containers ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; license = stdenv.lib.licenses.publicDomain; @@ -116680,25 +116401,6 @@ self: { }) {}; "hoauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit - , http-types, microlens, text, unordered-containers, uri-bytestring - , uri-bytestring-aeson - }: - mkDerivation { - pname = "hoauth2"; - version = "1.8.4"; - sha256 = "0k7ibzd5q4bh46m6b46x155n09dd474375k4605d7fl034i16lsx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring exceptions http-conduit http-types microlens - text unordered-containers uri-bytestring uri-bytestring-aeson - ]; - description = "Haskell OAuth2 authentication client"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hoauth2_1_8_5" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit , http-types, microlens, text, unordered-containers, uri-bytestring , uri-bytestring-aeson @@ -116715,7 +116417,6 @@ self: { ]; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hob" = callPackage @@ -121675,8 +121376,8 @@ self: { }: mkDerivation { pname = "hslua"; - version = "1.0.2"; - sha256 = "0w2gcp66ny3crxip0gn86abz8psz2z14nx2z2wna0s8p0n8v5agx"; + version = "1.0.3"; + sha256 = "1g2llcffj4yah326lf9axffziz0bla443zddr0lhpz8nqrpbh4j1"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text @@ -121691,15 +121392,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; - "hslua_1_0_3" = callPackage + "hslua_1_0_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances , tasty, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "1.0.3"; - sha256 = "1g2llcffj4yah326lf9axffziz0bla443zddr0lhpz8nqrpbh4j1"; + version = "1.0.3.1"; + sha256 = "1w11d5csjl5jdzjzcq8gkd7lzyfsgaxmby5gq97jaj6r32l3zy9m"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text @@ -121750,22 +121451,11 @@ self: { testHaskellDepends = [ base hslua tasty tasty-hunit text ]; description = "Lua module wrapper around Haskell's System module"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hslua-module-text" = callPackage - ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text - }: - mkDerivation { - pname = "hslua-module-text"; - version = "0.2.0"; - sha256 = "0zlgin87cck5ccw82jf0bfjcrpdnqlylh4sfqifbdjgspswha5vi"; - libraryHaskellDepends = [ base bytestring hslua text ]; - testHaskellDepends = [ base hslua tasty tasty-hunit text ]; - description = "Lua module for text"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hslua-module-text_0_2_1" = callPackage ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text }: mkDerivation { @@ -121776,7 +121466,6 @@ self: { testHaskellDepends = [ base hslua tasty tasty-hunit text ]; description = "Lua module for text"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsluv-haskell" = callPackage @@ -124757,34 +124446,6 @@ self: { }) {}; "http-conduit" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, connection, cookie - , data-default-class, hspec, http-client, http-client-tls - , http-types, HUnit, mtl, network, resourcet, streaming-commons - , temporary, text, time, transformers, unliftio, unliftio-core - , utf8-string, wai, wai-conduit, warp, warp-tls - }: - mkDerivation { - pname = "http-conduit"; - version = "2.3.7"; - sha256 = "18pj7f5gl72ry2mq2dqbm21spacn5ig14yr0xsdyq7yzs64kq17y"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit conduit-extra http-client - http-client-tls http-types mtl resourcet transformers unliftio-core - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive conduit - conduit-extra connection cookie data-default-class hspec - http-client http-types HUnit network resourcet streaming-commons - temporary text time transformers unliftio utf8-string wai - wai-conduit warp warp-tls - ]; - doCheck = false; - description = "HTTP client package with conduit interface and HTTPS support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-conduit_2_3_7_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, hspec, http-client, http-client-tls @@ -124810,7 +124471,6 @@ self: { doCheck = false; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-conduit-browser" = callPackage @@ -124893,6 +124553,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-directory_0_1_2" = callPackage + ({ mkDerivation, base, bytestring, html-conduit, http-client + , http-client-tls, http-date, http-types, text, time, xml-conduit + }: + mkDerivation { + pname = "http-directory"; + version = "0.1.2"; + sha256 = "0p6m2xlgrs9sgn2nsn85z6gawa9509lxbsw44kdfxya3gcgyg2rp"; + libraryHaskellDepends = [ + base bytestring html-conduit http-client http-client-tls http-date + http-types text time xml-conduit + ]; + description = "http directory listing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-dispatch" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, hspec, http-client, http-client-tls, http-types @@ -125081,6 +124758,8 @@ self: { pname = "http-media"; version = "0.7.1.3"; sha256 = "0kqjzvh5y8r6x5rw2kgd816w2963c6cbyw2qjvaj2mv59zxzqkrr"; + revision = "1"; + editedCabalFile = "19py5pspx80gg679p9dzqr3iidflppxc1x4vkldamjkidyi406j8"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -126479,6 +126158,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-diagnostics_0_0_0_7" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hw-diagnostics"; + version = "0.0.0.7"; + sha256 = "1wfmrdpkvk2p045xchvwhnd1glq527ksgg0bs2qg5r0nyhsg55zi"; + libraryHaskellDepends = [ base ]; + description = "Diagnostics library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-dsv" = callPackage ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion , deepseq, directory, generic-lens, ghc-prim, hedgehog, hspec @@ -131428,8 +131119,8 @@ self: { }: mkDerivation { pname = "instana-haskell-trace-sdk"; - version = "0.2.0.0"; - sha256 = "1yl8k10win4r06rfqxl1vfp4zb78lijrzsn6zpmlqycnpfm00zp0"; + version = "0.3.0.0"; + sha256 = "0dy947230ing6mv4xvd8ahiwfhkz557n2mrvi86whns8jbb71nbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131440,7 +131131,8 @@ self: { ]; executableHaskellDepends = [ aeson base binary bytestring hslogger http-client http-types - servant servant-server text time transformers unix wai warp + servant servant-server text time transformers unix + unordered-containers wai warp ]; testHaskellDepends = [ aeson aeson-extra base bytestring directory ekg-core exceptions @@ -132034,6 +131726,24 @@ self: { broken = true; }) {}; + "interpolatedstring-qq2" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-meta, HUnit + , template-haskell, text + }: + mkDerivation { + pname = "interpolatedstring-qq2"; + version = "0.1.0.0"; + sha256 = "0d7xq1pdrhfl1vfl1axhzpv04hbc9yhvfagisrfq42hj6mbh8djx"; + libraryHaskellDepends = [ + base bytestring haskell-src-meta template-haskell text + ]; + testHaskellDepends = [ + base bytestring haskell-src-meta HUnit template-haskell text + ]; + description = "QuasiQuoter for multi-line interpolated strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "interpolation" = callPackage ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: mkDerivation { @@ -132057,8 +131767,8 @@ self: { }: mkDerivation { pname = "interpolator"; - version = "0.1.1"; - sha256 = "13symhhxvv2dxn7449p8b9g7p37p98icj0ql63y9qkdg6s7b8rf0"; + version = "0.1.2"; + sha256 = "1kzqlwgpbzrq0flr90f9q359j8qjxll5adl9w5r9gp1yj3j7hrrz"; libraryHaskellDepends = [ aeson base containers either mono-traversable mtl product-profunctors profunctors QuickCheck template-haskell text @@ -132327,28 +132037,6 @@ self: { }) {}; "invariant" = callPackage - ({ mkDerivation, array, base, bifunctors, comonad, containers - , contravariant, ghc-prim, hspec, hspec-discover, profunctors - , QuickCheck, StateVar, stm, tagged, template-haskell - , th-abstraction, transformers, transformers-compat - , unordered-containers - }: - mkDerivation { - pname = "invariant"; - version = "0.5.2"; - sha256 = "0k3rh5gzga9snj8piqpsix5h9437kmbam75sax7aa6pirhxx0dw0"; - libraryHaskellDepends = [ - array base bifunctors comonad containers contravariant ghc-prim - profunctors StateVar stm tagged template-haskell th-abstraction - transformers transformers-compat unordered-containers - ]; - testHaskellDepends = [ base hspec QuickCheck template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell98 invariant functors"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "invariant_0_5_3" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers , contravariant, ghc-prim, hspec, hspec-discover, profunctors , QuickCheck, StateVar, stm, tagged, template-haskell @@ -132368,7 +132056,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell98 invariant functors"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible" = callPackage @@ -134479,8 +134166,8 @@ self: { pname = "jaeger-flamegraph"; version = "1.3.0"; sha256 = "03j5hjrhyhmc6qjp7v4j0mr2y0fpk0zds6v55as24par508w72ka"; - revision = "1"; - editedCabalFile = "1q6hmjbj60h86zghzh18nyay705l1960fm7cl4j2fxizz9fll3mg"; + revision = "2"; + editedCabalFile = "0p2pcfyrcbqh0rnmhhp5hbwixvlml62iz0d48z7dd6cwfdzlkfrr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base containers QuickCheck text ]; @@ -135030,6 +134717,8 @@ self: { pname = "jmacro"; version = "0.6.16"; sha256 = "1kyrvxg5fwwrwv72aby694ar071yl2xmnfkjyrwi5wbc7hsb8rda"; + revision = "1"; + editedCabalFile = "0g7fn738ljrhh6ydmvkigj9znhh2szdvp79kqxw62m4ryqan23qq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138338,24 +138027,6 @@ self: { }) {}; "keys" = callPackage - ({ mkDerivation, array, base, comonad, containers, free, hashable - , semigroupoids, semigroups, tagged, transformers - , transformers-compat, unordered-containers - }: - mkDerivation { - pname = "keys"; - version = "3.12.1"; - sha256 = "1yqm4gpshsgswx6w78z64c83gpydh6jhgslx2lnc10nzhy0s9kkz"; - libraryHaskellDepends = [ - array base comonad containers free hashable semigroupoids - semigroups tagged transformers transformers-compat - unordered-containers - ]; - description = "Keyed functors and containers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "keys_3_12_2" = callPackage ({ mkDerivation, array, base, comonad, containers, free, hashable , semigroupoids, semigroups, tagged, transformers , transformers-compat, unordered-containers @@ -138371,7 +138042,6 @@ self: { ]; description = "Keyed functors and containers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keysafe" = callPackage @@ -138592,17 +138262,6 @@ self: { }) {}; "kind-apply" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "kind-apply"; - version = "0.3.0.0"; - sha256 = "1k4plkf7j0spjvi565zfg25fshm2lkh6xjb5a0mr9c5nmq3cp2q7"; - libraryHaskellDepends = [ base ]; - description = "Utilities to work with lists of types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "kind-apply_0_3_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "kind-apply"; @@ -138611,7 +138270,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Utilities to work with lists of types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kind-generics" = callPackage @@ -138626,22 +138284,6 @@ self: { }) {}; "kind-generics-th" = callPackage - ({ mkDerivation, base, kind-generics, template-haskell - , th-abstraction - }: - mkDerivation { - pname = "kind-generics-th"; - version = "0.1.0.0"; - sha256 = "1dbx24yb8imy7sn9x6372ckdzhslxv9i0svzlwslaavbycpqyvzd"; - libraryHaskellDepends = [ - base kind-generics template-haskell th-abstraction - ]; - testHaskellDepends = [ base kind-generics ]; - description = "Template Haskell support for generating `GenericK` instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "kind-generics-th_0_1_1_0" = callPackage ({ mkDerivation, base, kind-generics, template-haskell , th-abstraction }: @@ -138655,7 +138297,6 @@ self: { testHaskellDepends = [ base kind-generics ]; description = "Template Haskell support for generating `GenericK` instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kinds" = callPackage @@ -139141,6 +138782,40 @@ self: { broken = true; }) {}; + "kurita" = callPackage + ({ mkDerivation, aeson, approximate, async, atomic-write, base + , bits, broadcast-chan, bytes, bytestring, containers, delay + , double-metaphone, hashable, http-types, hyperloglog, lens + , linklater, megaparsec, monad-loops, mtl, parser-combinators + , random, reflection, siphash, sorted-list, split, stm, text, time + , unordered-containers, uri-bytestring, vector, wai, wai-websockets + , warp, websockets, wreq, wuss + }: + mkDerivation { + pname = "kurita"; + version = "0"; + sha256 = "1drm9jbp8ypisg3smhrjlcpls7m7h4dxc5zv570wvjkfxhfkvf6d"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson approximate async atomic-write base broadcast-chan bytestring + containers delay double-metaphone hashable http-types hyperloglog + lens linklater megaparsec monad-loops mtl parser-combinators random + reflection sorted-list split stm text time unordered-containers + uri-bytestring vector wai wai-websockets websockets wreq wuss + ]; + executableHaskellDepends = [ + aeson async base bits bytes bytestring containers delay linklater + monad-loops siphash stm text time warp websockets + ]; + testHaskellDepends = [ base ]; + description = "Find the alpha emoji"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "kyotocabinet" = callPackage ({ mkDerivation, base, bytestring, cereal, kyotocabinet }: mkDerivation { @@ -140848,27 +140523,6 @@ self: { }) {}; "language-javascript" = callPackage - ({ mkDerivation, alex, array, base, blaze-builder, bytestring - , Cabal, containers, happy, hspec, mtl, QuickCheck, text - , utf8-light, utf8-string - }: - mkDerivation { - pname = "language-javascript"; - version = "0.6.0.11"; - sha256 = "0hv1rj3yarv035mpnnnbqys4sgd0awqlm5hyf29wp051r6dnwxfl"; - libraryHaskellDepends = [ - array base blaze-builder bytestring containers mtl text utf8-string - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - array base blaze-builder bytestring Cabal containers hspec mtl - QuickCheck utf8-light utf8-string - ]; - description = "Parser for JavaScript"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-javascript_0_6_0_12" = callPackage ({ mkDerivation, alex, array, base, blaze-builder, bytestring , Cabal, containers, happy, hspec, mtl, QuickCheck, text , utf8-light, utf8-string @@ -140887,7 +140541,6 @@ self: { ]; description = "Parser for JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-js" = callPackage @@ -144530,27 +144183,6 @@ self: { }) {}; "lifted-async" = callPackage - ({ mkDerivation, async, base, constraints, criterion, deepseq - , HUnit, lifted-base, monad-control, mtl, tasty - , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base - }: - mkDerivation { - pname = "lifted-async"; - version = "0.10.0.3"; - sha256 = "131bh83yc3jhy0hwgslvs9p9clgl4i2hhvwz2xgx7igpbhsrrl43"; - libraryHaskellDepends = [ - async base constraints lifted-base monad-control transformers-base - ]; - testHaskellDepends = [ - async base HUnit lifted-base monad-control mtl tasty - tasty-expected-failure tasty-hunit tasty-th - ]; - benchmarkHaskellDepends = [ async base criterion deepseq ]; - description = "Run lifted IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lifted-async_0_10_0_4" = callPackage ({ mkDerivation, async, base, constraints, criterion, deepseq , HUnit, lifted-base, monad-control, mtl, tasty , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base @@ -144569,7 +144201,6 @@ self: { benchmarkHaskellDepends = [ async base criterion deepseq ]; description = "Run lifted IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -145000,34 +144631,6 @@ self: { }) {}; "linear" = callPackage - ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes - , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq - , distributive, doctest, ghc-prim, hashable, HUnit, lens - , reflection, semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , transformers, transformers-compat, unordered-containers, vector - , void - }: - mkDerivation { - pname = "linear"; - version = "1.20.8"; - sha256 = "046vkvxlb0s286qr55s0c6db0rlwbm1cmlmwhrrkqbkzhfcipgay"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - adjunctions base base-orphans binary bytes cereal containers - deepseq distributive ghc-prim hashable lens reflection - semigroupoids semigroups tagged template-haskell transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base binary bytestring deepseq doctest HUnit lens reflection - simple-reflect test-framework test-framework-hunit vector - ]; - description = "Linear Algebra"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "linear_1_20_9" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq , distributive, doctest, ghc-prim, hashable, HUnit, lens @@ -145053,7 +144656,6 @@ self: { ]; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linear-accelerate" = callPackage @@ -147775,17 +147377,6 @@ self: { }) {}; "logict" = callPackage - ({ mkDerivation, base, mtl }: - mkDerivation { - pname = "logict"; - version = "0.6.0.2"; - sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi"; - libraryHaskellDepends = [ base mtl ]; - description = "A backtracking logic-programming monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logict_0_6_0_3" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { pname = "logict"; @@ -147794,7 +147385,6 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "A backtracking logic-programming monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logict-state" = callPackage @@ -152719,32 +152309,6 @@ self: { }) {}; "megaparsec" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , criterion, deepseq, hspec, hspec-expectations, mtl - , parser-combinators, QuickCheck, scientific, text, transformers - , weigh - }: - mkDerivation { - pname = "megaparsec"; - version = "7.0.4"; - sha256 = "1hg83m85f4v78mqdkznd1ddk9y32hnrv0bgva7ir3vydx37aanrj"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers deepseq mtl - parser-combinators scientific text transformers - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers hspec - hspec-expectations mtl parser-combinators QuickCheck scientific - text transformers - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq text weigh - ]; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "megaparsec_7_0_5" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, mtl, parser-combinators, scientific, text , transformers, weigh @@ -152762,7 +152326,6 @@ self: { ]; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "megaparsec-tests" = callPackage @@ -152787,6 +152350,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Test utilities and the test suite of Megaparsec"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "meldable-heap" = callPackage @@ -154531,6 +154096,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "min-max-pqueue" = callPackage + ({ mkDerivation, base, containers, criterion, hedgehog + , integer-logarithms, random + }: + mkDerivation { + pname = "min-max-pqueue"; + version = "0.1.0.0"; + sha256 = "142cfiybs6slzrdhc0k91rr5xxzi07saxcr834iic304cpbzcdrv"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hedgehog ]; + benchmarkHaskellDepends = [ + base containers criterion integer-logarithms random + ]; + description = "Double-ended priority queues"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "minecraft-data" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , mtl, nbt, pipes, pipes-bytestring, pipes-cereal, pipes-parse @@ -155446,35 +155028,6 @@ self: { }) {}; "mmark" = callPackage - ({ mkDerivation, aeson, base, case-insensitive, containers - , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec - , hspec-discover, hspec-megaparsec, html-entity-map, lucid - , megaparsec, microlens, microlens-th, modern-uri, mtl - , parser-combinators, QuickCheck, text, text-metrics - , unordered-containers, weigh, yaml - }: - mkDerivation { - pname = "mmark"; - version = "0.0.6.2"; - sha256 = "0j8n2rjfx590v0m3p9z8xhbfxgxbc1cxfkdg18vwyhayh55mn373"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base case-insensitive containers deepseq dlist email-validate - foldl hashable html-entity-map lucid megaparsec microlens - microlens-th modern-uri mtl parser-combinators text text-metrics - unordered-containers yaml - ]; - testHaskellDepends = [ - aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri - QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion text weigh ]; - description = "Strict markdown processor for writers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mmark_0_0_7_0" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens @@ -155499,7 +155052,6 @@ self: { benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmark-cli" = callPackage @@ -155544,19 +155096,6 @@ self: { }) {}; "mmorph" = callPackage - ({ mkDerivation, base, mtl, transformers, transformers-compat }: - mkDerivation { - pname = "mmorph"; - version = "1.1.2"; - sha256 = "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9"; - libraryHaskellDepends = [ - base mtl transformers transformers-compat - ]; - description = "Monad morphisms"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mmorph_1_1_3" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; @@ -155567,7 +155106,6 @@ self: { ]; description = "Monad morphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmtf" = callPackage @@ -158990,20 +158528,6 @@ self: { }) {}; "mtl-compat" = callPackage - ({ mkDerivation, base, mtl }: - mkDerivation { - pname = "mtl-compat"; - version = "0.2.1.3"; - sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34"; - revision = "4"; - editedCabalFile = "1mfrx8cpx0502sjv0bmlfkl0h46c4krldg8m89k4fj6iawwg2ab5"; - libraryHaskellDepends = [ base mtl ]; - doHaddock = false; - description = "Backported Control.Monad.Except module from mtl"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mtl-compat_0_2_2" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { pname = "mtl-compat"; @@ -159013,7 +158537,6 @@ self: { doHaddock = false; description = "Backported Control.Monad.Except module from mtl"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mtl-evil-instances" = callPackage @@ -162759,6 +162282,8 @@ self: { pname = "nettle"; version = "0.3.0"; sha256 = "0pbxpxr9xdw3ha5lm9vnsbsvq0kzzsqv6gfk041ijllf1sc0hgyg"; + revision = "1"; + editedCabalFile = "1j8h6m4cj1ykxrsxmjiyb1c4mv6cawssgb8phl0aijrjn3b79f2b"; libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types securemem tagged ]; @@ -163520,6 +163045,8 @@ self: { pname = "network-multicast"; version = "0.2.0"; sha256 = "1wkmx5gic0zqghxxdyyrcysfaj1aknj53v50qq6c40d4qfmm0fqg"; + revision = "2"; + editedCabalFile = "1hha4vvyrx29d2lwwjl0bfpbaj00k85bd4w83s4hvawqbxqvvhkw"; libraryHaskellDepends = [ base network ]; description = "Simple multicast library"; license = stdenv.lib.licenses.publicDomain; @@ -164206,6 +163733,8 @@ self: { ]; description = "A basic newsletter implimentation, using various backends"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "newsletter-mailgun" = callPackage @@ -164270,11 +163799,25 @@ self: { pname = "newtype"; version = "0.2"; sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p"; + revision = "1"; + editedCabalFile = "0rbhpa1krcmvv4hsy3h5h8l4vqjk9wckddcz34rfcq0m7zlmsrfz"; libraryHaskellDepends = [ base ]; description = "A typeclass and set of functions for working with newtypes"; license = stdenv.lib.licenses.bsd3; }) {}; + "newtype_0_2_1_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "newtype"; + version = "0.2.1.0"; + sha256 = "03fr1yfip09dvwff87dssy7r0vrv4rv184flxnp9gjzbg6h9byvb"; + libraryHaskellDepends = [ base ]; + description = "A typeclass and set of functions for working with newtypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "newtype-deriving" = callPackage ({ mkDerivation, base, base-prelude, monad-control , template-haskell, transformers, transformers-base @@ -168281,6 +167824,8 @@ self: { pname = "openpgp-asciiarmor"; version = "0.1.1"; sha256 = "01zna9zifixnzgalr3k21g9dv143cn49imawm4q9x37i2r9kybxr"; + revision = "1"; + editedCabalFile = "0j4qra3i7g607axj07d7f0ycj07d889nyw2s04m5wc98blbm5k4j"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring ]; @@ -170912,8 +170457,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.1.3"; - sha256 = "067x0kklbqfi65hy9rq593z1fwr62sp0d01ili2wywkwq2m2dq32"; + version = "0.1.4"; + sha256 = "03bjjv31lyjz9s5x7dwvc38wczniclvbrxj0v2rdc2z5bpsw1sg8"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -172197,27 +171742,6 @@ self: { }) {}; "parsers" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, binary, bytestring - , charset, containers, mtl, parsec, QuickCheck - , quickcheck-instances, scientific, semigroups, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "parsers"; - version = "0.12.9"; - sha256 = "1r05sc1mcglk8w596kq9a1brfn9c2vll8lq16j07ln0vsz4jzrc1"; - libraryHaskellDepends = [ - attoparsec base base-orphans binary charset containers mtl parsec - scientific semigroups text transformers unordered-containers - ]; - testHaskellDepends = [ - attoparsec base bytestring parsec QuickCheck quickcheck-instances - ]; - description = "Parsing combinators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "parsers_0_12_10" = callPackage ({ mkDerivation, attoparsec, base, base-orphans, binary, bytestring , charset, containers, mtl, parsec, QuickCheck , quickcheck-instances, scientific, semigroups, text, transformers @@ -172236,7 +171760,6 @@ self: { ]; description = "Parsing combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsers-megaparsec" = callPackage @@ -174497,10 +174020,8 @@ self: { }: mkDerivation { pname = "persistent-documentation"; - version = "0.1.0.0"; - sha256 = "1m9hmvi6krksb64k5mqkqpcz3670xjbqr4vic0x1n350ji2mrngd"; - revision = "1"; - editedCabalFile = "06nrr2c4pprrgl4d2iwi8np7714rx685g4dagaad79q5x01k4d8v"; + version = "0.1.0.1"; + sha256 = "027fxb3ggzyxg2ykml7sdk2hycacd237161yr3w5cwi320b9ghyg"; libraryHaskellDepends = [ base containers mtl persistent template-haskell text ]; @@ -174511,6 +174032,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Documentation DSL for persistent entities"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-equivalence" = callPackage @@ -175043,7 +174566,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template_2_7_0" = callPackage + "persistent-template_2_7_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, deepseq-generics, file-embed, hspec, http-api-data , monad-control, monad-logger, path-pieces, persistent, QuickCheck @@ -175051,8 +174574,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.7.0"; - sha256 = "0pz750b7ybg27nl9b7hiw25vg0dwjy8196c6kpj1xwfgcxkdizq5"; + version = "2.7.1"; + sha256 = "1yki4dvfk2p5cs2gfdnplsfyb1cxakhrdfjxgdgbnc0xxicbzx42"; libraryHaskellDepends = [ aeson base bytestring containers http-api-data monad-control monad-logger path-pieces persistent template-haskell text @@ -186872,17 +186395,6 @@ self: { }) {}; "quickcheck-simple" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "quickcheck-simple"; - version = "0.1.0.4"; - sha256 = "0524xkhx2qa6wfl7wf9qdjscr2djl0l08a1bk6ikigcpdabbb3l0"; - libraryHaskellDepends = [ base QuickCheck ]; - description = "Test properties and default-mains for QuickCheck"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-simple_0_1_1_0" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-simple"; @@ -186891,7 +186403,6 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-special" = callPackage @@ -189265,34 +188776,6 @@ self: { }) {}; "rcu" = callPackage - ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest - , containers, criterion, deepseq, doctest, fail, ghc-prim, hlint - , optparse-applicative, parallel, primitive, rdtsc, time - , transformers - }: - mkDerivation { - pname = "rcu"; - version = "0.2.3"; - sha256 = "17w0y843z5mr095cazfrz1jnf731zjsnd6vhgkx8ppras05vs371"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - atomic-primops base fail ghc-prim parallel primitive transformers - ]; - executableHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base doctest hlint parallel ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq ghc-prim optparse-applicative - primitive rdtsc time transformers - ]; - description = "Read-Copy-Update for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "rcu_0_2_4" = callPackage ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest , containers, criterion, deepseq, doctest, fail, ghc-prim , optparse-applicative, parallel, primitive, rdtsc, time @@ -192153,35 +191636,6 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, containers, exceptions, generic-lens - , hashable, hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl - , multimap, protolude, random, resourcet, semigroupoids, semigroups - , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell - , text, transformers-base, universum - }: - mkDerivation { - pname = "registry"; - version = "0.1.3.5"; - sha256 = "1nyk32bimkhsbz2597hdy089c7w5025wj9yfj1i3gd0145liaf2h"; - libraryHaskellDepends = [ - base containers exceptions hashable mtl protolude resourcet - semigroupoids semigroups template-haskell text transformers-base - ]; - testHaskellDepends = [ - async base containers exceptions generic-lens hashable hedgehog - hedgehog-corpus io-memoize MonadRandom mtl multimap protolude - random resourcet semigroupoids semigroups tasty tasty-discover - tasty-hedgehog tasty-th template-haskell text transformers-base - universum - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "registry_0_1_3_6" = callPackage ({ mkDerivation, async, base, containers, exceptions, generic-lens , hashable, hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl , multimap, protolude, random, resourcet, semigroupoids, semigroups @@ -192949,8 +192403,8 @@ self: { pname = "repa"; version = "3.4.1.4"; sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; - revision = "1"; - editedCabalFile = "1c5rf3ky5lw9q1ji2y37m721gs7m5liw3j84159ib0w0bb3ddzmi"; + revision = "2"; + editedCabalFile = "16kyy7ck3yki0mlcap0bbiadcn18yn6x90m4s2prkasi9ip0pcs8"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -193054,8 +192508,8 @@ self: { pname = "repa-examples"; version = "3.4.1.2"; sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d"; - revision = "1"; - editedCabalFile = "00w3cyd3r2jp1z962fwchsg4ffqfhq99mnl4anwcylxdkp15jv0l"; + revision = "2"; + editedCabalFile = "0aghk6pav63hx13dzmp9v9izq7zv4kdc0vbbv2wr14i234ghljh9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -193298,17 +192752,6 @@ self: { }) {}; "repline" = callPackage - ({ mkDerivation, base, containers, haskeline, mtl, process }: - mkDerivation { - pname = "repline"; - version = "0.2.0.0"; - sha256 = "1ph21kbbanlcs8n5lwk16g9vqkb98mkbz5mzwrp8j2rls2921izc"; - libraryHaskellDepends = [ base containers haskeline mtl process ]; - description = "Haskeline wrapper for GHCi-like REPL interfaces"; - license = stdenv.lib.licenses.mit; - }) {}; - - "repline_0_2_1_0" = callPackage ({ mkDerivation, base, containers, fail, haskeline, mtl, process }: mkDerivation { pname = "repline"; @@ -193319,7 +192762,6 @@ self: { ]; description = "Haskeline wrapper for GHCi-like REPL interfaces"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repo-based-blog" = callPackage @@ -196045,8 +195487,8 @@ self: { }: mkDerivation { pname = "rope-utf16-splay"; - version = "0.2.0.0"; - sha256 = "078hkv21maydvks57pz6z3qyz0r4s1c6ypdmlr4xlmakyldrdlc3"; + version = "0.3.1.0"; + sha256 = "1ilcgwmdwqnp95vb7652fc03ji9dnzy6cm24pvbiwi2mhc4piy6b"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -199525,35 +198967,6 @@ self: { }) {}; "scotty" = callPackage - ({ mkDerivation, aeson, async, base, blaze-builder, bytestring - , case-insensitive, data-default-class, directory, exceptions, fail - , hspec, hspec-discover, hspec-wai, http-types, lifted-base - , monad-control, mtl, nats, network, regex-compat, text - , transformers, transformers-base, transformers-compat, wai - , wai-extra, warp - }: - mkDerivation { - pname = "scotty"; - version = "0.11.3"; - sha256 = "14570k1klrlwra58zz7ip3j41nc75gaswrp8m4xwlrjzgpdqm70a"; - revision = "2"; - editedCabalFile = "0d5ls120fq9xfdsdzj1xgfh2prpcz46i4kc54r6pd6ncpnkfalyi"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive - data-default-class exceptions fail http-types monad-control mtl - nats network regex-compat text transformers transformers-base - transformers-compat wai wai-extra warp - ]; - testHaskellDepends = [ - async base bytestring data-default-class directory hspec hspec-wai - http-types lifted-base network text wai - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scotty_0_11_4" = callPackage ({ mkDerivation, aeson, async, base, blaze-builder, bytestring , case-insensitive, data-default-class, directory, exceptions, fail , hspec, hspec-discover, hspec-wai, http-types, lifted-base @@ -199578,7 +198991,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-binding-play" = callPackage @@ -206616,20 +206028,23 @@ self: { }) {}; "shower" = callPackage - ({ mkDerivation, base, containers, directory, filepath, megaparsec - , pretty, process, tasty, tasty-golden, temporary + ({ mkDerivation, aeson, base, containers, directory, filepath + , megaparsec, pretty, process, QuickCheck, tasty, tasty-golden + , tasty-quickcheck, temporary, text, unordered-containers + , utf8-string, vector }: mkDerivation { pname = "shower"; - version = "0.1"; - sha256 = "1jnj0v8h01sb5znc3rlfrplkyis9aflxgwg01l9a5293l19jgs4r"; + version = "0.2"; + sha256 = "0jxsv08w7cmlkr820f2m9qbx00m2h6h3hp6lrng7iz03i89gwpf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base megaparsec pretty ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers directory filepath process tasty tasty-golden - temporary + aeson base containers directory filepath process QuickCheck tasty + tasty-golden tasty-quickcheck temporary text unordered-containers + utf8-string vector ]; description = "Clean up the formatting of 'show' output"; license = stdenv.lib.licenses.bsd3; @@ -210158,6 +209573,8 @@ self: { pname = "snap-server"; version = "1.1.1.1"; sha256 = "0lw475wp0lnrbgc3jcfif3qjjc3pmrh2k74d8cgpnc1304g6a2s5"; + revision = "1"; + editedCabalFile = "094b7ll47lxd4lvr6kd59jyw0vz686gw5cx16w758d6fli0cy3x3"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -214526,34 +213943,6 @@ self: { }) {}; "stack2nix" = callPackage - ({ mkDerivation, async, base, Cabal, cabal2nix, containers - , directory, distribution-nixpkgs, filepath, hackage-db, hspec - , language-nix, lens, optparse-applicative, path, pretty, process - , regex-pcre, SafeSemaphore, stack, temporary, text, time - }: - mkDerivation { - pname = "stack2nix"; - version = "0.2.2"; - sha256 = "0x5dsgq9mdibbbilc0wn86qqkdgjkm606y4ix57vwxpfgrgkd3wm"; - revision = "1"; - editedCabalFile = "1rxrdpzgql4pldx990hmhhjj39kirxvqphiqjmwr9gbhbkyv7hcg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base Cabal cabal2nix containers directory - distribution-nixpkgs filepath hackage-db language-nix lens - optparse-applicative path pretty process regex-pcre SafeSemaphore - stack temporary text time - ]; - executableHaskellDepends = [ - base Cabal optparse-applicative time - ]; - testHaskellDepends = [ base hspec ]; - description = "Convert stack.yaml files into Nix build instructions."; - license = stdenv.lib.licenses.mit; - }) {}; - - "stack2nix_0_2_3" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, cabal2nix , containers, directory, distribution-nixpkgs, filepath, hackage-db , hspec, language-nix, lens, optparse-applicative, path, pretty @@ -214577,7 +213966,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Convert stack.yaml files into Nix build instructions."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage" = callPackage @@ -214768,23 +214156,28 @@ self: { }) {}; "stackage-query" = callPackage - ({ mkDerivation, aeson, base, Cabal, containers, directory - , exceptions, filepath, hashable, optparse-applicative, process - , safe, semigroups, text, time, unordered-containers, vector, yaml + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, exceptions, filepath, hashable, http-directory + , optparse-applicative, process, safe, semigroups, simple-cmd + , simple-cmd-args, text, time, unix, unordered-containers, vector + , yaml }: mkDerivation { pname = "stackage-query"; - version = "0.1.3"; - sha256 = "01fjxgxbyd7hxr2js7jpa7gm6d0bdm58gxz4pzzwsgnbchm50q25"; + version = "0.2.0"; + sha256 = "1aqra70mfnxxirbv61q71ia00jnrcdfyhrrswnzrd4jf7ar2ja02"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base Cabal containers directory exceptions filepath hashable - optparse-applicative process safe semigroups text time + aeson base bytestring Cabal containers directory exceptions + filepath hashable http-directory optparse-applicative process safe + semigroups simple-cmd simple-cmd-args text time unix unordered-containers vector yaml ]; - description = "Stackage package query"; + description = "Tool for querying Stackage"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage-sandbox" = callPackage @@ -214868,6 +214261,8 @@ self: { pname = "stackage-types"; version = "1.2.0"; sha256 = "1jzlxnibl4fn6mqbxv9c8hw4zp7adyicwwkknr5w1am5k825a0n0"; + revision = "1"; + editedCabalFile = "0myabw8i41607z2yk5zz5y4mm0bm37qxp2zmnlfnb4267qq15klz"; libraryHaskellDepends = [ aeson base Cabal containers exceptions hashable safe semigroups text time unordered-containers vector @@ -216383,18 +215778,6 @@ self: { }) {}; "stopwatch" = callPackage - ({ mkDerivation, base, clock, hspec, transformers }: - mkDerivation { - pname = "stopwatch"; - version = "0.1.0.5"; - sha256 = "0q9l27cpfz5hs3ggxij0lk8p3vrgkjg1binhv2nwss4dvygdc7j6"; - libraryHaskellDepends = [ base clock transformers ]; - testHaskellDepends = [ base clock hspec ]; - description = "A simple stopwatch utility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stopwatch_0_1_0_6" = callPackage ({ mkDerivation, base, clock, hspec, transformers }: mkDerivation { pname = "stopwatch"; @@ -216404,7 +215787,6 @@ self: { testHaskellDepends = [ base clock hspec ]; description = "A simple stopwatch utility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "storable" = callPackage @@ -217839,13 +217221,13 @@ self: { "string-interpolate" = callPackage ({ mkDerivation, base, bytestring, criterion, formatting , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6 - , Interpolation, QuickCheck, quickcheck-instances, quickcheck-text + , QuickCheck, quickcheck-instances, quickcheck-text , template-haskell, text, text-conversions, utf8-string }: mkDerivation { pname = "string-interpolate"; - version = "0.1.0.0"; - sha256 = "1q80rkp7qhha1swz47rkjmpnmnr4p5837s1179l43v1117ck0yqa"; + version = "0.1.0.1"; + sha256 = "0gk5driazck1h1hnpp17kw0ylgp15s9jnnmz53wxz4rjqy6g3z4c"; libraryHaskellDepends = [ base bytestring haskell-src-meta template-haskell text text-conversions utf8-string @@ -217856,7 +217238,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion formatting interpolate - interpolatedstring-perl6 Interpolation QuickCheck text + interpolatedstring-perl6 QuickCheck text ]; description = "Haskell string/text/bytestring interpolation that just works"; license = stdenv.lib.licenses.bsd3; @@ -218336,28 +217718,6 @@ self: { }) {}; "structs" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory - , doctest, filepath, ghc-prim, hlint, parallel, primitive - , template-haskell - }: - mkDerivation { - pname = "structs"; - version = "0.1.1"; - sha256 = "0hdajhvd6i81dchdyd42fa17pm53jd7g3irqjfardbbmjx0sqq6z"; - revision = "2"; - editedCabalFile = "1v9gmnj17cm4p491rizvw9xdj255lk1y24gz6s8bqcz56sdb4d4s"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base deepseq ghc-prim primitive template-haskell - ]; - testHaskellDepends = [ - base directory doctest filepath hlint parallel - ]; - description = "Strict GC'd imperative object-oriented programming with cheap pointers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "structs_0_1_2" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, template-haskell @@ -218378,7 +217738,6 @@ self: { ]; description = "Strict GC'd imperative object-oriented programming with cheap pointers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "structural-induction" = callPackage @@ -222039,22 +221398,6 @@ self: { }) {}; "tagsoup" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , process, QuickCheck, text, time - }: - mkDerivation { - pname = "tagsoup"; - version = "0.14.7"; - sha256 = "09gcy5fd5nsk1b7zdrf7yb329fyr8hq5apd6w3cyh3nxd60z504r"; - libraryHaskellDepends = [ base bytestring containers text ]; - testHaskellDepends = [ - base bytestring deepseq directory process QuickCheck time - ]; - description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tagsoup_0_14_8" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , process, QuickCheck, text, time }: @@ -222068,7 +221411,6 @@ self: { ]; description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagsoup-ht" = callPackage @@ -225299,21 +224641,21 @@ self: { }) {}; "testbench" = callPackage - ({ mkDerivation, base, bytestring, cassava, criterion, deepseq - , dlist, HUnit, optparse-applicative, process, statistics - , streaming, streaming-cassava, streaming-with, temporary - , transformers, weigh + ({ mkDerivation, base, bytestring, cassava, criterion + , criterion-measurement, deepseq, dlist, HUnit + , optparse-applicative, process, statistics, streaming + , streaming-cassava, streaming-with, temporary, transformers, weigh }: mkDerivation { pname = "testbench"; - version = "0.2.1.2"; - sha256 = "1mvqvc7k9a7nwx4m1bqhsykmdc4zq3myma2b2vq7s8a88bm8w10r"; + version = "0.2.1.3"; + sha256 = "1fx4r8z87rv3kg5xznrvgv7drsvn82zapxzmiv5440r4gbqw5y0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring cassava criterion deepseq dlist HUnit - optparse-applicative process statistics streaming streaming-cassava - streaming-with temporary transformers weigh + base bytestring cassava criterion criterion-measurement deepseq + dlist HUnit optparse-applicative process statistics streaming + streaming-cassava streaming-with temporary transformers weigh ]; description = "Create tests and benchmarks together"; license = stdenv.lib.licenses.mit; @@ -230627,6 +229969,25 @@ self: { broken = true; }) {}; + "tptp" = callPackage + ({ mkDerivation, attoparsec, base, Cabal, directory, doctest, extra + , generic-random, prettyprinter, QuickCheck, scientific, text + }: + mkDerivation { + pname = "tptp"; + version = "0.1.0.2"; + sha256 = "0v9qh2kxdfl8g05s7wxknq3c02mzfrjka85j73576si79n06v9jq"; + libraryHaskellDepends = [ + attoparsec base prettyprinter scientific text + ]; + testHaskellDepends = [ + attoparsec base Cabal directory doctest extra generic-random + prettyprinter QuickCheck scientific text + ]; + description = "A parser and a pretty printer for the TPTP language"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "trace" = callPackage ({ mkDerivation, base, containers, deepseq, monad-control, mtl , transformers, transformers-base @@ -239346,25 +238707,6 @@ self: { }) {}; "vector" = callPackage - ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit - , primitive, QuickCheck, random, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers - }: - mkDerivation { - pname = "vector"; - version = "0.12.0.2"; - sha256 = "1wy0pfa3ks6s2dkp1fwrl1s9d3wjmqy9d09icnwfs2zimyn9vs2j"; - libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; - testHaskellDepends = [ - base base-orphans HUnit primitive QuickCheck random - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 transformers - ]; - description = "Efficient Arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector_0_12_0_3" = callPackage ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit , primitive, QuickCheck, random, template-haskell, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers @@ -239383,7 +238725,6 @@ self: { ]; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-algorithms" = callPackage @@ -239394,6 +238735,8 @@ self: { pname = "vector-algorithms"; version = "0.8.0.1"; sha256 = "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m"; + revision = "1"; + editedCabalFile = "18jm5zjzbphyzgc1hjqay04c6j4h7bq2bs8rzngnxk2q8gv658vz"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -241428,37 +240771,6 @@ self: { }) {}; "wai-extra" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, HUnit, iproute, network, old-locale, resourcet - , streaming-commons, text, time, transformers, unix, unix-compat - , vault, void, wai, wai-logger, word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.0.25"; - sha256 = "0caz1miwnyjqg6gdfgv7ibyfdyjzlq2i8v07zhan1nniv9pj3w6y"; - revision = "2"; - editedCabalFile = "0gdg5rfxqfgwj922lxz7ya637nj1qhh1imskiaf453hdpj619aaf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types iproute network old-locale - resourcet streaming-commons text time transformers unix unix-compat - vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base bytestring case-insensitive cookie fast-logger hspec - http-types HUnit resourcet text time transformers wai zlib - ]; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-extra_3_0_26" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -241487,7 +240799,6 @@ self: { ]; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-frontend-monadcgi" = callPackage @@ -246792,20 +246103,6 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "1.1.12"; - sha256 = "1xnnyavkgf2cdnsm494bl1z275l9rynh9s3djq3mqk6lrr4bvsix"; - libraryHaskellDepends = [ - base bytestring connection network websockets - ]; - description = "Secure WebSocket (WSS) clients"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wuss_1_1_13" = callPackage ({ mkDerivation, base, bytestring, connection, network, websockets }: mkDerivation { @@ -246817,7 +246114,6 @@ self: { ]; description = "Secure WebSocket (WSS) clients"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wx" = callPackage @@ -252481,31 +251777,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , bytestring, case-insensitive, conduit, containers, cookie, hspec - , hspec-core, html-conduit, http-types, HUnit, network, pretty-show - , semigroups, text, time, transformers, unliftio, wai, wai-extra - , xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.6"; - sha256 = "1h82njqkbr6h6saixkzim83srx794s6x6qrcmr0w82z5mfl2nfjf"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit network pretty-show semigroups text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers cookie hspec html-conduit http-types - HUnit text unliftio wai wai-extra xml-conduit yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_6_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , bytestring, case-insensitive, conduit, containers, cookie, hspec , hspec-core, html-conduit, http-types, HUnit, network, pretty-show @@ -252528,7 +251799,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage diff --git a/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch b/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch deleted file mode 100644 index 712bd53092f..00000000000 --- a/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/Setup.hs b/Setup.hs -index ddf5a02..7ad1f26 100644 ---- a/Setup.hs -+++ b/Setup.hs -@@ -1,4 +1,4 @@ -- -+{-# LANGUAGE CPP #-} - import Control.Monad (when) - import Language.Haskell.TH - import Distribution.Simple (defaultMainWithHooks, simpleUserHooks, UserHooks(postConf), Args) -@@ -6,14 +6,25 @@ import Distribution.Simple.Utils (cabalVersion) - import Distribution.Simple.LocalBuildInfo - import Distribution.Simple.Setup (ConfigFlags) - import Distribution.Version (Version(..)) -+#if MIN_VERSION_Cabal(1,25,0) -+import Distribution.Version (mkVersion) -+#endif - import Distribution.PackageDescription (PackageDescription) - import Debug.Trace - -+#if MIN_VERSION_Cabal(1,25,0) -+versionBranch :: Version -> Version -+versionBranch = id -+#else -+mkVersion :: [Int] -> Version -+mkVersion vs = Version vs [] -+#endif -+ - -- I couldn't figure out a way to do this check from the cabal file, so we drop down - -- here to do it instead: - checkGoodVersion :: IO () - checkGoodVersion = -- if cabalVersion >= Version [1,17,0] [] -+ if cabalVersion >= mkVersion [1,17,0] - then putStrLn (" [Setup.hs] This version of Cabal is ok for profiling: "++show cabalVersion) - else error (" [Setup.hs] This package should not be used in profiling mode with cabal version "++ - show (versionBranch cabalVersion)++" < 1.17.0\n"++ diff --git a/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch b/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch deleted file mode 100644 index e72bb793da7..00000000000 --- a/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru3 graphviz.old/Data/GraphViz/Algorithms.hs graphviz/Data/GraphViz/Algorithms.hs ---- graphviz.old/Data/GraphViz/Algorithms.hs 2015-05-18 15:21:38.379771357 +0300 -+++ graphviz/Data/GraphViz/Algorithms.hs 2015-05-18 15:01:01.940122684 +0300 -@@ -38,6 +38,7 @@ - import Data.GraphViz.Types.Canonical - import Data.GraphViz.Types.Internal.Common - -+import Prelude hiding (traverse) - import Control.Arrow (first, second, (***)) - import Control.Monad (unless) - import Control.Monad.Trans.State diff --git a/pkgs/development/haskell-modules/patches/hie-testsuite.patch b/pkgs/development/haskell-modules/patches/hie-testsuite.patch deleted file mode 100644 index 86cac15c246..00000000000 --- a/pkgs/development/haskell-modules/patches/hie-testsuite.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/test/HaRePluginSpec.hs b/test/HaRePluginSpec.hs -index 039c094..d0d1fa4 100644 ---- a/test/HaRePluginSpec.hs -+++ b/test/HaRePluginSpec.hs -@@ -326,35 +326,6 @@ hareSpec = do - $ List [TextEdit (Range (Position 4 0) (Position 8 12)) - "parseStr = char '\"' *> (many1 (noneOf \"\\\"\")) <* char '\"'"]) - Nothing) -- it "finds definition across components" $ do -- let u = filePathToUri "./app/Main.hs" -- let lreq = setTypecheckedModule u -- let req = findDef u (toPos (7,8)) -- r <- dispatchRequestPGoto $ lreq >> req -- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib.hs") -- (Range (toPos (6,1)) (toPos (6,9)))] -- let req2 = findDef u (toPos (7,20)) -- r2 <- dispatchRequestPGoto $ lreq >> req2 -- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs") -- (Range (toPos (5,1)) (toPos (5,2)))] -- it "finds definition in the same component" $ do -- let u = filePathToUri "./src/Lib2.hs" -- let lreq = setTypecheckedModule u -- let req = findDef u (toPos (6,5)) -- r <- dispatchRequestPGoto $ lreq >> req -- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib.hs") -- (Range (toPos (6,1)) (toPos (6,9)))] -- it "finds local definitions" $ do -- let u = filePathToUri "./src/Lib2.hs" -- let lreq = setTypecheckedModule u -- let req = findDef u (toPos (7,11)) -- r <- dispatchRequestPGoto $ lreq >> req -- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs") -- (Range (toPos (10,9)) (toPos (10,10)))] -- let req2 = findDef u (toPos (10,13)) -- r2 <- dispatchRequestPGoto $ lreq >> req2 -- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs") -- (Range (toPos (9,9)) (toPos (9,10)))] - - - -- --------------------------------- diff --git a/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch b/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch deleted file mode 100644 index 9b7b7cfb8f9..00000000000 --- a/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -index 60e134c..246d8ca 100644 ---- lambdabot-core/src/Lambdabot/Config.hs -+++ lambdabot-core/src/Lambdabot/Config.hs -@@ -29,9 +29,9 @@ import Data.Typeable - import Data.Generics (everywhere, mkT) - import Language.Haskell.TH - --data Config t where Config :: (Typeable1 k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t -+data Config t where Config :: (Typeable k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t - --cast1 :: (Typeable1 f, Typeable1 g) => f a -> Maybe (g a) -+cast1 :: (Typeable f, Typeable g) => f a -> Maybe (g a) - cast1 = fmap runIdentity . gcast1 . Identity - - instance GEq Config where diff --git a/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch deleted file mode 100644 index 3917c2f0afd..00000000000 --- a/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 86595e193e8d46c769ab2a1cee961e8e04dfd1b9 Mon Sep 17 00:00:00 2001 -From: Michiel Derhaeg -Date: Tue, 20 Mar 2018 22:06:18 +0100 -Subject: [PATCH] update to work with GHC 8.4.1 - ---- - XMonad/Hooks/FadeWindows.hs | 6 +++++- - XMonad/Hooks/WallpaperSetter.hs | 6 +++++- - XMonad/Layout/Mosaic.hs | 6 +++++- - xmonad-contrib.cabal | 5 +++-- - 5 files changed, 33 insertions(+), 5 deletions(-) - -diff --git a/XMonad/Hooks/FadeWindows.hs b/XMonad/Hooks/FadeWindows.hs -index 4b8e62b6..01d06792 100644 ---- a/XMonad/Hooks/FadeWindows.hs -+++ b/XMonad/Hooks/FadeWindows.hs -@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask - ,asks) - import Control.Monad.State (gets) - import qualified Data.Map as M --import Data.Monoid -+import Data.Monoid hiding ((<>)) -+import Data.Semigroup - - import Graphics.X11.Xlib.Extras (Event(..)) - -@@ -134,6 +135,9 @@ instance Monoid Opacity where - r `mappend` OEmpty = r - _ `mappend` r = r - -+instance Semigroup Opacity where -+ (<>) = mappend -+ - -- | A FadeHook is similar to a ManageHook, but records window opacity. - type FadeHook = Query Opacity - -diff --git a/XMonad/Hooks/WallpaperSetter.hs b/XMonad/Hooks/WallpaperSetter.hs -index 00a3b1c3..d4f5ccb2 100644 ---- a/XMonad/Hooks/WallpaperSetter.hs -+++ b/XMonad/Hooks/WallpaperSetter.hs -@@ -41,7 +41,8 @@ import Data.Ord (comparing) - import Control.Monad - import Control.Applicative - import Data.Maybe --import Data.Monoid -+import Data.Monoid hiding ((<>)) -+import Data.Semigroup - - -- $usage - -- This module requires imagemagick and feh to be installed, as these are utilized -@@ -86,6 +87,9 @@ instance Monoid WallpaperList where - mappend (WallpaperList w1) (WallpaperList w2) = - WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1) - -+instance Semigroup WallpaperList where -+ (<>) = mappend -+ - -- | Complete wallpaper configuration passed to the hook - data WallpaperConf = WallpaperConf { - wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/) -diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs -index 05655d4c..da44fc50 100644 ---- a/XMonad/Layout/Mosaic.hs -+++ b/XMonad/Layout/Mosaic.hs -@@ -38,7 +38,8 @@ import Control.Monad(mplus) - import Data.Foldable(Foldable,foldMap, sum) - import Data.Function(on) - import Data.List(sortBy) --import Data.Monoid(Monoid,mempty, mappend) -+import Data.Monoid(Monoid,mempty, mappend, (<>)) -+import Data.Semigroup - - - -- $usage -@@ -202,6 +203,9 @@ instance Monoid (Tree a) where - mappend x Empty = x - mappend x y = Branch x y - -+instance Semigroup (Tree a) where -+ (<>) = mappend -+ - makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a - makeTree _ [] = Empty - makeTree _ [x] = Leaf x -diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal -index dde3ccda..c401c6e6 100644 ---- a/xmonad-contrib.cabal -+++ b/xmonad-contrib.cabal -@@ -36,7 +36,7 @@ cabal-version: >= 1.6 - build-type: Simple - bug-reports: https://github.com/xmonad/xmonad-contrib/issues - --tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1 -+tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1 - - source-repository head - type: git -@@ -66,7 +66,8 @@ library - unix, - X11>=1.6.1 && < 1.9, - xmonad>=0.13 && < 0.14, -- utf8-string -+ utf8-string, -+ semigroups - - if flag(use_xft) - build-depends: X11-xft >= 0.2 diff --git a/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch b/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch deleted file mode 100644 index 8258a46b174..00000000000 --- a/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch +++ /dev/null @@ -1,106 +0,0 @@ -From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001 -From: Zheng Xu -Date: Fri, 02 Sep 2016 17:40:05 +0800 -Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits are clear. r=ehoogeveen - -There might be 48-bit VA on arm64 depending on kernel configuration. -Manually mmap heap memory to align with the assumption made by JS engine. - -Change-Id: Ic5d2b2fe4b758b3c87cc0688348af7e71a991146 ---- - -diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp -index 5b386a2..38101cf 100644 ---- a/js/src/gc/Memory.cpp -+++ b/js/src/gc/Memory.cpp -@@ -309,6 +309,75 @@ - #endif - } - -+static inline void * -+MapMemory(size_t length, int prot, int flags, int fd, off_t offset) -+{ -+#if defined(__ia64__) -+ /* -+ * The JS engine assumes that all allocated pointers have their high 17 bits clear, -+ * which ia64's mmap doesn't support directly. However, we can emulate it by passing -+ * mmap an "addr" parameter with those bits clear. The mmap will return that address, -+ * or the nearest available memory above that address, providing a near-guarantee -+ * that those bits are clear. If they are not, we return NULL below to indicate -+ * out-of-memory. -+ * -+ * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual -+ * address space. -+ * -+ * See Bug 589735 for more information. -+ */ -+ void *region = mmap((void*)0x0000070000000000, length, prot, flags, fd, offset); -+ if (region == MAP_FAILED) -+ return MAP_FAILED; -+ /* -+ * If the allocated memory doesn't have its upper 17 bits clear, consider it -+ * as out of memory. -+ */ -+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { -+ JS_ALWAYS_TRUE(0 == munmap(region, length)); -+ return MAP_FAILED; -+ } -+ return region; -+#elif defined(__aarch64__) -+ /* -+ * There might be similar virtual address issue on arm64 which depends on -+ * hardware and kernel configurations. But the work around is slightly -+ * different due to the different mmap behavior. -+ * -+ * TODO: Merge with the above code block if this implementation works for -+ * ia64 and sparc64. -+ */ -+ const uintptr_t start = (uintptr_t)(0x0000070000000000UL); -+ const uintptr_t end = (uintptr_t)(0x0000800000000000UL); -+ const uintptr_t step = ChunkSize; -+ /* -+ * Optimization options if there are too many retries in practice: -+ * 1. Examine /proc/self/maps to find an available address. This file is -+ * not always available, however. In addition, even if we examine -+ * /proc/self/maps, we may still need to retry several times due to -+ * racing with other threads. -+ * 2. Use a global/static variable with lock to track the addresses we have -+ * allocated or tried. -+ */ -+ uintptr_t hint; -+ void* region = MAP_FAILED; -+ for (hint = start; region == MAP_FAILED && hint + length <= end; hint += step) { -+ region = mmap((void*)hint, length, prot, flags, fd, offset); -+ if (region != MAP_FAILED) { -+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { -+ if (munmap(region, length)) { -+ MOZ_ASSERT(errno == ENOMEM); -+ } -+ region = MAP_FAILED; -+ } -+ } -+ } -+ return region == MAP_FAILED ? NULL : region; -+#else -+ return mmap(NULL, length, prot, flags, fd, offset); -+#endif -+} -+ - void * - MapAlignedPages(size_t size, size_t alignment) - { -@@ -322,12 +391,12 @@ - - /* Special case: If we want page alignment, no further work is needed. */ - if (alignment == PageSize) { -- return mmap(NULL, size, prot, flags, -1, 0); -+ return MapMemory(size, prot, flags, -1, 0); - } - - /* Overallocate and unmap the region's edges. */ - size_t reqSize = Min(size + 2 * alignment, 2 * size); -- void *region = mmap(NULL, reqSize, prot, flags, -1, 0); -+ void *region = MapMemory(reqSize, prot, flags, -1, 0); - if (region == MAP_FAILED) - return NULL; - diff --git a/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch b/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch deleted file mode 100644 index bf41ce0a8a2..00000000000 --- a/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru mozjs17.0.0-orig/mfbt/double-conversion/utils.h mozjs17.0.0/mfbt/double-conversion/utils.h ---- mozjs17.0.0-orig/mfbt/double-conversion/utils.h 2013-02-11 17:33:28.000000000 -0500 -+++ mozjs17.0.0/mfbt/double-conversion/utils.h 2016-12-03 20:39:07.915042988 -0500 -@@ -58,7 +58,8 @@ - defined(__mips__) || defined(__powerpc__) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ -- defined(_MIPS_ARCH_MIPS32R2) -+ defined(_MIPS_ARCH_MIPS32R2) || \ -+ defined(__AARCH64EL__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 0f3f1fce42b..41bb9ca9f11 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkgconfig }: stdenv.mkDerivation rec { - version = "2.1.1"; + version = "4.0.0"; name = "rtmidi-${version}"; src = fetchFromGitHub { owner = "thestk"; repo = "rtmidi"; rev = "${version}"; - sha256 = "11pl45lp8sq5xkpipwk622w508nw0qcxr03ibicqn1lsws0hva96"; + sha256 = "1g31p6a96djlbk9jh5r4pjly3x76lhccva9hrw6xzdma8dsjzgyq"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/c-ares/release.patch b/pkgs/development/libraries/c-ares/release.patch deleted file mode 100644 index e745648062a..00000000000 --- a/pkgs/development/libraries/c-ares/release.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -aur c-ares-cares-1_13_0/ares_version.h c-ares-1.13.0/ares_version.h ---- c-ares-cares-1_13_0/ares_version.h 2017-06-20 02:00:21.000000000 -0400 -+++ c-ares-1.13.0/ares_version.h 2017-06-20 02:03:54.000000000 -0400 -@@ -6,12 +6,12 @@ - #define ARES_COPYRIGHT "2004 - 2016 Daniel Stenberg, ." - - #define ARES_VERSION_MAJOR 1 --#define ARES_VERSION_MINOR 12 --#define ARES_VERSION_PATCH 1 -+#define ARES_VERSION_MINOR 13 -+#define ARES_VERSION_PATCH 0 - #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\ - (ARES_VERSION_MINOR<<8)|\ - (ARES_VERSION_PATCH)) --#define ARES_VERSION_STR "1.12.1-DEV" -+#define ARES_VERSION_STR "1.13.0" - - #if (ARES_VERSION >= 0x010700) - # define CARES_HAVE_ARES_LIBRARY_INIT 1 diff --git a/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch b/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch deleted file mode 100644 index 740bb746aad..00000000000 --- a/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c -index 1d33ce9..dface51 100644 ---- a/libavcodec/libvpxenc.c -+++ b/libavcodec/libvpxenc.c -@@ -78,19 +78,11 @@ typedef struct VP8EncoderContext { - - /** String mappings for enum vp8e_enc_control_id */ - static const char *ctlidstr[] = { -- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", -- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", -- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", -- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", -- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", -- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", - [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", - [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", - [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", -- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", - [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", - [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", -- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", - [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", - [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", - [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch b/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch deleted file mode 100644 index 7f1ec1df6c7..00000000000 --- a/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c -index 4f1adb8..1791952 100644 ---- a/libavcodec/libvpxenc.c -+++ b/libavcodec/libvpxenc.c -@@ -87,19 +87,11 @@ typedef struct VP8EncoderContext { - - /** String mappings for enum vp8e_enc_control_id */ - static const char *const ctlidstr[] = { -- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", -- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", -- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", -- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", -- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", -- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", - [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", - [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", - [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", -- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", - [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", - [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", -- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", - [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", - [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", - [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch b/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch deleted file mode 100644 index e3dfe4aabd6..00000000000 --- a/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 5676074..37a0d00 100644 ---- a/include/freetype/config/ftoption.h -+++ b/include/freetype/config/ftoption.h -@@ -856,7 +856,7 @@ FT_BEGIN_HEADER - /* If this option is activated, it can be controlled with the */ - /* `no-long-family-names' property of the pcf driver module. */ - /* */ --#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ - - - /*************************************************************************/ --- -cgit v1.0-41-gc330 \ No newline at end of file diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch deleted file mode 100644 index 9896e25acda..00000000000 --- a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -186,13 +186,8 @@ - gmodule_dep = dependency('gmodule-no-export-2.0') - gio_dep = dependency('gio-2.0') - --# On non-Windows/macOS systems we always required shared-mime-info and GIO --if host_system != 'windows' and host_system != 'darwin' -- shared_mime_dep = dependency('shared-mime-info') -- gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1) --else -- shared_mime_dep = [] --endif -+# No MIME sniffing for now -+shared_mime_dep = [] - - gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ] - diff --git a/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch b/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch deleted file mode 100644 index db010e62366..00000000000 --- a/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/nscd/nscd_stat.c -+++ b/nscd/nscd_stat.c -@@ -37,7 +37,7 @@ - - - /* We use this to make sure the receiver is the same. */ --static const char compilation[21] = __DATE__ " " __TIME__; -+static const char compilation[] = "@out@"; - - /* Statistic data for one database. */ - struct dbstat diff --git a/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch b/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch deleted file mode 100644 index 4abc2757cf6..00000000000 --- a/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in -index 928d19f..cbe9713 100644 (file) ---- a/lang/cpp/src/GpgmeppConfig.cmake.in.in -+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in -@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED) - - set_target_properties(Gpgmepp PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@" -- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@" -+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" - IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so" - ) diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index b9b6c3c7c24..0bb3b1f492d 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,44 +1,27 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, which, gnuplot , giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib }: stdenv.mkDerivation rec { name = "leptonica-${version}"; - version = "1.74.1"; + version = "1.78.0"; src = fetchurl { url = "http://www.leptonica.org/source/${name}.tar.gz"; - sha256 = "0qpcidvv6igybrrhj0m6j47g642c8sk1qn4dpj82mgd38xx52skl"; + sha256 = "122s9b8hi93va4lgwnwrbma50x5fp740npy0s92xybd2wy0jxvg2"; }; - patches = stdenv.lib.singleton (fetchpatch { - # configure: Support pkg-config - url = "https://github.com/DanBloomberg/leptonica/commit/" - + "4476d162cc191a0fefb2ce434153e12bbf188664.patch"; - sha256 = "1razzp2g49shfaravfqpxm3ivcd1r92lvqysll6nnf6d1wp9865s"; - }); - - postPatch = '' - # Remove the AC_SUBST() macros on *_LIBS, because the *_LIBS variables will - # be automatically set by PKG_CHECK_MODULES() since autotools 0.24 and - # using the ones that are set here in Leptonica's configure.ac do not - # include -L linker flags. - sed -i -e '/PKG_CHECK_MODULES/,/^ *\])/s/AC_SUBST([^)]*)//' configure.ac - - # The giflib package doesn't ship a pkg-config file, so we need to inject - # the linker search path. - substituteInPlace configure.ac --replace -lgif \ - ${stdenv.lib.escapeShellArg "'-L${giflib}/lib -lgif'"} - ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ]; + enableParallelBuilding = true; + + checkInputs = [ which gnuplot ]; + doCheck = true; meta = { description = "Image processing and analysis library"; homepage = http://www.leptonica.org/; - # Its own license: http://www.leptonica.org/about-the-license.html - license = stdenv.lib.licenses.free; + license = stdenv.lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch b/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch deleted file mode 100644 index 646b829496f..00000000000 --- a/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e19de4f0d4cb70e30017edfc6b4ca1b89ffbd381 Mon Sep 17 00:00:00 2001 -From: Franz Pletz -Date: Thu, 14 Jan 2016 14:58:23 +0100 -Subject: [PATCH] Disable SSLv3 - ---- - src/idevice.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/idevice.c b/src/idevice.c -index ce27495..8f03094 100644 ---- a/src/idevice.c -+++ b/src/idevice.c -@@ -678,7 +678,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne - } - BIO_set_fd(ssl_bio, (int)(long)connection->data, BIO_NOCLOSE); - -- SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv3_method()); -+ SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_method()); - if (ssl_ctx == NULL) { - debug_info("ERROR: Could not create SSL context."); - BIO_free(ssl_bio); --- -2.7.0 - diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index e947ec22bf8..9efeb0f678e 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "libosinfo-1.4.0"; + pname = "libosinfo"; + version = "1.5.0"; src = fetchurl { - url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; - sha256 = "0ra1p2rnnwkq0181ayn0l0rs1pvk4a0i8fa08nqjfmqs5fl637m2"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz"; + sha256 = "12b0xj9fz9q91d1pz9xm6aqap5k1ip0m9m3qvqmwjy1lk1kjasdz"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix index 2b8fc1fcc8f..cd841a9d8f8 100644 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo}: +{ stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }: stdenv.mkDerivation rec { - version = "2016-09-11"; - name = "libpointmatcher-${version}"; + pname = "libpointmatcher"; + version = "1.3.1"; src = fetchFromGitHub { owner = "ethz-asl"; - repo = "libpointmatcher"; - rev = "75044815d40ff934fe0bb7e05ed8bbf18c06493b"; - sha256 = "1s7ilvg3lhr1fq8sxw05ydmbd3kl46496jnyxprhnpgvpmvqsbzl"; + repo = pname; + rev = version; + sha256 = "0lai6sr3a9dj1j4pgjjyp7mx10wixy5wpvbka8nsc2danj6xhdyd"; }; - buildInputs = [cmake eigen boost libnabo]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen boost libnabo ]; enableParallelBuilding = true; @@ -19,11 +20,11 @@ stdenv.mkDerivation rec { -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 "; - checkPhase = '' - export LD_LIBRARY_PATH=$PWD - ./utest/utest --path ../examples/data/ - ''; doCheck = true; + checkPhase = '' + export LD_LIBRARY_PATH=$PWD + ./utest/utest --path ../examples/data/ + ''; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 11ed2eb0044..e694c353df0 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl, lib, cmake }: let @@ -11,7 +11,17 @@ let inherit sha256; }; - configureFlags = [ "--enable-nc" ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DENABLE_NC=ON" "-DBUILD_SHARED_LIBS=ON" ]; + + # The autoconf build is broken as of 2.9.1, resulting in the following error: + # libressl-2.9.1/tls/.libs/libtls.a', needed by 'handshake_table'. + # Fortunately LibreSSL provides a CMake build as well, so opt for CMake by + # removing ./configure pre-config. + preConfigure = '' + rm configure + ''; enableParallelBuilding = true; @@ -19,6 +29,8 @@ let postFixup = '' moveToOutput "bin/nc" "$nc" + moveToOutput "bin/openssl" "$bin" + moveToOutput "bin/ocspcheck" "$bin" moveToOutput "share/man/man1/nc.1${lib.optionalString (dontGzipMan==null) ".gz"}" "$nc" ''; @@ -46,7 +58,7 @@ in { }; libressl_2_9 = generic { - version = "2.9.0"; - sha256 = "1x1wl6b449m6hfhyxxzxbf2v8yfb5q92q6d01hdg28xp1222jpzb"; + version = "2.9.1"; + sha256 = "1y32iz64rqh74m1g641b39h3293dqi4la7i0ckai1p4lcs2xvr1r"; }; } diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index e0a6c6a5705..11c66f0d497 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, libGLU_combined, freeglut, glew, libXmu, libXext, libX11 - }: +, qmake, GLUT, fixDarwinDylibNames }: stdenv.mkDerivation rec { version = "1.4.2"; @@ -9,27 +9,42 @@ stdenv.mkDerivation rec { sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr"; }; - buildInputs = [libGLU_combined freeglut glew libXmu libXext libX11]; + nativeBuildInputs = [ qmake ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = [ glew ] + ++ stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut libXmu libXext libX11 ] + ++ stdenv.lib.optional stdenv.isDarwin GLUT; doCheck = false; + patches = [ ./fix-pro-files.patch ]; + preConfigure = '' - sed -i 's/^\(LIBS *=.*\)$/\1 -lX11/' example/Makefile + rm example/Makefile src/Makefile + qmakeFlags="$qmakeFlags INSTALLDIR=$out" ''; - installPhase = '' - mkdir -pv "$out/"{bin,share/doc/opencsg} + postInstall = '' + install -D license.txt "$out/share/doc/opencsg/license.txt" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/*.app $out/Applications + rmdir $out/bin || true + ''; - cp example/opencsgexample "$out/bin" - cp -r include lib "$out" - - cp license.txt "$out/share/doc/opencsg" + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample + install_name_tool -change \ + $(otool -L $app | awk '/opencsg.+dylib/ { print $1 }') \ + $(otool -D $out/lib/libopencsg.dylib | tail -n 1) \ + $app ''; meta = with stdenv.lib; { description = "Constructive Solid Geometry library"; homepage = http://www.opencsg.org/; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/opencsg/fix-pro-files.patch b/pkgs/development/libraries/opencsg/fix-pro-files.patch new file mode 100644 index 00000000000..462b44c8f40 --- /dev/null +++ b/pkgs/development/libraries/opencsg/fix-pro-files.patch @@ -0,0 +1,21 @@ +diff -ur OpenCSG-1.4.2-pristine/example/example.pro OpenCSG-1.4.2/example/example.pro +--- OpenCSG-1.4.2-pristine/example/example.pro 2016-09-27 06:11:16.000000000 +0900 ++++ OpenCSG-1.4.2/example/example.pro 2019-05-07 10:45:18.785251737 +0900 +@@ -6,7 +6,9 @@ + INCLUDEPATH += ../include + LIBS += -L../lib -lopencsg -lGLEW + +-INSTALLDIR = /usr/local ++isEmpty(INSTALLDIR) { ++ INSTALLDIR = /usr/local ++} + INSTALLS += target + target.path = $$INSTALLDIR/bin + +diff -ur OpenCSG-1.4.2-pristine/opencsg.pro OpenCSG-1.4.2/opencsg.pro +--- OpenCSG-1.4.2-pristine/opencsg.pro 2016-09-27 06:11:16.000000000 +0900 ++++ OpenCSG-1.4.2/opencsg.pro 2019-05-07 10:44:50.578698165 +0900 +@@ -1,2 +1,3 @@ + TEMPLATE = subdirs + SUBDIRS = src example ++CONFIG += ordered diff --git a/pkgs/development/libraries/physics/rivet/key_val.patch b/pkgs/development/libraries/physics/rivet/key_val.patch deleted file mode 100644 index 0b24d703dac..00000000000 --- a/pkgs/development/libraries/physics/rivet/key_val.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/bin/rivet-cmphistos b/bin/rivet-cmphistos ---- a/bin/rivet-cmphistos -+++ b/bin/rivet-cmphistos -@@ -371,7 +371,7 @@ if __name__ == '__main__': - # plot[key] = val - if plotoptions.has_key("PLOT"): - for key_val in plotoptions["PLOT"]: -- key, val = [s.strip() for s in key_val.split("=")] -+ key, val = [s.strip() for s in key_val.split("=", 1)] - plot[key] = val - if opts.LINEAR: - plot['LogY'] = '0' diff --git a/pkgs/development/libraries/physics/rivet/zaxis_fix.patch b/pkgs/development/libraries/physics/rivet/zaxis_fix.patch deleted file mode 100644 index c255db565e6..00000000000 --- a/pkgs/development/libraries/physics/rivet/zaxis_fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/bin/make-plots b/bin/make-plots -index abb024d..f59293d 100755 ---- a/bin/make-plots -+++ b/bin/make-plots -@@ -1152,8 +1152,8 @@ class ColorScale(Described): - - zcustommajortickmarks = int(self.description.get('ZMajorTickMarks', -1)) - zcustomminortickmarks = int(self.description.get('ZMinorTickMarks', -1)) -- zcustommajorticks=[] -- zcustomminorticks=[] -+ zcustommajorticks=None -+ zcustomminorticks=None - if self.description.has_key('ZCustomMajorTicks') and self.description['ZCustomMajorTicks']!='': - # TODO: Would be nice to have less invisible separation of the custom ticks than split on tabs - ticks = self.description['ZCustomMajorTicks'].strip().split('\t') -@@ -2214,7 +2214,7 @@ class Ticks(object): - - class XTicks(Ticks): - -- def draw(self, custommajorticks=[], customminorticks=[], custommajortickmarks=-1, customminortickmarks=-1,drawlabels=True): -+ def draw(self, custommajorticks=None, customminorticks=None, custommajortickmarks=-1, customminortickmarks=-1,drawlabels=True): - twosided = bool(int(self.description.get('XTwosidedTicks', '0'))) - out = "" - out += ('\n%\n% X-Ticks\n%\n') -@@ -2265,7 +2265,7 @@ class XTicks(Ticks): - - class YTicks(Ticks): - -- def draw(self, custommajorticks=[], customminorticks=[], custommajortickmarks=-1, customminortickmarks=-1, drawlabels=True): -+ def draw(self, custommajorticks=None, customminorticks=None, custommajortickmarks=-1, customminortickmarks=-1, drawlabels=True): - twosided = bool(int(self.description.get('YTwosidedTicks', '0'))) - out = "" - out += ('\n%\n% Y-Ticks\n%\n') -@@ -2320,7 +2320,7 @@ class ZTicks(Ticks): - self.description = description - self.coors = coors - -- def draw(self, custommajorticks=[], customminorticks=[], -+ def draw(self, custommajorticks=None, customminorticks=None, - custommajortickmarks=-1, customminortickmarks=-1, - drawlabels=True): - out = "" diff --git a/pkgs/development/libraries/v8/build-standalone-static-library.patch b/pkgs/development/libraries/v8/build-standalone-static-library.patch deleted file mode 100644 index 994c322429d..00000000000 --- a/pkgs/development/libraries/v8/build-standalone-static-library.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/build/standalone.gypi b/build/standalone.gypi -index b6519c4..ef9e7c5 100644 ---- a/build/standalone.gypi -+++ b/build/standalone.gypi -@@ -373,6 +373,9 @@ - }], - ], - 'target_conditions': [ -+ ['_type=="static_library"', { -+ 'standalone_static_library': 1, -+ }], - ['v8_code == 0', { - 'defines!': [ - 'DEBUG', diff --git a/pkgs/development/libraries/v8/disable-building-tests.patch b/pkgs/development/libraries/v8/disable-building-tests.patch deleted file mode 100644 index 1854a9b7e56..00000000000 --- a/pkgs/development/libraries/v8/disable-building-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/Makefile b/Makefile -index 9761265..80169b2 100644 ---- a/Makefile -+++ b/Makefile -@@ -248,8 +248,6 @@ NACL_ARCHES = nacl_ia32 nacl_x64 - GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \ - build/shim_headers.gypi build/features.gypi build/standalone.gypi \ - build/toolchain.gypi build/all.gyp build/mac/asan.gyp \ -- test/cctest/cctest.gyp \ -- test/unittests/unittests.gyp tools/gyp/v8.gyp \ - tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \ - buildtools/third_party/libc++abi/libc++abi.gyp \ - buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \ -diff --git a/build/all.gyp b/build/all.gyp -index 4aeb507..1ff2c7a 100644 ---- a/build/all.gyp -+++ b/build/all.gyp -@@ -10,8 +10,6 @@ - 'dependencies': [ - '../samples/samples.gyp:*', - '../src/d8.gyp:d8', -- '../test/cctest/cctest.gyp:*', -- '../test/unittests/unittests.gyp:*', - ], - 'conditions': [ - ['component!="shared_library"', { - diff --git a/pkgs/development/libraries/v8/fPIC-for-static.patch b/pkgs/development/libraries/v8/fPIC-for-static.patch deleted file mode 100644 index 39564772af8..00000000000 --- a/pkgs/development/libraries/v8/fPIC-for-static.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/standalone.gypi b/build/standalone.gypi -index 7670e5b..230518c 100644 ---- a/build/standalone.gypi -+++ b/build/standalone.gypi -@@ -205,7 +205,7 @@ - [ 'visibility=="hidden" and v8_enable_backtrace==0', { - 'cflags': [ '-fvisibility=hidden' ], - }], -- [ 'component=="shared_library"', { -+ [ 'component=="shared_library" or component=="static_library" and (v8_target_arch=="x64" or v8_target_arch=="arm64")', { - 'cflags': [ '-fPIC', ], - }], - ], diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c8fc051f7a9..a1f7a2096e5 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1,7 +1,7 @@ /* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT! Regenerate it with: -nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix +nixpkgs$ ./maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix These packages are manually refined in lua-overrides.nix */ @@ -15,16 +15,16 @@ ansicolors = buildLuarocksPackage { version = "1.0.2-3"; src = fetchurl { - url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; - sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; + url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; + sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/kikito/ansicolors.lua"; - description="Library for color Manipulation."; + description = "Library for color Manipulation."; license = { fullName = "MIT "; }; @@ -35,16 +35,16 @@ argparse = buildLuarocksPackage { version = "0.6.0-1"; src = fetchurl { - url = https://luarocks.org/argparse-0.6.0-1.src.rock; - sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; + url = https://luarocks.org/argparse-0.6.0-1.src.rock; + sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; }; - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/argparse"; - description="A feature-rich command-line argument parser"; + description = "A feature-rich command-line argument parser"; license = { fullName = "MIT"; }; @@ -52,19 +52,25 @@ argparse = buildLuarocksPackage { }; basexx = buildLuarocksPackage { pname = "basexx"; - version = "0.4.0-1"; + version = "0.4.1-1"; + + knownRockspec = (fetchurl { + url = https://luarocks.org/basexx-0.4.1-1.rockspec; + sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; + }).outPath; src = fetchurl { - url = https://luarocks.org/basexx-0.4.0-1.src.rock; - sha256 = "1px8yrxg1qkk3kzdqj3siry742jdv4ysp2dmicxi15mkynqpjlzz"; + url = https://github.com/aiq/basexx/archive/v0.4.1.tar.gz; + sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/aiq/basexx"; - description="A base2, base16, base32, base64 and base85 library for Lua"; + description = "A base2, base16, base32, base64 and base85 library for Lua"; license = { fullName = "MIT"; }; @@ -75,16 +81,16 @@ dkjson = buildLuarocksPackage { version = "2.5-2"; src = fetchurl { - url = https://luarocks.org/dkjson-2.5-2.src.rock; - sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; + url = https://luarocks.org/dkjson-2.5-2.src.rock; + sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; }; - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; - description="David Kolf's JSON module for Lua"; + description = "David Kolf's JSON module for Lua"; license = { fullName = "MIT/X11"; }; @@ -95,16 +101,16 @@ fifo = buildLuarocksPackage { version = "0.2-0"; src = fetchurl { - url = https://luarocks.org/fifo-0.2-0.src.rock; - sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; + url = https://luarocks.org/fifo-0.2-0.src.rock; + sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; }; - - propagatedBuildInputs = [ lua ]; + + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/daurnimator/fifo.lua"; - description="A lua library/'class' that implements a FIFO"; + description = "A lua library/'class' that implements a FIFO"; license = { fullName = "MIT/X11"; }; @@ -115,36 +121,61 @@ inspect = buildLuarocksPackage { version = "3.1.1-0"; src = fetchurl { - url = https://luarocks.org/inspect-3.1.1-0.src.rock; - sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; + url = https://luarocks.org/inspect-3.1.1-0.src.rock; + sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/kikito/inspect.lua"; - description="Lua table visualizer, ideal for debugging"; + description = "Lua table visualizer, ideal for debugging"; license = { fullName = "MIT "; }; }; }; +ldoc = buildLuarocksPackage { + pname = "ldoc"; + version = "1.4.6-2"; + + knownRockspec = (fetchurl { + url = https://luarocks.org/ldoc-1.4.6-2.rockspec; + sha256 = "14yb0qihizby8ja0fa82vx72vk903mv6m7izn39mzfrgb8mha0pm"; + }).outPath; + + src = fetchurl { + url = http://stevedonovan.github.io/files/ldoc-1.4.6.zip; + sha256 = "1fvsmmjwk996ypzizcy565hj82bhj17vdb83ln6ff63mxr3zs1la"; + }; + + propagatedBuildInputs = [ penlight markdown ]; + buildType = "builtin"; + + meta = { + homepage = "http://stevedonovan.github.com/ldoc"; + description = "A Lua Documentation Tool"; + license = { + fullName = "MIT/X11"; + }; + }; +}; lgi = buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; src = fetchurl { - url = https://luarocks.org/lgi-0.9.2-1.src.rock; - sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; + url = https://luarocks.org/lgi-0.9.2-1.src.rock; + sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "make"; meta = { - homepage = "https://github.com/pavouk/lgi"; - description="Lua bindings to GObject libraries"; + homepage = "http://github.com/pavouk/lgi"; + description = "Lua bindings to GObject libraries"; license = { fullName = "MIT/X11"; }; @@ -155,16 +186,16 @@ lpeg_patterns = buildLuarocksPackage { version = "0.5-0"; src = fetchurl { - url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; - sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; + url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; + sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; }; - - propagatedBuildInputs = [ lua lpeg ]; + + propagatedBuildInputs = [ lua lpeg ]; buildType = "builtin"; meta = { homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; - description="a collection of LPEG patterns"; + description = "a collection of LPEG patterns"; license = { fullName = "MIT"; }; @@ -175,16 +206,16 @@ lpty = buildLuarocksPackage { version = "1.2.2-1"; src = fetchurl { - url = https://luarocks.org/lpty-1.2.2-1.src.rock; - sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; + url = https://luarocks.org/lpty-1.2.2-1.src.rock; + sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "make"; meta = { homepage = "http://www.tset.de/lpty/"; - description="A simple facility for lua to control other programs via PTYs."; + description = "A simple facility for lua to control other programs via PTYs."; license = { fullName = "MIT"; }; @@ -195,16 +226,16 @@ lrexlib-gnu = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock; - sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; + url = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock; + sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { - homepage = "https://github.com/rrthomas/lrexlib"; - description="Regular expression library binding (GNU flavour)."; + homepage = "http://github.com/rrthomas/lrexlib"; + description = "Regular expression library binding (GNU flavour)."; license = { fullName = "MIT/X11"; }; @@ -215,16 +246,16 @@ lrexlib-posix = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock; - sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; + url = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock; + sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { - homepage = "https://github.com/rrthomas/lrexlib"; - description="Regular expression library binding (POSIX flavour)."; + homepage = "http://github.com/rrthomas/lrexlib"; + description = "Regular expression library binding (POSIX flavour)."; license = { fullName = "MIT/X11"; }; @@ -235,16 +266,16 @@ ltermbox = buildLuarocksPackage { version = "0.2-1"; src = fetchurl { - url = https://luarocks.org/ltermbox-0.2-1.src.rock; - sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; + url = https://luarocks.org/ltermbox-0.2-1.src.rock; + sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://code.google.com/p/termbox"; - description="A termbox library package"; + description = "A termbox library package"; license = { fullName = "New BSD License"; }; @@ -254,27 +285,26 @@ lua-cmsgpack = buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; - knownRockspec = (fetchurl { - url = https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec; - sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; + knownRockspec = (fetchurl { + url = https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec; + sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/antirez/lua-cmsgpack.git", - "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", - "date": "2018-06-14T11:56:56+02:00", - "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", - "fetchSubmodules": true -} - '') ["date"]) ; - - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/antirez/lua-cmsgpack.git", + "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", + "date": "2018-06-14T11:56:56+02:00", + "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", + "fetchSubmodules": true + } '') ["date"]) ; + + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { - homepage = "https://github.com/antirez/lua-cmsgpack"; - description="MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; + homepage = "http://github.com/antirez/lua-cmsgpack"; + description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; license = { fullName = "Two-clause BSD"; }; @@ -285,16 +315,16 @@ lua_cliargs = buildLuarocksPackage { version = "3.0-2"; src = fetchurl { - url = https://luarocks.org/lua_cliargs-3.0-2.src.rock; - sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; + url = https://luarocks.org/lua_cliargs-3.0-2.src.rock; + sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/amireh/lua_cliargs"; - description="A command-line argument parser."; + description = "A command-line argument parser."; license = { fullName = "MIT "; }; @@ -305,16 +335,16 @@ lua-iconv = buildLuarocksPackage { version = "7-3"; src = fetchurl { - url = https://luarocks.org/lua-iconv-7-3.src.rock; - sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; + url = https://luarocks.org/lua-iconv-7-3.src.rock; + sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://ittner.github.com/lua-iconv/"; - description="Lua binding to the iconv"; + description = "Lua binding to the iconv"; license = { fullName = "MIT/X11"; }; @@ -344,23 +374,21 @@ lua-term = buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; - knownRockspec = (fetchurl { - url = https://luarocks.org/lua-term-0.7-1.rockspec; - sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; + knownRockspec = (fetchurl { + url = https://luarocks.org/lua-term-0.7-1.rockspec; + sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; }).outPath; - src = fetchurl { - url = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz; - sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; + src = fetchurl { + url = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz; + sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; }; - - - + buildType = "builtin"; meta = { homepage = "https://github.com/hoelzro/lua-term"; - description="Terminal functions for Lua"; + description = "Terminal functions for Lua"; license = { fullName = "MIT/X11"; }; @@ -390,27 +418,26 @@ luabitop = buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; - knownRockspec = (fetchurl { - url = https://luarocks.org/luabitop-1.0.2-3.rockspec; - sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; + knownRockspec = (fetchurl { + url = https://luarocks.org/luabitop-1.0.2-3.rockspec; + sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/LuaDist/luabitop.git", - "rev": "81bb23b0e737805442033535de8e6d204d0e5381", - "date": "2013-02-18T16:36:42+01:00", - "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", - "fetchSubmodules": true -} - '') ["date"]) ; - - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.3"); - propagatedBuildInputs = [ lua ]; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/LuaDist/luabitop.git", + "rev": "81bb23b0e737805442033535de8e6d204d0e5381", + "date": "2013-02-18T16:36:42+01:00", + "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", + "fetchSubmodules": true + } '') ["date"]) ; + + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.3" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://bitop.luajit.org/"; - description="Lua Bit Operations Module"; + description = "Lua Bit Operations Module"; license = { fullName = "MIT/X license"; }; @@ -421,16 +448,16 @@ luaevent = buildLuarocksPackage { version = "0.4.6-1"; src = fetchurl { - url = https://luarocks.org/luaevent-0.4.6-1.src.rock; - sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; + url = https://luarocks.org/luaevent-0.4.6-1.src.rock; + sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/harningt/luaevent"; - description="libevent binding for Lua"; + description = "libevent binding for Lua"; license = { fullName = "MIT"; }; @@ -441,16 +468,16 @@ luacheck = buildLuarocksPackage { version = "0.23.0-1"; src = fetchurl { - url = https://luarocks.org/luacheck-0.23.0-1.src.rock; - sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; + url = https://luarocks.org/luacheck-0.23.0-1.src.rock; + sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; }; - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [ lua argparse luafilesystem ]; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua argparse luafilesystem ]; buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/luacheck"; - description="A static analyzer and a linter for Lua"; + description = "A static analyzer and a linter for Lua"; license = { fullName = "MIT"; }; @@ -461,16 +488,16 @@ luaffi = buildLuarocksPackage { version = "scm-1"; src = fetchurl { - url = http://luarocks.org/dev/luaffi-scm-1.src.rock; - sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; + url = http://luarocks.org/dev/luaffi-scm-1.src.rock; + sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/facebook/luaffifb"; - description="FFI library for calling C functions from lua"; + description = "FFI library for calling C functions from lua"; license = { fullName = "BSD"; }; @@ -481,42 +508,61 @@ luuid = buildLuarocksPackage { version = "20120509-2"; src = fetchurl { - url = https://luarocks.org/luuid-20120509-2.src.rock; - sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; + url = https://luarocks.org/luuid-20120509-2.src.rock; + sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; }; - disabled = ( luaOlder "5.2") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.2" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; - description="A library for UUID generation"; + description = "A library for UUID generation"; license = { fullName = "Public domain"; }; }; }; +markdown = buildLuarocksPackage { + pname = "markdown"; + version = "0.33-1"; + + src = fetchurl { + url = https://luarocks.org/markdown-0.33-1.src.rock; + sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y"; + }; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; + + meta = { + homepage = "https://github.com/mpeterv/markdown"; + description = "Markdown text-to-html markup system."; + license = { + fullName = "MIT/X11"; + }; + }; +}; penlight = buildLuarocksPackage { pname = "penlight"; version = "1.5.4-1"; - knownRockspec = (fetchurl { - url = https://luarocks.org/penlight-1.5.4-1.rockspec; - sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p"; + knownRockspec = (fetchurl { + url = https://luarocks.org/penlight-1.5.4-1.rockspec; + sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p"; }).outPath; - src = fetchurl { - url = http://stevedonovan.github.io/files/penlight-1.5.4.zip; - sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; + src = fetchurl { + url = http://stevedonovan.github.io/files/penlight-1.5.4.zip; + sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; }; - - - propagatedBuildInputs = [ luafilesystem ]; + + propagatedBuildInputs = [ luafilesystem ]; buildType = "builtin"; meta = { homepage = "http://stevedonovan.github.com/Penlight"; - description="Lua utility libraries loosely based on the Python standard libraries"; + description = "Lua utility libraries loosely based on the Python standard libraries"; license = { fullName = "MIT/X11"; }; @@ -546,23 +592,23 @@ say = buildLuarocksPackage { pname = "say"; version = "1.3-1"; - knownRockspec = (fetchurl { - url = https://luarocks.org/say-1.3-1.rockspec; - sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; + knownRockspec = (fetchurl { + url = https://luarocks.org/say-1.3-1.rockspec; + sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; }).outPath; - src = fetchurl { - url = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz; - sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; + src = fetchurl { + url = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz; + sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; }; - - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; - description="Lua String Hashing/Indexing Library"; + description = "Lua String Hashing/Indexing Library"; license = { fullName = "MIT "; }; @@ -573,16 +619,16 @@ std__debug = buildLuarocksPackage { version = "1.0.1-1"; src = fetchurl { - url = https://luarocks.org/std._debug-1.0.1-1.src.rock; - sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; + url = https://luarocks.org/std._debug-1.0.1-1.src.rock; + sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; }; - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.5" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://lua-stdlib.github.io/_debug"; - description="Debug Hints Library"; + description = "Debug Hints Library"; license = { fullName = "MIT/X11"; }; @@ -593,16 +639,16 @@ std_normalize = buildLuarocksPackage { version = "2.0.2-1"; src = fetchurl { - url = https://luarocks.org/std.normalize-2.0.2-1.src.rock; - sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh"; + url = https://luarocks.org/std.normalize-2.0.2-1.src.rock; + sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh"; }; - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [ lua std__debug ]; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua std__debug ]; buildType = "builtin"; meta = { homepage = "https://lua-stdlib.github.io/normalize"; - description="Normalized Lua Functions"; + description = "Normalized Lua Functions"; license = { fullName = "MIT/X11"; }; @@ -610,19 +656,19 @@ std_normalize = buildLuarocksPackage { }; luv = buildLuarocksPackage { pname = "luv"; - version = "1.26.0-0"; + version = "1.27.0-0"; src = fetchurl { - url = https://luarocks.org/luv-1.26.0-0.src.rock; - sha256 = "005yzcxlribnc45qr1g7q4psakximb9fbz07k6yzy1d94mhcxxr7"; + url = https://luarocks.org/luv-1.27.0-0.src.rock; + sha256 = "16csnnypi2m71ncr8qwc9drqbrb40l5li1nk7zpsxnslg5fiax6x"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "cmake"; meta = { homepage = "https://github.com/luvit/luv"; - description="Bare libuv bindings for lua"; + description = "Bare libuv bindings for lua"; license = { fullName = "Apache 2.0"; }; @@ -633,16 +679,16 @@ luasystem = buildLuarocksPackage { version = "0.2.1-0"; src = fetchurl { - url = https://luarocks.org/luasystem-0.2.1-0.src.rock; - sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; + url = https://luarocks.org/luasystem-0.2.1-0.src.rock; + sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/luasystem/"; - description="Platform independent system calls for Lua."; + description = "Platform independent system calls for Lua."; license = { fullName = "MIT "; }; @@ -653,16 +699,16 @@ mediator_lua = buildLuarocksPackage { version = "1.1.2-0"; src = fetchurl { - url = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock; - sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if"; + url = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock; + sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/mediator_lua/"; - description="Event handling through channels"; + description = "Event handling through channels"; license = { fullName = "MIT "; }; @@ -673,16 +719,15 @@ mpack = buildLuarocksPackage { version = "1.0.7-0"; src = fetchurl { - url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; - sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; + url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; + sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; }; - - + buildType = "builtin"; meta = { homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; - description="Lua binding to libmpack"; + description = "Lua binding to libmpack"; license = { fullName = "MIT"; }; @@ -693,16 +738,16 @@ nvim-client = buildLuarocksPackage { version = "0.1.0-1"; src = fetchurl { - url = https://luarocks.org/nvim-client-0.1.0-1.src.rock; - sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma"; + url = https://luarocks.org/nvim-client-0.1.0-1.src.rock; + sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua mpack luv coxpcall ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua mpack luv coxpcall ]; buildType = "builtin"; meta = { homepage = "https://github.com/neovim/lua-client/archive/0.1.0-1.tar.gz"; - description="Lua client to Nvim"; + description = "Lua client to Nvim"; license = { fullName = "Apache"; }; @@ -712,23 +757,23 @@ busted = buildLuarocksPackage { pname = "busted"; version = "2.0.rc13-0"; - knownRockspec = (fetchurl { - url = https://luarocks.org/busted-2.0.rc13-0.rockspec; - sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; + knownRockspec = (fetchurl { + url = https://luarocks.org/busted-2.0.rc13-0.rockspec; + sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; }).outPath; - src = fetchurl { - url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; - sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; + src = fetchurl { + url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; + sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; }; - - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; + + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; - description="Elegant Lua unit testing."; + description = "Elegant Lua unit testing."; license = { fullName = "MIT "; }; @@ -738,23 +783,23 @@ luassert = buildLuarocksPackage { pname = "luassert"; version = "1.7.11-0"; - knownRockspec = (fetchurl { - url = https://luarocks.org/luassert-1.7.11-0.rockspec; - sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s"; + knownRockspec = (fetchurl { + url = https://luarocks.org/luassert-1.7.11-0.rockspec; + sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s"; }).outPath; - src = fetchurl { - url = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz; - sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; + src = fetchurl { + url = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz; + sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; }; - - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua say ]; + + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua say ]; buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; - description="Lua Assertions Extension"; + description = "Lua Assertions Extension"; license = { fullName = "MIT "; }; @@ -765,16 +810,15 @@ coxpcall = buildLuarocksPackage { version = "1.17.0-1"; src = fetchurl { - url = https://luarocks.org/manifests/hisham/coxpcall-1.17.0-1.src.rock; - sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; + url = https://luarocks.org/manifests/hisham/coxpcall-1.17.0-1.src.rock; + sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; }; - - + buildType = "builtin"; meta = { homepage = "http://keplerproject.github.io/coxpcall"; - description="Coroutine safe xpcall and pcall"; + description = "Coroutine safe xpcall and pcall"; license = { fullName = "MIT/X11"; }; diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index d969115c3b6..383ab5b860a 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -2,6 +2,7 @@ "@angular/cli" , "asar" , "azure-functions-core-tools" +, "bash-language-server" , "bower" , "bower2nix" , "browserify" @@ -105,22 +106,40 @@ , "smartdc" , "snyk" , "socket.io" +, "speed-test" , "stackdriver-statsd-backend" , "svgo" , "swagger" , { "tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7" } , "tern" , "textlint" +, "textlint-plugin-latex" +, "textlint-rule-abbr-within-parentheses" +, "textlint-rule-alex" +, "textlint-rule-common-misspellings" +, "textlint-rule-diacritics" +, "textlint-rule-en-max-word-count" +, "textlint-rule-max-comma" +, "textlint-rule-no-start-duplicated-conjunction" +, "textlint-rule-period-in-list-item" +, "textlint-rule-stop-words" +, "textlint-rule-terminology" +, "textlint-rule-unexpanded-acronym" +, "textlint-rule-write-good" , "three" , "tiddlywiki" , "triton" , "tsun" , "ttf2eot" , "typescript" +, "typescript-language-server" , "uglify-js" , "ungit" +, "vscode-css-languageserver-bin" +, "vscode-html-languageserver-bin" , "vue-cli" , "@vue/cli" +, "vue-language-server" , "@webassemblyjs/cli" , "@webassemblyjs/repl" , "@webassemblyjs/wasm-strip" @@ -131,6 +150,7 @@ , "webtorrent-cli" , "web-ext" , "wring" +, "write-good" , "yarn" , "yo" ] diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 797ea9b22e5..bc420106945 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,40 +13,40 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.13.8" = { + "@angular-devkit/architect-0.13.9" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.13.8"; + version = "0.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.8.tgz"; - sha512 = "gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.9.tgz"; + sha512 = "EAFtCs9dsGhpMRC45PoYsrkiExpWz9Ax15qXfzwdDRacz5DmdOVt+QpkLW1beUOwiyj/bhFyj23eaONK2RTn/w=="; }; }; - "@angular-devkit/core-7.3.8" = { + "@angular-devkit/core-7.3.9" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "7.3.8"; + version = "7.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.8.tgz"; - sha512 = "3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.9.tgz"; + sha512 = "SaxD+nKFW3iCBKsxNR7+66J30EexW/y7tm8m5AvUH+GwSAgIj0ZYmRUzFEPggcaLVA4WnE/YWqIXZMJW5dT7gw=="; }; }; - "@angular-devkit/schematics-7.3.8" = { + "@angular-devkit/schematics-7.3.9" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "7.3.8"; + version = "7.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.8.tgz"; - sha512 = "mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.9.tgz"; + sha512 = "xzROGCYp7aQbeJ3V6YC0MND7wKEAdWqmm/GaCufEk0dDS8ZGe0sQhcM2oBRa2nQqGQNeThFIH51kx+FayrJP0w=="; }; }; - "@apollographql/apollo-tools-0.3.5" = { + "@apollographql/apollo-tools-0.3.6" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.3.5.tgz"; - sha512 = "5ySiiNT2EIwxGKWyoAOnibCPUXvbxKOVxiPMK4uIXmvF+qbGNleQWP+vekciiAmCCESPmGd5szscRwDm4G/NNg=="; + url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.3.6.tgz"; + sha512 = "j59jXpFACU1WY5+O2T7qg5OgIPIiOoynO+UlOsDWiazmqc1dOe597VlIraj1w+XClYrerx6NhhLY2yHXECYFVA=="; }; }; "@apollographql/graphql-playground-html-1.6.6" = { @@ -94,13 +94,13 @@ let sha512 = "jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA=="; }; }; - "@babel/core-7.4.3" = { + "@babel/core-7.4.4" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.4.3.tgz"; - sha512 = "oDpASqKFlbspQfzAE7yaeTmdljSH2ADIvBlb0RwbStltTuWa0+7CCI1fYVINNv9saHPa1W7oaKeuNuKj+RQCvA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.4.4.tgz"; + sha512 = "lQgGX3FPRgbz2SKmhMtYgJvVzGZrmjaF4apZ2bLwofAKiSjxU0drPh4S/VasyYXwaTs+A1gvQ45BN8SQJzHsQQ=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -121,13 +121,13 @@ let sha512 = "8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg=="; }; }; - "@babel/generator-7.4.0" = { + "@babel/generator-7.4.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz"; - sha512 = "/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz"; + sha512 = "53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ=="; }; }; "@babel/helper-annotate-as-pure-7.0.0" = { @@ -157,31 +157,31 @@ let sha512 = "MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw=="; }; }; - "@babel/helper-call-delegate-7.4.0" = { + "@babel/helper-call-delegate-7.4.4" = { name = "_at_babel_slash_helper-call-delegate"; packageName = "@babel/helper-call-delegate"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.0.tgz"; - sha512 = "SdqDfbVdNQCBp3WhK2mNdDvHd3BD6qbmIc43CAyjnsfCmgHMeqgDcM3BzY2lchi7HBJGJ2CVdynLWbezaE4mmQ=="; + url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz"; + sha512 = "l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.4.3" = { + "@babel/helper-create-class-features-plugin-7.4.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.3.tgz"; - sha512 = "UMl3TSpX11PuODYdWGrUeW6zFkdYhDn7wRLrOuNVM6f9L+S9CzmDXYyrp3MTHcwWjnzur1f/Op8A7iYZWya2Yg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz"; + sha512 = "UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA=="; }; }; - "@babel/helper-define-map-7.4.0" = { + "@babel/helper-define-map-7.4.4" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.0.tgz"; - sha512 = "wAhQ9HdnLIywERVcSvX40CEJwKdAa1ID4neI9NXQPDOHwwA+57DqwLiPEVy2AIyWzAk0CQ8qx4awO0VUURwLtA=="; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz"; + sha512 = "IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg=="; }; }; "@babel/helper-explode-assignable-expression-7.1.0" = { @@ -211,13 +211,13 @@ let sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ=="; }; }; - "@babel/helper-hoist-variables-7.4.0" = { + "@babel/helper-hoist-variables-7.4.4" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.0.tgz"; - sha512 = "/NErCuoe/et17IlAQFKWM24qtyYYie7sFIrW/tIQXpck6vAu2hhtYYsKLBWQV+BQZMbcIYPU/QMYuTufrY4aQw=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz"; + sha512 = "VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w=="; }; }; "@babel/helper-member-expression-to-functions-7.0.0" = { @@ -238,13 +238,13 @@ let sha512 = "aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A=="; }; }; - "@babel/helper-module-transforms-7.4.3" = { + "@babel/helper-module-transforms-7.4.4" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.3.tgz"; - sha512 = "H88T9IySZW25anu5uqyaC1DaQre7ofM+joZtAaO2F8NBdFfupH0SZ4gKjgSFVcvtx/aAirqA9L9Clio2heYbZA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz"; + sha512 = "3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w=="; }; }; "@babel/helper-optimise-call-expression-7.0.0" = { @@ -265,13 +265,13 @@ let sha512 = "CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="; }; }; - "@babel/helper-regex-7.4.3" = { + "@babel/helper-regex-7.4.4" = { name = "_at_babel_slash_helper-regex"; packageName = "@babel/helper-regex"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.3.tgz"; - sha512 = "hnoq5u96pLCfgjXuj8ZLX3QQ+6nAulS+zSgi6HulUwFbEruRAKwbGLU5OvXkE14L8XW6XsQEKsIDfgthKLRAyA=="; + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.4.tgz"; + sha512 = "Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q=="; }; }; "@babel/helper-remap-async-to-generator-7.1.0" = { @@ -283,13 +283,13 @@ let sha512 = "3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg=="; }; }; - "@babel/helper-replace-supers-7.4.0" = { + "@babel/helper-replace-supers-7.4.4" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.0.tgz"; - sha512 = "PVwCVnWWAgnal+kJ+ZSAphzyl58XrFeSKSAJRiqg5QToTsjL+Xu1f9+RJ+d+Q0aPhPfBGaYfkox66k86thxNSg=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz"; + sha512 = "04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg=="; }; }; "@babel/helper-simple-access-7.1.0" = { @@ -301,13 +301,13 @@ let sha512 = "Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w=="; }; }; - "@babel/helper-split-export-declaration-7.4.0" = { + "@babel/helper-split-export-declaration-7.4.4" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz"; - sha512 = "7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; + sha512 = "Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q=="; }; }; "@babel/helper-wrap-function-7.2.0" = { @@ -319,13 +319,13 @@ let sha512 = "o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ=="; }; }; - "@babel/helpers-7.4.3" = { + "@babel/helpers-7.4.4" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.3.tgz"; - sha512 = "BMh7X0oZqb36CfyhvtbSmcWc3GXocfxv3yNsAEuM0l+fAqSO22rQrUpijr3oE/10jCTrB6/0b9kzmG4VetCj8Q=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz"; + sha512 = "igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A=="; }; }; "@babel/highlight-7.0.0" = { @@ -346,13 +346,13 @@ let sha512 = "tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ=="; }; }; - "@babel/parser-7.4.3" = { + "@babel/parser-7.4.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.4.3.tgz"; - sha512 = "gxpEUhTS1sGA63EGQGuA+WESPR/6tz6ng7tSHFCmaTJK/cGK8y37cBTspX+U2xCAue2IQVvF6Z0oigmjwD8YGQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz"; + sha512 = "5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w=="; }; }; "@babel/plugin-external-helpers-7.0.0" = { @@ -373,13 +373,13 @@ let sha512 = "+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.4.0" = { + "@babel/plugin-proposal-class-properties-7.4.4" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.0.tgz"; - sha512 = "t2ECPNOXsIeK1JxJNKmgbzQtoG27KIlVE61vTqX0DKR9E9sZlVVxWUtEW9D5FlZ8b8j7SBNCHY47GgPKCKlpPg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz"; + sha512 = "WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg=="; }; }; "@babel/plugin-proposal-json-strings-7.2.0" = { @@ -391,13 +391,13 @@ let sha512 = "MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.4.3" = { + "@babel/plugin-proposal-object-rest-spread-7.4.4" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.3.tgz"; - sha512 = "xC//6DNSSHVjq8O2ge0dyYlhshsH4T7XdCVoxbi5HzLYWfsC5ooFlJjrXk8RcAT+hjHAK9UjBXdylzSoDK3t4g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz"; + sha512 = "dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.2.0" = { @@ -409,13 +409,13 @@ let sha512 = "mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.4.0" = { + "@babel/plugin-proposal-unicode-property-regex-7.4.4" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.0.tgz"; - sha512 = "h/KjEZ3nK9wv1P1FSNb9G079jXrNYR0Ko+7XkOx85+gM24iZbPn0rh4vCftk+5QKY7y1uByFataBTmX7irEF1w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz"; + sha512 = "j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA=="; }; }; "@babel/plugin-syntax-async-generators-7.2.0" = { @@ -481,13 +481,13 @@ let sha512 = "ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg=="; }; }; - "@babel/plugin-transform-async-to-generator-7.4.0" = { + "@babel/plugin-transform-async-to-generator-7.4.4" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.0.tgz"; - sha512 = "EeaFdCeUULM+GPFEsf7pFcNSxM7hYjoj5fiYbyuiXobW4JhFnjAv9OWzNwHyHcKoPNpAfeRDuW6VyaXEDUBa7g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz"; + sha512 = "YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA=="; }; }; "@babel/plugin-transform-block-scoped-functions-7.2.0" = { @@ -499,22 +499,22 @@ let sha512 = "ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w=="; }; }; - "@babel/plugin-transform-block-scoping-7.4.0" = { + "@babel/plugin-transform-block-scoping-7.4.4" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.0.tgz"; - sha512 = "AWyt3k+fBXQqt2qb9r97tn3iBwFpiv9xdAiG+Gr2HpAZpuayvbL55yWrsV3MyHvXk/4vmSiedhDRl1YI2Iy5nQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz"; + sha512 = "jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA=="; }; }; - "@babel/plugin-transform-classes-7.4.3" = { + "@babel/plugin-transform-classes-7.4.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.3.tgz"; - sha512 = "PUaIKyFUDtG6jF5DUJOfkBdwAS/kFFV3XFk7Nn0a6vR7ZT8jYw5cGtIlat77wcnd0C6ViGqo/wyNf4ZHytF/nQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz"; + sha512 = "/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw=="; }; }; "@babel/plugin-transform-computed-properties-7.2.0" = { @@ -526,22 +526,22 @@ let sha512 = "kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA=="; }; }; - "@babel/plugin-transform-destructuring-7.4.3" = { + "@babel/plugin-transform-destructuring-7.4.4" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.3.tgz"; - sha512 = "rVTLLZpydDFDyN4qnXdzwoVpk1oaXHIvPEOkOLyr88o7oHxVc/LyrnDx+amuBWGOwUb7D1s/uLsKBNTx08htZg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz"; + sha512 = "/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ=="; }; }; - "@babel/plugin-transform-dotall-regex-7.4.3" = { + "@babel/plugin-transform-dotall-regex-7.4.4" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.3.tgz"; - sha512 = "9Arc2I0AGynzXRR/oPdSALv3k0rM38IMFyto7kOCwb5F9sLUt2Ykdo3V9yUPR+Bgr4kb6bVEyLkPEiBhzcTeoA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz"; + sha512 = "P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg=="; }; }; "@babel/plugin-transform-duplicate-keys-7.2.0" = { @@ -571,22 +571,22 @@ let sha512 = "PmQC9R7DwpBFA+7ATKMyzViz3zCaMNouzZMPZN2K5PnbBbtL3AXFYTkDk+Hey5crQq2A90UG5Uthz0mel+XZrA=="; }; }; - "@babel/plugin-transform-for-of-7.4.3" = { + "@babel/plugin-transform-for-of-7.4.4" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.3.tgz"; - sha512 = "UselcZPwVWNSURnqcfpnxtMehrb8wjXYOimlYQPBnup/Zld426YzIhNEvuRsEWVHfESIECGrxoI6L5QqzuLH5Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz"; + sha512 = "9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ=="; }; }; - "@babel/plugin-transform-function-name-7.4.3" = { + "@babel/plugin-transform-function-name-7.4.4" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.3.tgz"; - sha512 = "uT5J/3qI/8vACBR9I1GlAuU/JqBtWdfCrynuOkrWG6nCDieZd5przB1vfP59FRHBZQ9DC2IUfqr/xKqzOD5x0A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz"; + sha512 = "iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA=="; }; }; "@babel/plugin-transform-literals-7.2.0" = { @@ -625,22 +625,22 @@ let sha512 = "V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.4.3" = { + "@babel/plugin-transform-modules-commonjs-7.4.4" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.3.tgz"; - sha512 = "sMP4JqOTbMJMimqsSZwYWsMjppD+KRyDIUVW91pd7td0dZKAvPmhCaxhOzkzLParKwgQc7bdL9UNv+rpJB0HfA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz"; + sha512 = "4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.4.0" = { + "@babel/plugin-transform-modules-systemjs-7.4.4" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.0.tgz"; - sha512 = "gjPdHmqiNhVoBqus5qK60mWPp1CmYWp/tkh11mvb0rrys01HycEGD7NvvSoKXlWEfSM9TcL36CpsK8ElsADptQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz"; + sha512 = "MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ=="; }; }; "@babel/plugin-transform-modules-umd-7.2.0" = { @@ -652,22 +652,22 @@ let sha512 = "BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.4.2" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.4.4" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.4.2"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.2.tgz"; - sha512 = "NsAuliSwkL3WO2dzWTOL1oZJHm0TM8ZY8ZSxk2ANyKkt5SQlToGA4pzctmq1BEjoacurdwZ3xp2dCQWJkME0gQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.4.tgz"; + sha512 = "Ki+Y9nXBlKfhD+LXaRS7v95TtTGYRAf9Y1rTDiE75zf8YQz4GDaWRXosMfJBXxnk88mGFjWdCRIeqDbon7spYA=="; }; }; - "@babel/plugin-transform-new-target-7.4.0" = { + "@babel/plugin-transform-new-target-7.4.4" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.0.tgz"; - sha512 = "6ZKNgMQmQmrEX/ncuCwnnw1yVGoaOW5KpxNhoWI7pCQdA0uZ0HqHGqenCUIENAnxRjy2WwNQ30gfGdIgqJXXqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz"; + sha512 = "r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA=="; }; }; "@babel/plugin-transform-object-super-7.2.0" = { @@ -679,13 +679,13 @@ let sha512 = "VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg=="; }; }; - "@babel/plugin-transform-parameters-7.4.3" = { + "@babel/plugin-transform-parameters-7.4.4" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.3.tgz"; - sha512 = "ULJYC2Vnw96/zdotCZkMGr2QVfKpIT/4/K+xWWY0MbOJyMZuk660BGkr3bEKWQrrciwz6xpmft39nA4BF7hJuA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz"; + sha512 = "oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw=="; }; }; "@babel/plugin-transform-property-literals-7.2.0" = { @@ -706,13 +706,13 @@ let sha512 = "a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg=="; }; }; - "@babel/plugin-transform-regenerator-7.4.3" = { + "@babel/plugin-transform-regenerator-7.4.4" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.3.tgz"; - sha512 = "kEzotPuOpv6/iSlHroCDydPkKYw7tiJGKlmYp6iJn4a6C/+b2FdttlJsLKYxolYHgotTJ5G5UY5h0qey5ka3+A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.4.tgz"; + sha512 = "Zz3w+pX1SI0KMIiqshFZkwnVGUhDZzpX2vtPzfJBKQQq8WsP/Xy9DNdELWivxcKOCX/Pywge4SiEaPaLtoDT4g=="; }; }; "@babel/plugin-transform-reserved-words-7.2.0" = { @@ -724,13 +724,13 @@ let sha512 = "fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw=="; }; }; - "@babel/plugin-transform-runtime-7.4.3" = { + "@babel/plugin-transform-runtime-7.4.4" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.3.tgz"; - sha512 = "7Q61bU+uEI7bCUFReT1NKn7/X6sDQsZ7wL1sJ9IYMAO7cI+eg6x9re1cEw2fCRMbbTVyoeUKWSV1M6azEfKCfg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.4.tgz"; + sha512 = "aMVojEjPszvau3NRg+TIH14ynZLvPewH4xhlCW1w6A3rkxTS1m4uwzRclYR9oS+rl/dr+kT+pzbfHuAWP/lc7Q=="; }; }; "@babel/plugin-transform-shorthand-properties-7.2.0" = { @@ -760,13 +760,13 @@ let sha512 = "KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw=="; }; }; - "@babel/plugin-transform-template-literals-7.2.0" = { + "@babel/plugin-transform-template-literals-7.4.4" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.2.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz"; - sha512 = "FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz"; + sha512 = "mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g=="; }; }; "@babel/plugin-transform-typeof-symbol-7.2.0" = { @@ -778,13 +778,13 @@ let sha512 = "2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.4.3" = { + "@babel/plugin-transform-unicode-regex-7.4.4" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.3.tgz"; - sha512 = "lnSNgkVjL8EMtnE8eSS7t2ku8qvKH3eqNf/IwIfnSPUqzgqYmRwzdsQWv4mNQAN9Nuo6Gz1Y0a4CSmdpu1Pp6g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz"; + sha512 = "il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA=="; }; }; "@babel/polyfill-7.2.5" = { @@ -805,13 +805,13 @@ let sha512 = "2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA=="; }; }; - "@babel/preset-env-7.4.3" = { + "@babel/preset-env-7.4.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.3.tgz"; - sha512 = "FYbZdV12yHdJU5Z70cEg0f6lvtpZ8jFSDakTm7WXeJbLXh4R0ztGEu/SW7G1nJ2ZvKwDhz8YrbA84eYyprmGqw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.4.tgz"; + sha512 = "FU1H+ACWqZZqfw1x2G1tgtSSYSfxJLkpaUQL37CenULFARDo+h4xJoVHzRoHbK+85ViLciuI7ME4WTIhFRBBlw=="; }; }; "@babel/preset-stage-2-7.0.0" = { @@ -841,13 +841,13 @@ let sha512 = "IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g=="; }; }; - "@babel/runtime-7.4.3" = { + "@babel/runtime-7.4.4" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz"; - sha512 = "9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.4.tgz"; + sha512 = "w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg=="; }; }; "@babel/template-7.2.2" = { @@ -859,13 +859,13 @@ let sha512 = "zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g=="; }; }; - "@babel/template-7.4.0" = { + "@babel/template-7.4.4" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz"; - sha512 = "SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz"; + sha512 = "CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw=="; }; }; "@babel/traverse-7.3.4" = { @@ -877,13 +877,13 @@ let sha512 = "TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ=="; }; }; - "@babel/traverse-7.4.3" = { + "@babel/traverse-7.4.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.3.tgz"; - sha512 = "HmA01qrtaCwwJWpSKpA948cBvU5BrmviAief/b3AVw936DtcdsTexlbyzNuDnthwhOQ37xshn7hvQaEQk7ISYQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.4.tgz"; + sha512 = "Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -904,13 +904,13 @@ let sha512 = "WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ=="; }; }; - "@babel/types-7.4.0" = { + "@babel/types-7.4.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.4.0"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz"; - sha512 = "aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz"; + sha512 = "dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ=="; }; }; "@calebboyd/semaphore-1.3.1" = { @@ -1021,6 +1021,15 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; + "@emmetio/extract-abbreviation-0.1.6" = { + name = "_at_emmetio_slash_extract-abbreviation"; + packageName = "@emmetio/extract-abbreviation"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.6.tgz"; + sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; + }; + }; "@gulp-sourcemaps/identity-map-1.0.2" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; @@ -1174,13 +1183,13 @@ let sha512 = "2XzijnLHRZOVQh8pwS7+5GR3cG4uh+EiLrWOishCq2TVzkqgjaS3GGBoef7KMCXfWHoLqAZRr/jEdLqfETLVqg=="; }; }; - "@lerna/changed-3.13.3" = { + "@lerna/changed-3.13.4" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.13.3"; + version = "3.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.13.3.tgz"; - sha512 = "REMZ/1UvYrizUhN7ktlbfMUa0vhMf1ogAe97WQC4I8r3s973Orfhs3aselo1GwudUwM4tMHBH8A9vnll9or3iA=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.13.4.tgz"; + sha512 = "9lfOyRVObasw6L/z7yCSfsEl1QKy0Eamb8t2Krg1deIoAt+cE3JXOdGGC1MhOSli+7f/U9LyLXjJzIOs/pc9fw=="; }; }; "@lerna/check-working-tree-3.13.3" = { @@ -1354,13 +1363,13 @@ let sha512 = "mQzoghRw4dBg0R9FFfHrj0TH0glvXyzdEZmYZ8Isvx5BSuEEwpsryoywuZSdppcvLu8o7NAdU5Tac8cJ/mT52w=="; }; }; - "@lerna/import-3.13.3" = { + "@lerna/import-3.13.4" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "3.13.3"; + version = "3.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-3.13.3.tgz"; - sha512 = "gDjLAFVavG/CMvj9leBfiwd7vrXqtdFXPIz1oXmghBMnje7nCTbodbNWFe4VDDWx7reDaZIN+6PxTSvrPcF//A=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-3.13.4.tgz"; + sha512 = "dn6eNuPEljWsifBEzJ9B6NoaLwl/Zvof7PBUPA4hRyRlqG5sXRn6F9DnusMTovvSarbicmTURbOokYuotVWQQA=="; }; }; "@lerna/init-3.13.3" = { @@ -1507,13 +1516,13 @@ let sha512 = "P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA=="; }; }; - "@lerna/publish-3.13.3" = { + "@lerna/publish-3.13.4" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.13.3"; + version = "3.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.13.3.tgz"; - sha512 = "Ni3pZKueIfgJJoL0OXfbAuWhGlJrDNwGx3CYWp2dbNqJmKD6uBZmsDtmeARKDp92oUK60W0drXCMydkIFFHMDQ=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.13.4.tgz"; + sha512 = "v03pabiPlqCDwX6cVNis1PDdT6/jBgkVb5Nl4e8wcJXevIhZw3ClvtI94gSZu/wdoVFX0RMfc8QBVmaimSO0qg=="; }; }; "@lerna/pulse-till-done-3.13.0" = { @@ -1606,13 +1615,13 @@ let sha512 = "SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA=="; }; }; - "@lerna/version-3.13.3" = { + "@lerna/version-3.13.4" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.13.3"; + version = "3.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.13.3.tgz"; - sha512 = "o/yQGAwDHmyu17wTj4Kat1/uDhjYFMeG+H0Y0HC4zJ4a/T6rEiXx7jJrnucPTmTQTDcUBoH/It5LrPYGOPsExA=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.13.4.tgz"; + sha512 = "pptWUEgN/lUTQZu34+gfH1g4Uhs7TDKRcdZY9A4T9k6RTOwpKC2ceLGiXdeR+ZgQJAey2C4qiE8fo5Z6Rbc6QA=="; }; }; "@lerna/write-log-file-3.13.0" = { @@ -1696,13 +1705,13 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@octokit/endpoint-4.0.0" = { + "@octokit/endpoint-5.1.1" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "4.0.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-4.0.0.tgz"; - sha512 = "b8sptNUekjREtCTJFpOfSIL4SKh65WaakcyxWzRcSPOk5RxkZJ/S8884NGZFxZ+jCB2rDURU66pSHn14cVgWVg=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.1.1.tgz"; + sha512 = "kCv3ZyqFTWGYmvuU0TETzC4jPGzyLCJrjXp65kRe9DHyQULZak+dpwmEbT7M2rpdr/O2im8ivrPGT6J+2WsKNg=="; }; }; "@octokit/plugin-enterprise-rest-2.2.2" = { @@ -1714,22 +1723,22 @@ let sha512 = "CTZr64jZYhGWNTDGlSJ2mvIlFsm9OEO3LqWn9I/gmoHI4jRBp4kpHoFYNemG4oA75zUAcmbuWblb7jjP877YZw=="; }; }; - "@octokit/request-3.0.0" = { + "@octokit/request-3.0.2" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-3.0.0.tgz"; - sha512 = "DZqmbm66tq+a9FtcKrn0sjrUpi0UaZ9QPUCxxyk/4CJ2rseTMpAWRf6gCwOSUCzZcx/4XVIsDk+kz5BVdaeenA=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-3.0.2.tgz"; + sha512 = "lBH2hf2Yuh9XlmP3MSpn3jL9DyCGG+cuPXDRQiJMK42BwW6xFhwWmG1k6xWykcLM4GwZG/5fuwcqnQXYG0ZTSg=="; }; }; - "@octokit/rest-16.25.0" = { + "@octokit/rest-16.25.3" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.25.0"; + version = "16.25.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.25.0.tgz"; - sha512 = "QKIzP0gNYjyIGmY3Gpm3beof0WFwxFR+HhRZ+Wi0fYYhkEUvkJiXqKF56Pf5glzzfhEwOrggfluEld5F/ZxsKw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.25.3.tgz"; + sha512 = "/6/Isn9pNoKUQwuWUaskxMC6kFxtXTHhzsgYbyirEQ3UvcLciHvPgtRTbuV3bbVf0x4+4WEfKaI9UzxmPQ3W3A=="; }; }; "@parcel/fs-1.11.0" = { @@ -1867,22 +1876,22 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@schematics/angular-7.3.8" = { + "@schematics/angular-7.3.9" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "7.3.8"; + version = "7.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.8.tgz"; - sha512 = "7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.9.tgz"; + sha512 = "B3lytFtFeYNLfWdlrIzvy3ulFRccD2/zkoL0734J+DAGfUz7vbysJ50RwYL46sQUcKdZdvb48ktfu1S8yooP6Q=="; }; }; - "@schematics/update-0.13.8" = { + "@schematics/update-0.13.9" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.13.8"; + version = "0.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.8.tgz"; - sha512 = "2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.9.tgz"; + sha512 = "4MQcaKFxhMzZyE//+DknDh3h3duy3avg2oxSHxdwXlCZ8Q92+4lpegjJcSRiqlEwO4qeJ5XnrjrvzfIiaIZOmA=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -1921,6 +1930,96 @@ let sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; + "@starptech/expression-parser-0.8.17" = { + name = "_at_starptech_slash_expression-parser"; + packageName = "@starptech/expression-parser"; + version = "0.8.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@starptech/expression-parser/-/expression-parser-0.8.17.tgz"; + sha512 = "7oLWJjPNHaMgGcYIh/rbbmhrXyexHFOj5btztXbFuLjkHc5CmNc1Jhov0jF8rGMkRVwBoHpE1qR2fx4G+383eA=="; + }; + }; + "@starptech/hast-util-from-webparser-0.8.17" = { + name = "_at_starptech_slash_hast-util-from-webparser"; + packageName = "@starptech/hast-util-from-webparser"; + version = "0.8.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@starptech/hast-util-from-webparser/-/hast-util-from-webparser-0.8.17.tgz"; + sha512 = "zj5+X2qQltKbI+uYNz1DmkvVGnzZ/2XJOtWqeqeYrhDOtkEFbousifaFMCdTxvwFmGe/WusrO7rV6KtjqhDRjA=="; + }; + }; + "@starptech/prettyhtml-0.8.17" = { + name = "_at_starptech_slash_prettyhtml"; + packageName = "@starptech/prettyhtml"; + version = "0.8.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@starptech/prettyhtml/-/prettyhtml-0.8.17.tgz"; + sha512 = "T+5vztw3S/kstOAR/IaF0pRASS+iZxsUR538/4eZmPgoa9haAx9lYZF9wYD2kP81RewhktipOKJbhbbxliVRVA=="; + }; + }; + "@starptech/prettyhtml-formatter-0.8.17" = { + name = "_at_starptech_slash_prettyhtml-formatter"; + packageName = "@starptech/prettyhtml-formatter"; + version = "0.8.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@starptech/prettyhtml-formatter/-/prettyhtml-formatter-0.8.17.tgz"; + sha512 = "+fZcpa54Yxox4jN+nqnL2gJRrGA7XbbknsecxiYl8m9h51zgrmq+RhWlwxosMreFH3mEGdwuLAj1tumm9kpAZQ=="; + }; + }; + "@starptech/prettyhtml-hast-to-html-0.8.17" = { + name = "_at_starptech_slash_prettyhtml-hast-to-html"; + packageName = "@starptech/prettyhtml-hast-to-html"; + version = "0.8.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@starptech/prettyhtml-hast-to-html/-/prettyhtml-hast-to-html-0.8.17.tgz"; + sha512 = "WXVMJ60ra2Z/X91fXKLqBuCIJ+Xpc9PHSQ90ilzjocvziqKXkBGwio3oLjj/UKDSsh/gUZLsaTkXKFNFg/zx3w=="; + }; + }; + "@starptech/prettyhtml-hastscript-0.8.17" = { + name = "_at_starptech_slash_prettyhtml-hastscript"; + packageName = "@starptech/prettyhtml-hastscript"; + version = "0.8.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@starptech/prettyhtml-hastscript/-/prettyhtml-hastscript-0.8.17.tgz"; + sha512 = "MP3/gjrzxcKQEVYv+IxRbRZ6vhCAePUQ5BzkrkBvRM3fZwXMo5ZrnBf06Nq5JuNf/sgMv0hKoOkXbx0E3uiNkg=="; + }; + }; + "@starptech/prettyhtml-sort-attributes-0.8.17" = { + name = "_at_starptech_slash_prettyhtml-sort-attributes"; + packageName = "@starptech/prettyhtml-sort-attributes"; + version = "0.8.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@starptech/prettyhtml-sort-attributes/-/prettyhtml-sort-attributes-0.8.17.tgz"; + sha512 = "S28N5WCN2Wv8U6vpxJXf8sV4lu9hU2dnHJQSUkZP6M1W7HNkD/254Bn1vTJuwvHU5NWSQ3QxmzBe/TWlz9GAhg=="; + }; + }; + "@starptech/rehype-minify-whitespace-0.8.17" = { + name = "_at_starptech_slash_rehype-minify-whitespace"; + packageName = "@starptech/rehype-minify-whitespace"; + version = "0.8.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@starptech/rehype-minify-whitespace/-/rehype-minify-whitespace-0.8.17.tgz"; + sha512 = "hrrgNAYknfHw9lBWO0+qHtJJs0zMHwTOCIBTCk2FGyeg+SEKh4dJdNRUfujPkH5qNj7skTUHWtOKL5PaWRT64w=="; + }; + }; + "@starptech/rehype-webparser-0.8.17" = { + name = "_at_starptech_slash_rehype-webparser"; + packageName = "@starptech/rehype-webparser"; + version = "0.8.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@starptech/rehype-webparser/-/rehype-webparser-0.8.17.tgz"; + sha512 = "8GklGO1DSCyFqQKl8ZyL0mu3LDIc3DN1w8vj28EYxUinAGUWCGyaimC7QDyvs4hK75XM1NddPzR0fFBlBOXn1g=="; + }; + }; + "@starptech/webparser-0.8.17" = { + name = "_at_starptech_slash_webparser"; + packageName = "@starptech/webparser"; + version = "0.8.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@starptech/webparser/-/webparser-0.8.17.tgz"; + sha512 = "St95Jolws0W5NVB+OS0w84Tgu9BHlb+JPltSWD4lDwVIwv7x1lVHdat52AwHQdHPzUY2xGOz1g7Gdb5jSTTk3A=="; + }; + }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -1930,103 +2029,103 @@ let sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; - "@textlint/ast-node-types-4.2.1" = { + "@textlint/ast-node-types-4.2.2" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.1.tgz"; - sha512 = "Pqg1LTJpF929Ovi/lCaPqlyz8yDwBFbQulC0jyQcbRAoTxYS4AZMc48Ug2yk0so5hISQXKrlAxyVBmBVl9EKGA=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.2.tgz"; + sha512 = "5VHykhxgUat7dvRWGw52Tk55SWjuZDpDO7PKDhfcLTFrD1cjbTtFFnWeJc0BfoqB2AUjfHXRoMdnqbFRGmnPVQ=="; }; }; - "@textlint/ast-traverse-2.1.2" = { + "@textlint/ast-traverse-2.1.3" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.1.2.tgz"; - sha512 = "0VIx7Ql8OVHPOWKqHvgUDfyNlhZdG+0sn5bOhHJcbJs8HiSIdErO5pV1fPc2Apro3G15v6gq1rmjUR36ScwwdQ=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.1.3.tgz"; + sha512 = "djZYlEtghk1Q9Tb0XU6if0S7JA+dfoO5AB6+Tcmi04HdWlXRZl8U59Sco+JzVFd3haFbDpMvC0sQIda4uZbsOA=="; }; }; - "@textlint/feature-flag-3.1.2" = { + "@textlint/feature-flag-3.1.3" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.1.2.tgz"; - sha512 = "vtD/LXZoUHx++ExUvnUZKvl76+6kFHlHl0XLnyP6ZQSVoXF9ElVdFvvRaptPrpXu8SZYqCN2Hcz5iamXZP0hLQ=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.1.3.tgz"; + sha512 = "59RaAmdsMB3e32PD04N0YOJI2L3ljWR8fEk9FDLbOJAZeu7c+TqgETHDiVnkrh8gM+m8RL0h4wWq1jbB1kj0Xw=="; }; }; - "@textlint/fixer-formatter-3.1.3" = { + "@textlint/fixer-formatter-3.1.5" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.3.tgz"; - sha512 = "5EyO2+39bx8Tr4eDKxAFpoxXmzSvgGEXIIEDmiPg0+mJVkl33W1q79YAsOEqQDAP21DE9oKlBK2tPqljdTSDwQ=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.5.tgz"; + sha512 = "Ef+6smERp3Meic3ob96PCr1Gv688fJKPhCWLuRf0n2pM+leiE5mkwJAlFJU75f5ZwY+a8V8wPRotBRFDUNA+7w=="; }; }; - "@textlint/kernel-3.1.4" = { + "@textlint/kernel-3.1.6" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.1.4"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.1.4.tgz"; - sha512 = "BEK1dTrwKYX/RtM8oyBQbv4LBpXmMb9Uo/lOhHsYMhOC4bMF0zWktPiJ5bZNvvY7yyYJB42sAAthcBAdRxLhiw=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.1.6.tgz"; + sha512 = "0Ox1WEFrqcsp/7hmlN9N3IrbuYT11cmBBIv647Mj2dccaspRhcqi0/PUsrnvB82JW43XTQNWbHG7GqpQaTQ1Pg=="; }; }; - "@textlint/linter-formatter-3.1.3" = { + "@textlint/linter-formatter-3.1.5" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.3.tgz"; - sha512 = "UXBRqeECcSwIyreXs926Ylc6FREMrhUyov13rrfReGwS8WSQL3yBtAhoFsNwz1jI8OCNeYGZnA6R9nh40VKkPg=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.5.tgz"; + sha512 = "UMCcwoJPa5EgfihPgpouQqoemi66fPD19rdhvdgYcMzObZ0cR+n2FczCadJnW10JxGvm9oEOzIOpWG57/63iCg=="; }; }; - "@textlint/markdown-to-ast-6.1.2" = { + "@textlint/markdown-to-ast-6.1.3" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.2.tgz"; - sha512 = "we9n29GfopUUA0j91xRVQ75ME5YhdnWQZcjfpXQK98DQ//xwVzteMuZe1Og8CArA/aDoTRq0EYFkN2oGu3v20Q=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.3.tgz"; + sha512 = "9/NJkfspGAin8raYKtkcwtXDmC/T66m7b5wRJgOPgdbjO6jnUezAUWCt2HqscSnNU/qw4GBCQDxTJLyOpZwvCg=="; }; }; - "@textlint/text-to-ast-3.1.2" = { + "@textlint/text-to-ast-3.1.3" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.1.2.tgz"; - sha512 = "ge8O9p3HYLy2vni0k4Qh12fRKsJySp/wiuJlvGqemA+hJvSC0164N8I61aHBqgTWTciHHhKBH4ofqCOdSbwKTg=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.1.3.tgz"; + sha512 = "0Il7SGwwgl6vUsQqnII4DXQDyIsa7nhardr5us4am98dALNd28mlciFHw2JUrwppoSZcYaBibIb22eo2lEmvMA=="; }; }; - "@textlint/textlint-plugin-markdown-5.1.4" = { + "@textlint/textlint-plugin-markdown-5.1.6" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.1.4"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.4.tgz"; - sha512 = "e4/mcAZojiLw22zFhpul3v+ctsTRJGH0XkEy85vr03wN6f2IHZWE/9u7SHzaigwlCGm3umzmW379k7ewbwzfPg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.6.tgz"; + sha512 = "LUrxTQFBpJv0BQJkwUa0p4yY+fclOK2bPu2E5N8fWy3qg5bsIZynoUElYCpjc2c9WItZaaJINjiRVJ01FxnoNg=="; }; }; - "@textlint/textlint-plugin-text-4.1.4" = { + "@textlint/textlint-plugin-text-4.1.6" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.1.4"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.4.tgz"; - sha512 = "HdWvU+meeo5CHO4tmPcR3m/+AF3lJLuv0G/lCsGUVsoWGwsWLIKTKX4+ODobQkio0kaqU2+ZVCy7lxpfPAAP7A=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.6.tgz"; + sha512 = "GxsWRmleYtWNLKOwFJnYXswHn0x21I/htPfKCJ2jAw9Kwr0mDxJvzjyYAgOtoCFZ+q1dAGyq5mtWbh8y6rhvpg=="; }; }; - "@textlint/types-1.1.3" = { + "@textlint/types-1.1.5" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.1.3"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.1.3.tgz"; - sha512 = "gU9wYNLKPf9wSX30XXcn+dj6vQSjS4Tudj+BCc1shtMj3u+wKUxDyt42OoCCJTerpF7pHViGQNxnPM9VkuXqyQ=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.1.5.tgz"; + sha512 = "z9PqRrk9EEgSP3F83YV9A/yAYMbfubf3D85QwN/EUm3gtg0XuALqt9aHywuFcgVnvEJCUbhwz4xV51oqq5unYw=="; }; }; "@types/accepts-1.3.5" = { @@ -2074,13 +2173,13 @@ let sha512 = "aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw=="; }; }; - "@types/cors-2.8.4" = { + "@types/cors-2.8.5" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.4"; + version = "2.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.4.tgz"; - sha512 = "ipZjBVsm2tF/n8qFGOuGBkUij9X9ZswVi9G3bx/6dz7POpVa6gVHcj1wsX/LVEn9MMF41fxK/PnZPPoTD1UFPw=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.5.tgz"; + sha512 = "GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg=="; }; }; "@types/estree-0.0.39" = { @@ -2110,13 +2209,13 @@ let sha512 = "V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg=="; }; }; - "@types/express-serve-static-core-4.16.3" = { + "@types/express-serve-static-core-4.16.4" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.16.3"; + version = "4.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.3.tgz"; - sha512 = "HFgBmRDTvdnrRFXqBr2NM2NUCu6fIpzJsUTlRVENF8lxvstof7cl9Fxfwq5S0kJbO/FsPVcjlxpOM3ZxIkn7Rw=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.4.tgz"; + sha512 = "x/8h6FHm14rPWnW2HP5likD/rsqJ3t/77OWx2PLxym0hXbeBWQmcPyHmwX+CtCQpjIfgrUdEoDFcLPwPZWiqzQ=="; }; }; "@types/glob-7.1.1" = { @@ -2155,40 +2254,49 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-10.14.5" = { + "@types/node-10.14.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.14.5"; + version = "10.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.14.5.tgz"; - sha512 = "Ja7d4s0qyGFxjGeDq5S7Si25OFibSAHUi6i17UWnwNnpitADN7hah9q0Tl25gxuV5R1u2Bx+np6w4LHXfHyj/g=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.14.6.tgz"; + sha512 = "Fvm24+u85lGmV4hT5G++aht2C5I4Z4dYlWZIh62FAfFO/TfzXtPpoLI6I7AuBWkIFqZCnhFOoTT7RjjaIL5Fjg=="; }; }; - "@types/node-11.13.7" = { + "@types/node-11.13.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "11.13.7"; + version = "11.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-11.13.7.tgz"; - sha512 = "suFHr6hcA9mp8vFrZTgrmqW2ZU3mbWsryQtQlY/QvwTISCw7nw/j+bCQPPohqmskhmqa5wLNuMHTTsc+xf1MQg=="; + url = "https://registry.npmjs.org/@types/node/-/node-11.13.10.tgz"; + sha512 = "leUNzbFTMX94TWaIKz8N15Chu55F9QSH+INKayQr5xpkasBQBRF3qQXfo3/dOnMU/dEIit+Y/SU8HyOjq++GwA=="; }; }; - "@types/node-6.14.5" = { + "@types/node-12.0.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.14.5"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.14.5.tgz"; - sha512 = "50PRp2qLJYjnFV/BWc839MN/9YeSrNz5DWzCiKYw3GVF/YyMClcHxTWGsVc0CPNpJpk3CIp0dOqLxqP3U/Pc+A=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.0.0.tgz"; + sha512 = "Jrb/x3HT4PTJp6a4avhmJCDEVrPdqLfl3e8GGMbpkGGdwAV5UGlIs4vVEfsHHfylZVOKZWpOqmqFH8CbfOZ6kg=="; }; }; - "@types/node-8.10.46" = { + "@types/node-6.14.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.46"; + version = "6.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.46.tgz"; - sha512 = "PfnRbk836fFs9T9QnZh0G1k9oC6YXCqIK3LX6vU/6oiXtEBSFCiJFj6UnLZtqIIHTsgMn8Dojq3yhmpwY7QWcw=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.6.tgz"; + sha512 = "rFs9zCFtSHuseiNXxYxFlun8ibu+jtZPgRM+2ILCmeLiGeGLiIGxuOzD+cNyHegI1GD+da3R/cIbs9+xCLp13w=="; + }; + }; + "@types/node-8.10.48" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.48"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.10.48.tgz"; + sha512 = "c35YEBTkL4rzXY2ucpSKy+UYHjUBIIkuJbWYbsGIrKLEWU5dgJMmLkkIb3qeC3O3Tpb1ZQCwecscvJTDjDjkRw=="; }; }; "@types/q-1.5.2" = { @@ -2227,6 +2335,33 @@ let sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA=="; }; }; + "@types/unist-2.0.3" = { + name = "_at_types_slash_unist"; + packageName = "@types/unist"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz"; + sha512 = "FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ=="; + }; + }; + "@types/vfile-3.0.2" = { + name = "_at_types_slash_vfile"; + packageName = "@types/vfile"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/vfile/-/vfile-3.0.2.tgz"; + sha512 = "b3nLFGaGkJ9rzOcuXRfHkZMdjsawuDD0ENL9fzTophtBg8FJHSGbH7daXkEpcwy3v7Xol3pAvsmlYyFhR4pqJw=="; + }; + }; + "@types/vfile-message-1.0.1" = { + name = "_at_types_slash_vfile-message"; + packageName = "@types/vfile-message"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/vfile-message/-/vfile-message-1.0.1.tgz"; + sha512 = "mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA=="; + }; + }; "@types/ws-6.0.1" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -2245,40 +2380,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.6.0" = { + "@vue/cli-shared-utils-3.7.0" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.6.0.tgz"; - sha512 = "C8nTiJ7o+dncNLyOIOZF8P4bMJdOVXhWOuwyZKqn8k3CcsQVzuLyCKUHHezWc+sI+PJi4wIg2ZffCiueeIXZ+w=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.7.0.tgz"; + sha512 = "+LPDAQ1CE3ci1ADOvNqJMPdqyxgJxOq5HUgGDSKCHwviXF6GtynfljZXiSzgWh5ueMFxJphCfeMsTZqFWwsHVg=="; }; }; - "@vue/cli-ui-3.6.2" = { + "@vue/cli-ui-3.7.0" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.6.2"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.6.2.tgz"; - sha512 = "ZDsR0S5G54s/OXXFCiqB7I4hJCtnmWG+IYH4FPv7k/YSCNas7idOPt5iqhKiRArk9igMchg4K+XTIWz2m5/wdQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.7.0.tgz"; + sha512 = "KZ/Jx9Blmvde9m8/dIuWT0ftDI33OVnzR/tvJCxXo0X1BbB28NihwoNhZ4y1vbdR3BrHynyfID9eGOPtX/SEZw=="; }; }; - "@vue/cli-ui-addon-webpack-3.6.3" = { + "@vue/cli-ui-addon-webpack-3.7.0" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.6.3"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.6.3.tgz"; - sha512 = "l8tZjcjAdsz2fOe/DOhgTg9NcxyeLtqamT3kAjUkOen3+TsMBiFUxDMfbpfg0lSBsCL77rWTzq8ZriZ4mAUR6Q=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.7.0.tgz"; + sha512 = "glen99akTrR/BI+U2AeR69V7Nu8hJVCP3QcAznBeU1YmHRa55Gly7QBUCJx78m9ZHDMMfGerRCpZdAEyuXiRBw=="; }; }; - "@vue/cli-ui-addon-widgets-3.6.0" = { + "@vue/cli-ui-addon-widgets-3.7.0" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.6.0.tgz"; - sha512 = "qIBjUvHVJDynWCLI8MkSAoWtmEv8Ri8cNKaRbLgNzpa4vzG1TC9erKgMUntsC0T+1XuAUPgzsUWH4yBzlO8NHg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.7.0.tgz"; + sha512 = "hIIr8tQjY1ErmCxITLOXNZ64KONXzuC/Vo0vOrdvdHKKHcSFEQBJxwoqfSMbYjFUyIotQsIqT3B9o8kQ7xFTlg=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -2803,13 +2938,13 @@ let sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; }; }; - "accepts-1.3.5" = { + "accepts-1.3.7" = { name = "accepts"; packageName = "accepts"; - version = "1.3.5"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz"; - sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; "accord-0.28.0" = { @@ -3001,6 +3136,24 @@ let sha512 = "fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw=="; }; }; + "adverb-where-0.0.9" = { + name = "adverb-where"; + packageName = "adverb-where"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/adverb-where/-/adverb-where-0.0.9.tgz"; + sha1 = "09c5cddd8d503b9fe5f76e0b8dc5c70a8f193e34"; + }; + }; + "adverb-where-0.2.1" = { + name = "adverb-where"; + packageName = "adverb-where"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/adverb-where/-/adverb-where-0.2.1.tgz"; + sha512 = "IAveFBziMRMNPKFdWRcdIKaJvJG1cAfU9/tf9MzqQ84Dh4QjD9eqwnt4hNSt9cbrcEJD74BMIOaRVgVDEU7MwQ=="; + }; + }; "after-0.8.1" = { name = "after"; packageName = "after"; @@ -3154,6 +3307,15 @@ let sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; }; }; + "ajv-keywords-2.1.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz"; + sha1 = "617997fc5f60576894c435f940d819e135b80762"; + }; + }; "ajv-keywords-3.4.0" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -3172,6 +3334,15 @@ let sha512 = "0mAYXMSauA8RZ7r+B4+EAOYcZEcO9OK5EiQCR7W7Cv4E44pJj56ZnkKLJ9/PAcOc0dT+LlV9fdDcq2TxVJfOYw=="; }; }; + "alex-5.1.0" = { + name = "alex"; + packageName = "alex"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/alex/-/alex-5.1.0.tgz"; + sha512 = "ouNJOHx7KKNwFsmX3WWXo8c2RTrsyhcX5QlFb6IM/cHCy9IkHr1k833jiIhcbwkUeGgACI2BJtp9LLvnFjbhbA=="; + }; + }; "align-text-0.1.4" = { name = "align-text"; packageName = "align-text"; @@ -3514,13 +3685,13 @@ let sha512 = "nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ=="; }; }; - "apollo-cache-control-0.5.2" = { + "apollo-cache-control-0.6.0" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.5.2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.5.2.tgz"; - sha512 = "uehXDUrd3Qim+nzxqqN7XT1YTbNSyumW3/FY5BxbKZTI8d4oPG4eyVQKqaggooSjswKQnOoIQVes3+qg9tGAkw=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.6.0.tgz"; + sha512 = "66aCF6MHe0/FdD3knphwTv6CCIdb1ZxrMsiRpxP474qqyYVe2jAwBu6aJBn4emffZHZ7i6gp9dY6cPHThjnbKA=="; }; }; "apollo-cache-inmemory-1.5.1" = { @@ -3613,49 +3784,58 @@ let sha512 = "0/h5hce2FIGn6Y4+EHMeMINQxFwcgjw1vU+xV3KGaaEgyEAEQ3/n9pyz43M8mOm/JVgg8Eb4CtM1AtCkRQuFGw=="; }; }; - "apollo-datasource-0.3.1" = { + "apollo-datasource-0.4.0" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.3.1.tgz"; - sha512 = "qdEUeonc9pPZvYwXK36h2NZoT7Pddmy0HYOzdV0ON5pcG1YtNmUyyYi83Q60V5wTWjuaCjyJ9hOY6wr0BMvQuA=="; - }; - }; - "apollo-engine-reporting-1.0.7" = { - name = "apollo-engine-reporting"; - packageName = "apollo-engine-reporting"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.7.tgz"; - sha512 = "mFsXvd+1/o5jSa9tI2RoXYGcvCLcwwcfLwchjSTxqUd4ViB8RbqYKynzEZ+Omji7PBRM0azioBm43f7PSsQPqA=="; - }; - }; - "apollo-engine-reporting-protobuf-0.2.1" = { - name = "apollo-engine-reporting-protobuf"; - packageName = "apollo-engine-reporting-protobuf"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.2.1.tgz"; - sha512 = "5pYR84uWeylRS2OJowtkTczT3bWTwOErWtfnkRKccUi/wZ/AZJBP+D5HKNzM7xoFcz9XvrJyS+wBTz1oBi0Jiw=="; - }; - }; - "apollo-env-0.4.0" = { - name = "apollo-env"; - packageName = "apollo-env"; version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.4.0.tgz"; - sha512 = "TZpk59RTbXd8cEqwmI0KHFoRrgBRplvPAP4bbRrX4uDSxXvoiY0Y6tQYUlJ35zi398Hob45mXfrZxeRDzoFMkQ=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.4.0.tgz"; + sha512 = "6QkgnLYwQrW0qv+yXIf617DojJbGmza2XJXUlgnzrGGhxzfAynzEjaLyYkc8rYS1m82vjrl9EOmLHTcnVkvZAQ=="; }; }; - "apollo-graphql-0.1.3" = { + "apollo-engine-reporting-1.1.0" = { + name = "apollo-engine-reporting"; + packageName = "apollo-engine-reporting"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.1.0.tgz"; + sha512 = "Dj0BwgcluHL0QVUaquhAoYoLX9Z4DRP/n2REcIwO8d2iy52r+1wN5QqZLx97dEFh7CjhNjTWeysJzc8XMWKa1Q=="; + }; + }; + "apollo-engine-reporting-protobuf-0.3.0" = { + name = "apollo-engine-reporting-protobuf"; + packageName = "apollo-engine-reporting-protobuf"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.3.0.tgz"; + sha512 = "PYowpx/E+TJT/8nKpp3JmJuKh3x1SZcxDF6Cquj0soV205TUpFFCZQMi91i5ACiEp2AkYvM/GDBIrw+rfIwzTg=="; + }; + }; + "apollo-env-0.4.1-register.1" = { + name = "apollo-env"; + packageName = "apollo-env"; + version = "0.4.1-register.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.4.1-register.1.tgz"; + sha512 = "fg1US7YZ6yW1N0tFq8g4HpCR3eJZmI+rIiHDiknYN9D1MTjvwYdmXYhi7VaPvQ21hV5nMRvfBUMqYXjP+6FsGQ=="; + }; + }; + "apollo-env-0.5.0" = { + name = "apollo-env"; + packageName = "apollo-env"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.5.0.tgz"; + sha512 = "yzajZupxouVtSUJiqkjhiQZKnagfwZeHjqRHkgV+rTCNuJkfdcoskSQm7zk5hhcS1JMunuD6INC1l4PHq+o+wQ=="; + }; + }; + "apollo-graphql-0.2.1-register.1" = { name = "apollo-graphql"; packageName = "apollo-graphql"; - version = "0.1.3"; + version = "0.2.1-register.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.1.3.tgz"; - sha512 = "bYgDh71jFfHKO9ioGlxnnoSYgpNp6LRl+/QHTx6tktQEN0Z+AdpkOKFNCHO/pRU/4vSqV5wuIhxhnCecxJQrMA=="; + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.2.1-register.1.tgz"; + sha512 = "Z2LOuvYomC9CN9K+mpFVcVQu6Ml5PIJlV+YOkGzFq73xeqWg1InxHqI3eEdCEhxTJq6H8rlWT8ATrMS+4sIhqw=="; }; }; "apollo-link-1.2.11" = { @@ -3721,76 +3901,76 @@ let sha512 = "0PKgahM2BOcUiI3QSJMYXOoUylWKzar5NTZLgMLEW4K/CczOTzC4CTXvKMjh/cx57Jto/U2xzKRy9BEoNfnK5Q=="; }; }; - "apollo-server-caching-0.3.1" = { + "apollo-server-caching-0.4.0" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; - version = "0.3.1"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.3.1.tgz"; - sha512 = "mfxzikYXbB/OoEms77AGYwRh7FF3Oim5v5XWAL+VL49FrkbZt5lopVa4bABi7Mz8Nt3Htl9EBJN8765s/yh8IA=="; + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.4.0.tgz"; + sha512 = "GTOZdbLhrSOKYNWMYgaqX5cVNSMT0bGUTZKV8/tYlyYmsB6ey7l6iId3Q7UpHS6F6OR2lstz5XaKZ+T3fDfPzQ=="; }; }; - "apollo-server-core-2.4.8" = { + "apollo-server-core-2.5.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.4.8"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.8.tgz"; - sha512 = "N+5UOzHhMOnHizEiArJtNvEe/cGhSHQyTn5tlU4RJ36FDBJ/WlYZfPbGDMLISSUCJ6t+aP8GLL4Mnudt9d2PDQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.5.0.tgz"; + sha512 = "7hyQ/Rt0hC38bUfxMQmLNHDBIGEBykFWo9EO0W+3o/cno/SqBKd1KKichrABVv+v+SCvZAUutX6gYS5l3G+ULQ=="; }; }; - "apollo-server-env-2.2.0" = { + "apollo-server-env-2.3.0" = { name = "apollo-server-env"; packageName = "apollo-server-env"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.2.0.tgz"; - sha512 = "wjJiI5nQWPBpNmpiLP389Ezpstp71szS6DHAeTgYLb/ulCw3CTuuA+0/E1bsThVWiQaDeHZE0sE3yI8q2zrYiA=="; + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.3.0.tgz"; + sha512 = "WIwlkCM/gir0CkoYWPMTCH8uGCCKB/aM074U1bKayvkFOBVO2VgG5x2kgsfkyF05IMQq2/GOTsKhNY7RnUEhTA=="; }; }; - "apollo-server-errors-2.2.1" = { + "apollo-server-errors-2.3.0" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.2.1.tgz"; - sha512 = "wY/YE3iJVMYC+WYIf8QODBjIP4jhI+oc7kiYo9mrz7LdYPKAgxr/he+NteGcqn/0Ea9K5/ZFTGJDbEstSMeP8g=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.0.tgz"; + sha512 = "rUvzwMo2ZQgzzPh2kcJyfbRSfVKRMhfIlhY7BzUfM4x6ZT0aijlgsf714Ll3Mbf5Fxii32kD0A/DmKsTecpccw=="; }; }; - "apollo-server-express-2.4.8" = { + "apollo-server-express-2.5.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.4.8"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.8.tgz"; - sha512 = "i60l32mfVe33jnKDPNYgUKUKu4Al0xEm2HLOSMgtJ9Wbpe/MbOx5X8M5F27fnHYdM+G5XfAErsakAyRGnQJ48Q=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.5.0.tgz"; + sha512 = "2gd3VWIqji2jyDYMTTqKzVU4/znjEjugtLUmPgVl5SoBvJSMTsO7VgJv+roBubZGDK8jXXUEXr2a33RtIeHe4g=="; }; }; - "apollo-server-plugin-base-0.3.7" = { + "apollo-server-plugin-base-0.4.0" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.3.7"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.7.tgz"; - sha512 = "hW1jaLKf9qNOxMTwRq2CSqz3eqXsZuEiCc8/mmEtOciiVBq1GMtxFf19oIYM9HQuPvQU2RWpns1VrYN59L3vbg=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.4.0.tgz"; + sha512 = "iD7ARNtwnvHGd1EMPK0CuodM8d8hgDvFwTfIDzJY04QIQ6/KrBFaWhnCXJsy+HMb47GovwBbq67IK6eb2WJgBg=="; }; }; - "apollo-tracing-0.5.2" = { + "apollo-tracing-0.6.0" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.5.2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.5.2.tgz"; - sha512 = "2FdwRvPIq9uuF6OzONroXep6VBGqzHOkP6LlcFQe7SdwxfRP+SD/ycHNSC1acVg2b8d+am9Kzqg2vV54UpOIKA=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.6.0.tgz"; + sha512 = "OpYPHVBgcQ/HT2WLXJQWwhilzR1rrl01tZeMU2N7yinsp/oyKngF5aUSMtuvX1k/T3abilQo+w10oAQlBCGdPA=="; }; }; - "apollo-upload-client-10.0.0" = { + "apollo-upload-client-10.0.1" = { name = "apollo-upload-client"; packageName = "apollo-upload-client"; - version = "10.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-upload-client/-/apollo-upload-client-10.0.0.tgz"; - sha512 = "N0SENiEkZXoY4nl9xxrXFcj/cL0AVkSNQ4aYXSaruCBWE0aKpK6aCe4DBmiEHrK3FAsMxZPEJxBRIWNbsXT8dw=="; + url = "https://registry.npmjs.org/apollo-upload-client/-/apollo-upload-client-10.0.1.tgz"; + sha512 = "K6WnuYQi0RRTNO+aSPVjoUWXp4QSr+eoKU4fE0OKQp25XRF2oXl2cTLs+Q4Nk0wOIHM76YGdo/IHtzuNR7jO+A=="; }; }; "apollo-utilities-1.2.1" = { @@ -3829,13 +4009,13 @@ let sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b"; }; }; - "append-batch-0.0.1" = { + "append-batch-0.0.2" = { name = "append-batch"; packageName = "append-batch"; - version = "0.0.1"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/append-batch/-/append-batch-0.0.1.tgz"; - sha1 = "9224858e556997ccc07f11f1ee9a128532aa0d25"; + url = "https://registry.npmjs.org/append-batch/-/append-batch-0.0.2.tgz"; + sha1 = "d739b4503888245d47933d47562b1149ff9df8b7"; }; }; "append-buffer-1.0.2" = { @@ -4189,6 +4369,15 @@ let sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; }; }; + "array-includes-3.0.3" = { + name = "array-includes"; + packageName = "array-includes"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz"; + sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; + }; + }; "array-indexofobject-0.0.1" = { name = "array-indexofobject"; packageName = "array-indexofobject"; @@ -4207,6 +4396,15 @@ let sha1 = "2fa74b26739371c3947bd7a7adc73be334b3d795"; }; }; + "array-iterate-1.1.3" = { + name = "array-iterate"; + packageName = "array-iterate"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.3.tgz"; + sha512 = "7MIv7HE9MuzfK6B2UnWv07oSHBLOaY1UUXAxZ07bIeRM+4IkPTlveMDs9MY//qvxPZPSvCn2XV4bmtQgSkVodg=="; + }; + }; "array-last-1.3.0" = { name = "array-last"; packageName = "array-last"; @@ -4324,6 +4522,15 @@ let sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; }; }; + "array.prototype.find-2.0.4" = { + name = "array.prototype.find"; + packageName = "array.prototype.find"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz"; + sha1 = "556a5c5362c08648323ddaeb9de9d14bc1864c90"; + }; + }; "arraybuffer.slice-0.0.6" = { name = "arraybuffer.slice"; packageName = "arraybuffer.slice"; @@ -4396,13 +4603,13 @@ let sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; - "assert-1.4.1" = { + "assert-1.5.0" = { name = "assert"; packageName = "assert"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; }; }; "assert-plus-0.1.2" = { @@ -4459,13 +4666,13 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-types-0.12.3" = { + "ast-types-0.12.4" = { name = "ast-types"; packageName = "ast-types"; - version = "0.12.3"; + version = "0.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.12.3.tgz"; - sha512 = "wJUcAfrdW+IgDoMGNz5MmcvahKgB7BwIbLupdKVVHxHNYt+HVR2k35swdYNv9aZpF8nvlkjbnkp2rrNwxGckZA=="; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.12.4.tgz"; + sha512 = "ky/YVYCbtVAS8TdMIaTiPFHwEpRB5z1hctepJplTr3UW5q8TDrpIMCILyk8pmLxGtn2KCtC/lSn7zOsaI7nzDw=="; }; }; "ast-types-0.9.6" = { @@ -4756,13 +4963,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.441.0" = { + "aws-sdk-2.453.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.441.0"; + version = "2.453.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.441.0.tgz"; - sha512 = "PnS2lih7p6sPJYUeUSxab7VNsldcHEsCJddHXnnAZRxd2nVa8pAAbPSAauJIN9E6Z4DBhvX3nuQjj+roP/KBTg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.453.0.tgz"; + sha512 = "UsofQeX8XVElr4+bqw47jOZUGNiwUdFVTNyOdOHcK14RHH2ySsve6JWyvQT8L2rS//XQP1OBIQo20PAl1Zf7ig=="; }; }; "aws-sign2-0.6.0" = { @@ -5314,15 +5521,6 @@ let sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; }; }; - "babylon-7.0.0-beta.19" = { - name = "babylon"; - packageName = "babylon"; - 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=="; - }; - }; "babylon-walk-1.0.2" = { name = "babylon-walk"; packageName = "babylon-walk"; @@ -5368,13 +5566,13 @@ let sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; }; }; - "bail-1.0.3" = { + "bail-1.0.4" = { name = "bail"; packageName = "bail"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz"; - sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg=="; + url = "https://registry.npmjs.org/bail/-/bail-1.0.4.tgz"; + sha512 = "S8vuDB4w6YpRhICUDET3guPlQpaJl7od94tpZ0Fvnyp+MKW/HyDTcRDck+29C9g+d/qQHnddRH3+94kZdrW0Ww=="; }; }; "balanced-match-1.0.0" = { @@ -5773,13 +5971,13 @@ let sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; }; - "binwrap-0.2.0" = { + "binwrap-0.2.1" = { name = "binwrap"; packageName = "binwrap"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/binwrap/-/binwrap-0.2.0.tgz"; - sha512 = "HUspivC8zPE37KJQ0S4zsNHUpymzQBinmpdMoa+JwmB6Mi+p30ywVZJcillYpbQmiX2wLykaaDJxXmwZkbaZGA=="; + url = "https://registry.npmjs.org/binwrap/-/binwrap-0.2.1.tgz"; + sha512 = "kILc2+zMfFEv66/NLfO2GIpmWRPE8hL68fv+o5A94OlN9AIIG4zernpgn9bpPAImb5t4QwFxnqAGSyP1+tGKrA=="; }; }; "bitfield-0.1.0" = { @@ -6079,6 +6277,15 @@ let sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4"; }; }; + "body-parser-1.19.0" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + }; + }; "bonjour-3.5.0" = { name = "bonjour"; packageName = "bonjour"; @@ -6106,6 +6313,15 @@ let sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; }; }; + "bootstrap-vue-helper-json-1.1.1" = { + name = "bootstrap-vue-helper-json"; + packageName = "bootstrap-vue-helper-json"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bootstrap-vue-helper-json/-/bootstrap-vue-helper-json-1.1.1.tgz"; + sha512 = "SiHJE2jEXjAL3TewN99wDl5Ehpm5DKA75oIyiY+2EMWWMPhIuZlQ/AvDzsLktNkwhylmAVLwiW+nuBPIU7kcoQ=="; + }; + }; "bottleneck-1.5.3" = { name = "bottleneck"; packageName = "bottleneck"; @@ -6385,13 +6601,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.5.5" = { + "browserslist-4.5.6" = { name = "browserslist"; packageName = "browserslist"; - version = "4.5.5"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.5.5.tgz"; - sha512 = "0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.5.6.tgz"; + sha512 = "o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg=="; }; }; "bser-2.0.0" = { @@ -6412,6 +6628,33 @@ let sha1 = "337766da15801210fdd956c22e9c6891ab9d0337"; }; }; + "bubble-stream-error-0.0.1" = { + name = "bubble-stream-error"; + packageName = "bubble-stream-error"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bubble-stream-error/-/bubble-stream-error-0.0.1.tgz"; + sha1 = "55eb86846ecf26605e896aa2f1a31b3c9dcccb62"; + }; + }; + "bubble-stream-error-1.0.0" = { + name = "bubble-stream-error"; + packageName = "bubble-stream-error"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bubble-stream-error/-/bubble-stream-error-1.0.0.tgz"; + sha1 = "7dad97f17128da396169bf37ada4acb195361e30"; + }; + }; + "buefy-helper-json-1.0.3" = { + name = "buefy-helper-json"; + packageName = "buefy-helper-json"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/buefy-helper-json/-/buefy-helper-json-1.0.3.tgz"; + sha512 = "HniEmRONcLP8qKJEw/DXZGwyHfRedYX1HGqhNZ5N2zhn+xIrAjhptkAbXRBGV0GhPb+YTbzObGn3GlAHaBiVnQ=="; + }; + }; "buffer-4.9.1" = { name = "buffer"; packageName = "buffer"; @@ -7006,13 +7249,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30000962" = { + "caniuse-lite-1.0.30000967" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000962"; + version = "1.0.30000967"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000962.tgz"; - sha512 = "WXYsW38HK+6eaj5IZR16Rn91TGhU3OhbwjKZvJ4HN/XBIABLKfbij9Mnd3pM0VEwZSlltWjoWg3I8FQ0DGgNOA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz"; + sha512 = "rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ=="; }; }; "capture-exit-2.0.0" = { @@ -7060,13 +7303,13 @@ let sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544"; }; }; - "catharsis-0.8.9" = { + "catharsis-0.8.10" = { name = "catharsis"; packageName = "catharsis"; - version = "0.8.9"; + version = "0.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz"; - sha1 = "98cc890ca652dd2ef0e70b37925310ff9e90fc8b"; + url = "https://registry.npmjs.org/catharsis/-/catharsis-0.8.10.tgz"; + sha512 = "l2OUaz/3PU3MZylspVFJvwHCVfWyvcduPq4lv3AzZ2pJzZCo7kNKFNyatwujD7XgvGkNAE/Jhhbh2uARNwNkfw=="; }; }; "caw-2.0.1" = { @@ -7078,13 +7321,13 @@ let sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; }; }; - "ccount-1.0.3" = { + "ccount-1.0.4" = { name = "ccount"; packageName = "ccount"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz"; - sha512 = "Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw=="; + url = "https://registry.npmjs.org/ccount/-/ccount-1.0.4.tgz"; + sha512 = "fpZ81yYfzentuieinmGnphk0pLkOTMm6MZdVqwd77ROvhko6iujLNGrHH5E7utq3ygWklwfmwuG+A7P+NpqT6w=="; }; }; "center-align-0.1.3" = { @@ -7204,40 +7447,40 @@ let sha512 = "2AZp7uJZbYEzRPsFoa+ijKdvp9zsrnnt6+yFokfwEpeJm0xuJDVoxiRCAaTzyJND8GJkofo2IcKWaUZ/OECVzw=="; }; }; - "character-entities-1.2.2" = { + "character-entities-1.2.3" = { name = "character-entities"; packageName = "character-entities"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz"; - sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ=="; + url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.3.tgz"; + sha512 = "yB4oYSAa9yLcGyTbB4ItFwHw43QHdH129IJ5R+WvxOkWlyFnR5FAaBNnUq4mcxsTVZGh28bHoeTHMKXH1wZf3w=="; }; }; - "character-entities-html4-1.1.2" = { + "character-entities-html4-1.1.3" = { name = "character-entities-html4"; packageName = "character-entities-html4"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz"; - sha512 = "sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw=="; + url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.3.tgz"; + sha512 = "SwnyZ7jQBCRHELk9zf2CN5AnGEc2nA+uKMZLHvcqhpPprjkYhiLn0DywMHgN5ttFZuITMATbh68M6VIVKwJbcg=="; }; }; - "character-entities-legacy-1.1.2" = { + "character-entities-legacy-1.1.3" = { name = "character-entities-legacy"; packageName = "character-entities-legacy"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz"; - sha512 = "9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA=="; + url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz"; + sha512 = "YAxUpPoPwxYFsslbdKkhrGnXAtXoHNgYjlBM3WMXkWGTl5RsY3QmOyhwAgL8Nxm9l5LBThXGawxKPn68y6/fww=="; }; }; - "character-reference-invalid-1.1.2" = { + "character-reference-invalid-1.1.3" = { name = "character-reference-invalid"; packageName = "character-reference-invalid"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz"; - sha512 = "7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ=="; + url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz"; + sha512 = "VOq6PRzQBam/8Jm6XBGk2fNEnHXAdGd6go0rtd4weAGECBamHDwwCQSOT12TACIYUZegUXnV6xBXqUssijtxIg=="; }; }; "chardet-0.4.2" = { @@ -7276,6 +7519,15 @@ let sha512 = "RcdumNsM6fJZ5HHbYunqj2bpurVRGsXour3OR+SlLEHFhG6ALm54i6Osnh+OvO7kEoSBzwExpblYFH8zKQiEPw=="; }; }; + "check-ends-with-period-1.0.1" = { + name = "check-ends-with-period"; + packageName = "check-ends-with-period"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/check-ends-with-period/-/check-ends-with-period-1.0.1.tgz"; + sha1 = "d7d29d614cbc3ed15ab54190f4fda4deaa3141d8"; + }; + }; "check-error-1.0.2" = { name = "check-error"; packageName = "check-error"; @@ -7348,6 +7600,15 @@ let sha512 = "9vhoi1qXSBPn6//ZxIgSe3M2QhKHzIPZQzmrZgmPADsqW0Jxpe3db1e7aGSRUMXbxAQ04SfypdT8dGaSvIvKDw=="; }; }; + "chokidar-1.5.2" = { + name = "chokidar"; + packageName = "chokidar"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-1.5.2.tgz"; + sha1 = "293e728640cc93dd8277424334b3c6d4ad3a348a"; + }; + }; "chokidar-1.6.0" = { name = "chokidar"; packageName = "chokidar"; @@ -8059,13 +8320,13 @@ let sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; }; }; - "collapse-white-space-1.0.4" = { + "collapse-white-space-1.0.5" = { name = "collapse-white-space"; packageName = "collapse-white-space"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz"; - sha512 = "YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw=="; + url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.5.tgz"; + sha512 = "703bOOmytCYAX9cXYqoikYIx6twmFCXsnzRQheBcTG3nzKYBR4P/+wkYeH+Mvj7qUz8zZDtdyzbxfnEi/kYzRQ=="; }; }; "collection-map-1.0.0" = { @@ -8212,13 +8473,13 @@ let sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="; }; }; - "colorspace-1.1.1" = { + "colorspace-1.1.2" = { name = "colorspace"; packageName = "colorspace"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.1.tgz"; - sha512 = "pI3btWyiuz7Ken0BWh9Elzsmv2bM9AhA7psXib4anUXy/orfZ/E0MbQwhSOG/9L8hLlalqrU0UhOuqxW1YjmVw=="; + url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz"; + sha512 = "vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ=="; }; }; "colour-0.7.1" = { @@ -8275,6 +8536,24 @@ let sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; }; }; + "comma-separated-tokens-1.0.6" = { + name = "comma-separated-tokens"; + packageName = "comma-separated-tokens"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.6.tgz"; + sha512 = "f20oA7jsrrmERTS70r3tmRSxR8IJV2MTN7qe6hzgX+3ARfXrdMJFvGWvWQK0xpcBurg9j9eO2MiqzZ8Y+/UPCA=="; + }; + }; + "command-exists-1.2.6" = { + name = "command-exists"; + packageName = "command-exists"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.6.tgz"; + sha512 = "Qst/zUUNmS/z3WziPxyqjrcz09pm+2Knbs5mAZL4VAE0sSrNY1/w8+/YxeHcoBTsO6iojA6BW7eFf27Eg2MRuw=="; + }; + }; "command-exists-1.2.8" = { name = "command-exists"; packageName = "command-exists"; @@ -8527,13 +8806,13 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "compressible-2.0.16" = { + "compressible-2.0.17" = { name = "compressible"; packageName = "compressible"; - version = "2.0.16"; + version = "2.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz"; - sha512 = "JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA=="; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz"; + sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw=="; }; }; "compression-1.5.2" = { @@ -9616,6 +9895,15 @@ let sha1 = "5908668294a1becd261ae0a4ce21b0b551f21d16"; }; }; + "css-parse-1.7.0" = { + name = "css-parse"; + packageName = "css-parse"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"; + sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; + }; + }; "css-select-1.2.0" = { name = "css-select"; packageName = "css-select"; @@ -9643,6 +9931,15 @@ let sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; }; }; + "css-selector-parser-1.3.0" = { + name = "css-selector-parser"; + packageName = "css-selector-parser"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.3.0.tgz"; + sha1 = "5f1ad43e2d8eefbfdc304fcd39a521664943e3eb"; + }; + }; "css-selector-tokenizer-0.7.1" = { name = "css-selector-tokenizer"; packageName = "css-selector-tokenizer"; @@ -9913,6 +10210,15 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; + "cuss-1.13.1" = { + name = "cuss"; + packageName = "cuss"; + version = "1.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cuss/-/cuss-1.13.1.tgz"; + sha512 = "1rFdRmBBnv5fbwsMq6ChZsAmn6Ev9AzinaLZb3zIqlNiQDx3AzoZilwiEVes3AL/udNHY2qoEGkT/iDaXBap+g=="; + }; + }; "custom-error-instance-2.1.1" = { name = "custom-error-instance"; packageName = "custom-error-instance"; @@ -10201,13 +10507,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "deasync-0.1.14" = { + "deasync-0.1.15" = { name = "deasync"; packageName = "deasync"; - version = "0.1.14"; + version = "0.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.14.tgz"; - sha512 = "wN8sIuEqIwyQh72AG7oY6YQODCxIp1eXzEZlZznBuwDF8Q03Tdy9QNp1BNZXeadXoklNrw+Ip1fch+KXo/+ASw=="; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.15.tgz"; + sha512 = "pxMaCYu8cQIbGkA4Y1R0PLSooPIpH1WgFBLeJ+zLxQgHfkZG86ViJSmZmONSjZJ/R3NjwkMcIWZAzpLB2G9/CA=="; }; }; "death-1.1.0" = { @@ -10264,6 +10570,15 @@ let sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; }; }; + "debug-0.8.1" = { + name = "debug"; + packageName = "debug"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; + sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; + }; + }; "debug-1.0.5" = { name = "debug"; packageName = "debug"; @@ -10381,13 +10696,13 @@ let sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; }; }; - "decimal.js-10.1.1" = { + "decimal.js-10.2.0" = { name = "decimal.js"; packageName = "decimal.js"; - version = "10.1.1"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.1.1.tgz"; - sha512 = "vEEgyk1fWVEnv7lPjkNedAIjzxQDue5Iw4FeX4UkNUDSVyD/jZTD0Bw2kAO7k6iyyJRAhM9oxxI0D1ET6k0Mmg=="; + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz"; + sha512 = "vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw=="; }; }; "decode-uri-component-0.2.0" = { @@ -11173,6 +11488,15 @@ let sha1 = "f805211dcac74f6bb3a4d5d5541ad783b1b67d22"; }; }; + "dlv-1.1.2" = { + name = "dlv"; + packageName = "dlv"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dlv/-/dlv-1.1.2.tgz"; + sha512 = "xxD4VSH67GbRvSGUrckvha94RD7hjgOH7rqGxiytLpkaeMvixOHFZTGFK6EkIm3T761OVHT8ABHmGkq9gXgu6Q=="; + }; + }; "dnd-page-scroll-0.0.4" = { name = "dnd-page-scroll"; packageName = "dnd-page-scroll"; @@ -11506,6 +11830,15 @@ let sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; }; }; + "draftlog-1.0.12" = { + name = "draftlog"; + packageName = "draftlog"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/draftlog/-/draftlog-1.0.12.tgz"; + sha1 = "7db6a3c5b62106bb32dd4a35d67bcccb6c7d9da0"; + }; + }; "dreamopt-0.6.0" = { name = "dreamopt"; packageName = "dreamopt"; @@ -11587,6 +11920,15 @@ let sha512 = "1N+eCCrepIeK1+qtWrMEO1CV68Hn+TLbiR9c70VB3xnut3DmUxT+3T7sRHhb0mpK2F/74IfP+loQDriU2W9lkA=="; }; }; + "e-prime-0.10.2" = { + name = "e-prime"; + packageName = "e-prime"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/e-prime/-/e-prime-0.10.2.tgz"; + sha1 = "ea9375eb985636de88013c7a9fb129ad9e15eff8"; + }; + }; "each-async-1.1.1" = { name = "each-async"; packageName = "each-async"; @@ -11731,13 +12073,13 @@ let sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; }; }; - "electron-to-chromium-1.3.125" = { + "electron-to-chromium-1.3.133" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.125"; + version = "1.3.133"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.125.tgz"; - sha512 = "XxowpqQxJ4nDwUXHtVtmEhRqBpm2OnjBomZmZtHD0d2Eo0244+Ojezhk3sD/MBSSe2nxCdGQFRXHIsf/LUTL9A=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.133.tgz"; + sha512 = "lyoC8aoqbbDqsprb6aPdt9n3DpOZZzdz/T4IZKsR0/dkZIxnJVUjjcpOSwA66jPRIOyDAamCTAUqweU05kKNSg=="; }; }; "elegant-spinner-1.0.1" = { @@ -11749,6 +12091,15 @@ let sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; }; }; + "element-helper-json-2.0.5" = { + name = "element-helper-json"; + packageName = "element-helper-json"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/element-helper-json/-/element-helper-json-2.0.5.tgz"; + sha512 = "XBFDNA4aAygKLqt3S7jhwWivUJInO9Yw2zlJjayPDSNDsg9OMIHbi/UE3JfJq7kw9BHDn6CchnSRVIcWG1AuzA=="; + }; + }; "elementtree-0.1.7" = { name = "elementtree"; packageName = "elementtree"; @@ -11822,6 +12173,15 @@ let sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; }; }; + "emoji-regex-6.5.1" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.5.1.tgz"; + sha512 = "PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ=="; + }; + }; "emoji-regex-7.0.3" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -11939,6 +12299,15 @@ let sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; }; }; + "end-with-1.0.2" = { + name = "end-with"; + packageName = "end-with"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/end-with/-/end-with-1.0.2.tgz"; + sha1 = "a432755ab4f51e7fc74f3a719c6b81df5d668bdc"; + }; + }; "endent-1.3.0" = { name = "endent"; packageName = "endent"; @@ -12128,13 +12497,13 @@ let sha512 = "38LJhrmyQafVInoYlaEDxomIfjtK+HUtp1JsInWdKtpxk0MlTU60fqYHg0LrKgxxJuq6H89ddw4IkxfQejZ77g=="; }; }; - "envinfo-7.2.0" = { + "envinfo-7.3.1" = { name = "envinfo"; packageName = "envinfo"; - version = "7.2.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-7.2.0.tgz"; - sha512 = "hHDGx34o8V0IULC6MnMb+jIMEJ5LBuK/EIbFi8/aw81r6q+wXCvu9QCA9RPbpOaBxtlH/16cYB2HkBnRFTy4SQ=="; + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.3.1.tgz"; + sha512 = "GvXiDTqLYrORVSCuJCsWHPXF5BFvoWMQA9xX4YVjPT1jyS3aZEHUBwjzxU/6LTPF9ReHgVEbX7IEN5UvSXHw/A=="; }; }; "epidemic-broadcast-trees-6.3.5" = { @@ -12200,13 +12569,13 @@ let sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f"; }; }; - "errorhandler-1.5.0" = { + "errorhandler-1.5.1" = { name = "errorhandler"; packageName = "errorhandler"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.0.tgz"; - sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4"; + url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.1.tgz"; + sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; "es-abstract-1.13.0" = { @@ -12227,13 +12596,13 @@ let sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.49" = { + "es5-ext-0.10.50" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.49"; + version = "0.10.50"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz"; - sha512 = "3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz"; + sha512 = "KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw=="; }; }; "es5-ext-0.8.2" = { @@ -12434,6 +12803,15 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "escape-string-regexp-2.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; + sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; + }; + }; "escodegen-1.11.1" = { name = "escodegen"; packageName = "escodegen"; @@ -12470,6 +12848,15 @@ let sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; }; + "eslint-4.19.1" = { + name = "eslint"; + packageName = "eslint"; + version = "4.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz"; + sha512 = "bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ=="; + }; + }; "eslint-5.13.0" = { name = "eslint"; packageName = "eslint"; @@ -12497,6 +12884,15 @@ let sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; }; }; + "eslint-plugin-vue-5.2.2" = { + name = "eslint-plugin-vue"; + packageName = "eslint-plugin-vue"; + version = "5.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.2.2.tgz"; + sha512 = "CtGWH7IB0DA6BZOwcV9w9q3Ri6Yuo8qMjx05SmOGJ6X6E0Yo3y9E/gQ5tuNxg2dEt30tRnBoFTbvtmW9iEoyHA=="; + }; + }; "eslint-scope-3.7.1" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -12506,6 +12902,15 @@ let sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; }; }; + "eslint-scope-3.7.3" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "3.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz"; + sha512 = "W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA=="; + }; + }; "eslint-scope-4.0.3" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -12551,6 +12956,15 @@ let sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A=="; }; }; + "espree-4.1.0" = { + name = "espree"; + packageName = "espree"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz"; + sha512 = "I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w=="; + }; + }; "espree-5.0.0" = { name = "espree"; packageName = "espree"; @@ -12722,6 +13136,15 @@ let sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; }; }; + "event-stream-3.1.7" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz"; + sha1 = "b4c540012d0fe1498420f3d8946008db6393c37a"; + }; + }; "event-stream-3.2.2" = { name = "event-stream"; packageName = "event-stream"; @@ -12776,13 +13199,13 @@ let sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; }; }; - "eventemitter3-3.1.0" = { + "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz"; - sha512 = "ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz"; + sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; "events-1.1.1" = { @@ -13505,13 +13928,13 @@ let sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; }; }; - "fault-1.0.2" = { + "fault-1.0.3" = { name = "fault"; packageName = "fault"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fault/-/fault-1.0.2.tgz"; - sha512 = "o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw=="; + url = "https://registry.npmjs.org/fault/-/fault-1.0.3.tgz"; + sha512 = "sfFuP4X0hzrbGKjAUNXYvNqsZ5F6ohx/dZ9I0KQud/aiZNwg263r5L9yGB0clvXHCkzXh5W3t7RSHchggYIFmA=="; }; }; "faye-websocket-0.11.1" = { @@ -14063,13 +14486,22 @@ let sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }; }; - "flatstr-1.0.9" = { + "flatmap-0.0.3" = { + name = "flatmap"; + packageName = "flatmap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/flatmap/-/flatmap-0.0.3.tgz"; + sha1 = "1f18a4d938152d495965f9c958d923ab2dd669b4"; + }; + }; + "flatstr-1.0.11" = { name = "flatstr"; packageName = "flatstr"; - version = "1.0.9"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.9.tgz"; - sha512 = "qFlJnOBWDfIaunF54/lBqNKmXOI0HqNhu+mHkLmbaBXlS71PUd9OjFOdyevHt/aHoHB1+eW7eKHgRKOG5aHSpw=="; + url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.11.tgz"; + sha512 = "CrkRmL8HgArqohPW5udNdtVae+fj5tvJdHwoo91m5OvaLk1a4lqa0R4/aPUO2zbVEnIrk+i5uTVNbSxaR1dQkQ=="; }; }; "flatted-2.0.0" = { @@ -14153,13 +14585,13 @@ let sha512 = "XUAxCNnVdxuiUnswQ6bsYb/c4ObX0LupwDGI1GjowN5hQne0BTiB8p74dXr3nbx69WwE/4fNbFcLmuvWIcx6Tg=="; }; }; - "flumelog-offset-3.3.2" = { + "flumelog-offset-3.4.1" = { name = "flumelog-offset"; packageName = "flumelog-offset"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.3.2.tgz"; - sha512 = "KG0TCb+cWuEvnL44xjBhVNu+jRmJ8Msh2b1krYb4FllLwSbjreaCU/hH3uzv+HmUrtU/EhJepcAu79WxLH3EZQ=="; + url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.4.1.tgz"; + sha512 = "sO10aEcSI1TOphuAFjNJ+qADb0Aix68ENVjfINQF2r9fNQ2mDzYHOZ/RMRR/ZeE5t3vAKfQJMhJN5Qctk7Ngfw=="; }; }; "flumeview-hashtable-1.0.4" = { @@ -14216,6 +14648,15 @@ let sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; }; }; + "fn-name-2.0.1" = { + name = "fn-name"; + packageName = "fn-name"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz"; + sha1 = "5214d7537a4d06a4a301c0cc262feb84188002e7"; + }; + }; "follow-redirects-1.7.0" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -14495,13 +14936,13 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; - "fs-capacitor-2.0.1" = { + "fs-capacitor-2.0.4" = { name = "fs-capacitor"; packageName = "fs-capacitor"; - version = "2.0.1"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.1.tgz"; - sha512 = "kyV2oaG1/pu9NPosfGACmBym6okgzyg6hEtA5LSUq0dGpGLe278MVfMwVnSHDA/OBcTCHkPNqWL9eIwbPN6dDg=="; + url = "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.4.tgz"; + sha512 = "8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA=="; }; }; "fs-chunk-store-1.7.0" = { @@ -14684,13 +15125,13 @@ let sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg=="; }; }; - "fsevents-1.2.8" = { + "fsevents-1.2.9" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.8.tgz"; - sha512 = "tPvHgPGB7m40CZ68xqFGkKuzN+RnpGmSV+hgeKxhRpbxdqKXUFJGC3yonBOLzQBcJyGpdZFDfCsdOC2KFsXzeA=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz"; + sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw=="; }; }; "fsevents-2.0.1" = { @@ -15071,6 +15512,15 @@ let sha1 = "6d33f7ed63db0d0e118131503bab3aca47d54664"; }; }; + "git-diff-tree-1.0.0" = { + name = "git-diff-tree"; + packageName = "git-diff-tree"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-diff-tree/-/git-diff-tree-1.0.0.tgz"; + sha1 = "141e5641769d065997a6b94c3a2c60e062b54da8"; + }; + }; "git-packidx-parser-1.0.0" = { name = "git-packidx-parser"; packageName = "git-packidx-parser"; @@ -15125,6 +15575,15 @@ let sha512 = "34lMF7Yo1xEmsK2EkbArdoU79umpvm0MfzaDkSNYSJqtM5QLAVTPWgpiXSVI5o/O9EvZPSrP4Zvnec/CqhSd5w=="; }; }; + "git-spawned-stream-0.1.1" = { + name = "git-spawned-stream"; + packageName = "git-spawned-stream"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/git-spawned-stream/-/git-spawned-stream-0.1.1.tgz"; + sha1 = "38927da02e52d862396861bf996557452643802b"; + }; + }; "git-ssb-web-2.8.0" = { name = "git-ssb-web"; packageName = "git-ssb-web"; @@ -15224,6 +15683,24 @@ let sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; }; }; + "glob-7.0.4" = { + name = "glob"; + packageName = "glob"; + version = "7.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.4.tgz"; + sha1 = "3b44afa0943bdc31b2037b934791e2e084bcb7f6"; + }; + }; + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + }; + }; "glob-7.1.1" = { name = "glob"; packageName = "glob"; @@ -15251,6 +15728,15 @@ let sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; + "glob-7.1.4" = { + name = "glob"; + packageName = "glob"; + version = "7.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; + }; + }; "glob-base-0.3.0" = { name = "glob-base"; packageName = "glob-base"; @@ -15387,13 +15873,13 @@ let sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; }; }; - "globals-11.11.0" = { + "globals-11.12.0" = { name = "globals"; packageName = "globals"; - version = "11.11.0"; + version = "11.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz"; - sha512 = "WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw=="; + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; "globals-9.18.0" = { @@ -15621,13 +16107,13 @@ let sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog=="; }; }; - "graphql-14.2.1" = { + "graphql-14.3.0" = { name = "graphql"; packageName = "graphql"; - version = "14.2.1"; + version = "14.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-14.2.1.tgz"; - sha512 = "2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ=="; + url = "https://registry.npmjs.org/graphql/-/graphql-14.3.0.tgz"; + sha512 = "MdfI4v7kSNC3NhB7cF8KNijDsifuWO2XOtzpyququqaclO8wVuChYv+KogexDwgP5sp7nFI9Z6N4QHgoLkfjrg=="; }; }; "graphql-anywhere-4.2.1" = { @@ -15675,22 +16161,13 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.5.4" = { + "graphql-extensions-0.6.0" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.5.4"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.4.tgz"; - sha512 = "qLThJGVMqcItE7GDf/xX/E40m/aeqFheEKiR5bfra4q5eHxQKGjnIc20P9CVqjOn9I0FkEiU9ypOobfmIf7t6g=="; - }; - }; - "graphql-extensions-0.5.7" = { - name = "graphql-extensions"; - packageName = "graphql-extensions"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.7.tgz"; - sha512 = "HrU6APE1PiehZ46scMB3S5DezSeCATd8v+e4mmg2bqszMyCFkmAnmK6hR1b5VjHxhzt5/FX21x1WsXfqF4FwdQ=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.6.0.tgz"; + sha512 = "SshzmbD68fHXRv2q3St29olMOxHDLQ5e9TOh+Tz2BYxinrfhjFaPNcEefiK/vF295wW827Y58bdO11Xmhf8J+Q=="; }; }; "graphql-import-0.4.5" = { @@ -15792,13 +16269,13 @@ let sha512 = "/tq02ayMQjrG4oDFDRLLrPk0KvJXue0nVXoItBe7uAdbNXjQUu+HYCBdAmPLQoseVzUKKMzrhq2P/sfI76ON6w=="; }; }; - "graphql-upload-8.0.5" = { + "graphql-upload-8.0.6" = { name = "graphql-upload"; packageName = "graphql-upload"; - version = "8.0.5"; + version = "8.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-upload/-/graphql-upload-8.0.5.tgz"; - sha512 = "iv8R/E1b0GJ203Z2sdPgnCnU8tl9hQY+jkebiTNAjsWBT3j/I5VLBnPJdDhJSKIreWJ4/1LZjgOt60qjnH4/EQ=="; + url = "https://registry.npmjs.org/graphql-upload/-/graphql-upload-8.0.6.tgz"; + sha512 = "cBRALMOvGBm2AD6M61b1QbSmKfCLXvgV+Z3wXT2JS1EQwGWQ1g5/sby4J/cpwAaGnq5P2eGp+N3HQI9cSn9Jfg=="; }; }; "gray-matter-2.1.1" = { @@ -15810,6 +16287,15 @@ let sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e"; }; }; + "gridsome-helper-json-1.0.3" = { + name = "gridsome-helper-json"; + packageName = "gridsome-helper-json"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/gridsome-helper-json/-/gridsome-helper-json-1.0.3.tgz"; + sha512 = "CgXlq3PGpBRj8RMnLSYs46Hvl5q9Up9kwuMAcYlvS4sNgH5j4Ao7hbY+HI62PaYTeIdffiJidLEIeZVCmZCrFA=="; + }; + }; "grouped-queue-0.3.3" = { name = "grouped-queue"; packageName = "grouped-queue"; @@ -16269,6 +16755,69 @@ let sha512 = "0cMsjjIC8I+D3M44pOQdsy0OHXGLVz6Z0beRuufhKa0KfaD2wGwAev6jILzXsd3/vpnNQJmWyZtIILqM1N+n5A=="; }; }; + "hast-util-embedded-1.0.2" = { + name = "hast-util-embedded"; + packageName = "hast-util-embedded"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-embedded/-/hast-util-embedded-1.0.2.tgz"; + sha512 = "m09+gydYBWVT2Csfau4OtkzpMV5HYtWrTTT1cbokW/Pqz/6re8qP2wZ9zuMmBz3SfBQVXyLJF+9q8Ut//KED4w=="; + }; + }; + "hast-util-has-property-1.0.2" = { + name = "hast-util-has-property"; + packageName = "hast-util-has-property"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-1.0.2.tgz"; + sha512 = "EBzRiKIIe9wouLSjqun5ti0oYcEe5U1eEpuOPtcihmP3KvFRovOmmXypf1B/QalQr9S4YoVgLOSg6gW98ihRbA=="; + }; + }; + "hast-util-is-body-ok-link-1.0.1" = { + name = "hast-util-is-body-ok-link"; + packageName = "hast-util-is-body-ok-link"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.1.tgz"; + sha512 = "qFDY0oz0lbc0DOcy61BSgJo+wi/ykFs4p95YjrtRP81eNfmBPs/Z0j4WLFmepJ6znfxLlRcPpic8FOdzCD5aKw=="; + }; + }; + "hast-util-is-element-1.0.2" = { + name = "hast-util-is-element"; + packageName = "hast-util-is-element"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.0.2.tgz"; + sha512 = "4MEtyofNi3ZunPFrp9NpTQdNPN24xvLX3M+Lr/RGgPX6TLi+wR4/DqeoyQ7lwWcfUp4aevdt4RR0r7ZQPFbHxw=="; + }; + }; + "hast-util-parse-selector-2.2.1" = { + name = "hast-util-parse-selector"; + packageName = "hast-util-parse-selector"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.1.tgz"; + sha512 = "Xyh0v+nHmQvrOqop2Jqd8gOdyQtE8sIP9IQf7mlVDqp924W4w/8Liuguk2L2qei9hARnQSG2m+wAOCxM7npJVw=="; + }; + }; + "hast-util-to-string-1.0.1" = { + name = "hast-util-to-string"; + packageName = "hast-util-to-string"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.1.tgz"; + sha512 = "EC6awGe0ZMUNYmS2hMVaKZxvjVtQA4RhXjtgE20AxGG49MM7OUUfaHc6VcVYv2YwzNlrZQGe5teimCxW1Rk+fA=="; + }; + }; + "hast-util-whitespace-1.0.2" = { + name = "hast-util-whitespace"; + packageName = "hast-util-whitespace"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.2.tgz"; + sha512 = "4JT8B0HKPHBMFZdDQzexjxwhKx9TrpV/+uelvmqlPu8RqqDrnNIEHDtDZCmgE+4YmcFAtKVPLmnY3dQGRaN53A=="; + }; + }; "hat-0.0.3" = { name = "hat"; packageName = "hat"; @@ -16512,6 +17061,24 @@ let sha1 = "c78de65b5663aa597989dd2b7ab49200d7e4db98"; }; }; + "html-void-elements-1.0.4" = { + name = "html-void-elements"; + packageName = "html-void-elements"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.4.tgz"; + sha512 = "yMk3naGPLrfvUV9TdDbuYXngh/TpHbA6TrOw3HL9kS8yhwx7i309BReNg7CbAJXGE+UMJ6je5OqJ7lC63o6YuQ=="; + }; + }; + "html-whitespace-sensitive-tag-names-1.0.0" = { + name = "html-whitespace-sensitive-tag-names"; + packageName = "html-whitespace-sensitive-tag-names"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.0.tgz"; + sha1 = "fd6ed3a3d631ce29341aefe26a8fea720d3adfa7"; + }; + }; "htmlescape-1.1.1" = { name = "htmlescape"; packageName = "htmlescape"; @@ -16764,13 +17331,13 @@ let sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; }; }; - "hypercore-protocol-6.9.0" = { + "hypercore-protocol-6.10.0" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.9.0"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.9.0.tgz"; - sha512 = "80kUQN6aZhdip4vHRhLyYrJ8Uhj34Xw1RdAtMwQNChoOlnVAvOzVh+ffIs6NiqBF4ExU25ToOvPTaYv+pYZBbg=="; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.10.0.tgz"; + sha512 = "szYbpwkoAH+zLlN8oY1KORbFzG9LmpIc4oO0AqOTlPPFZU+dWUQIYUJXLHzHnrHFIc+8McOeFM+Gx6m256dJjw=="; }; }; "hyperdrive-9.14.5" = { @@ -17457,15 +18024,6 @@ let sha512 = "LgjHkRl9W6bj2n+kWrAOgvCYPTYt+LanE4rtd/vKNq6yEb+SvVV7UTLzoSPpDX6/U1cAz7VfqPr+lPAIz7wHaQ=="; }; }; - "int53-0.2.4" = { - name = "int53"; - packageName = "int53"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/int53/-/int53-0.2.4.tgz"; - sha1 = "5ed8d7aad6c5c6567cae69aa7ffc4a109ee80f86"; - }; - }; "int53-1.0.0" = { name = "int53"; packageName = "int53"; @@ -17628,13 +18186,13 @@ let sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; }; }; - "ip-set-1.0.1" = { + "ip-set-1.0.2" = { name = "ip-set"; packageName = "ip-set"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ip-set/-/ip-set-1.0.1.tgz"; - sha1 = "633b66d0bd6c8d0de968d053263c9120d3b6727e"; + url = "https://registry.npmjs.org/ip-set/-/ip-set-1.0.2.tgz"; + sha512 = "Mb6kv78bTi4RNAIIWL8Bbre7hXOR2pNUi3j8FaQkLaitf/ZWxkq3/iIwXNYk2ACO3IMfdVdQrOkUtwZblO7uBA=="; }; }; "ipaddr.js-1.0.5" = { @@ -17736,22 +18294,22 @@ let sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; - "is-alphabetical-1.0.2" = { + "is-alphabetical-1.0.3" = { name = "is-alphabetical"; packageName = "is-alphabetical"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz"; - sha512 = "V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg=="; + url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.3.tgz"; + sha512 = "eEMa6MKpHFzw38eKm56iNNi6GJ7lf6aLLio7Kr23sJPAECscgRtZvOBYybejWDQ2bM949Y++61PY+udzj5QMLA=="; }; }; - "is-alphanumerical-1.0.2" = { + "is-alphanumerical-1.0.3" = { name = "is-alphanumerical"; packageName = "is-alphanumerical"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz"; - sha512 = "pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg=="; + url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz"; + sha512 = "A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA=="; }; }; "is-arrayish-0.2.1" = { @@ -17826,6 +18384,15 @@ let sha512 = "o6t/DwgEapC0bsloqtegAQyZzQXaQ5+8fzsyf2KmLqupC2ifLFq/lMQiFCJeGpdSrK1o6GL+WW2lRU050lLlFg=="; }; }; + "is-capitalized-1.0.0" = { + name = "is-capitalized"; + packageName = "is-capitalized"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-capitalized/-/is-capitalized-1.0.0.tgz"; + sha1 = "4c8464b4d91d3e4eeb44889dd2cd8f1b0ac4c136"; + }; + }; "is-ci-1.2.1" = { name = "is-ci"; packageName = "is-ci"; @@ -17871,13 +18438,13 @@ let sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; }; - "is-decimal-1.0.2" = { + "is-decimal-1.0.3" = { name = "is-decimal"; packageName = "is-decimal"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz"; - sha512 = "TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg=="; + url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.3.tgz"; + sha512 = "bvLSwoDg2q6Gf+E2LEPiklHZxxiSi3XAh4Mav65mKqTfCO1HM3uBs24TjEH8iJX3bbDdLXKJXBTmGzuTUuAEjQ=="; }; }; "is-descriptor-0.1.6" = { @@ -17934,6 +18501,15 @@ let sha512 = "SpMppC2XR3YdxSzczXReBjqs2zGscWQpBIKqwXYBFic0ERaxNVgwLCHwOLZeESfdJQjX0RDvrJ1lBXX2ij+G1Q=="; }; }; + "is-empty-1.2.0" = { + name = "is-empty"; + packageName = "is-empty"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-empty/-/is-empty-1.2.0.tgz"; + sha1 = "de9bb5b278738a05a0b09a57e1fb4d4a341a9f6b"; + }; + }; "is-equal-shallow-0.1.3" = { name = "is-equal-shallow"; packageName = "is-equal-shallow"; @@ -18051,13 +18627,22 @@ let sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; - "is-hexadecimal-1.0.2" = { + "is-hexadecimal-1.0.3" = { name = "is-hexadecimal"; packageName = "is-hexadecimal"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz"; - sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A=="; + url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz"; + sha512 = "zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA=="; + }; + }; + "is-hidden-1.1.1" = { + name = "is-hidden"; + packageName = "is-hidden"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-hidden/-/is-hidden-1.1.1.tgz"; + sha512 = "175UKecS8+U4hh2PSY0j4xnm2GKYzvSKnbh+naC93JjuBA7LgIo6YxlbcsSo6seFBdQO3RuIcH980yvqqD/2cA=="; }; }; "is-html-1.1.0" = { @@ -18123,13 +18708,13 @@ let sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; - "is-my-json-valid-2.19.0" = { + "is-my-json-valid-2.20.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.19.0"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz"; - sha512 = "mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q=="; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz"; + sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; }; }; "is-natural-number-4.0.1" = { @@ -18240,6 +18825,15 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; + "is-plain-object-3.0.0" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz"; + sha512 = "tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg=="; + }; + }; "is-posix-bracket-0.1.1" = { name = "is-posix-bracket"; packageName = "is-posix-bracket"; @@ -18528,13 +19122,13 @@ let sha1 = "110f9ff74c37f663e1ec7915eb451f2db93ac9df"; }; }; - "is-whitespace-character-1.0.2" = { + "is-whitespace-character-1.0.3" = { name = "is-whitespace-character"; packageName = "is-whitespace-character"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz"; - sha512 = "SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ=="; + url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz"; + sha512 = "SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ=="; }; }; "is-windows-0.2.0" = { @@ -18555,13 +19149,13 @@ let sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; - "is-word-character-1.0.2" = { + "is-word-character-1.0.3" = { name = "is-word-character"; packageName = "is-word-character"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.2.tgz"; - sha512 = "T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA=="; + url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.3.tgz"; + sha512 = "0wfcrFgOOOBdgRNT9H33xe6Zi6yhX/uoc4U8NBZGeQQB0ctU1dnlNTyL9JM2646bHDTpsDm1Brb3VPoCIMrd/A=="; }; }; "is-wsl-1.1.0" = { @@ -18672,6 +19266,15 @@ let sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; }; + "isobject-4.0.0" = { + name = "isobject"; + packageName = "isobject"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz"; + sha512 = "S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="; + }; + }; "isomorphic-fetch-2.2.1" = { name = "isomorphic-fetch"; packageName = "isomorphic-fetch"; @@ -18762,13 +19365,13 @@ let sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }; }; - "jaeger-client-3.14.4" = { + "jaeger-client-3.15.0" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.14.4"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.14.4.tgz"; - sha512 = "+AEI0z3ppLkqOKxUvN6n+qmjDj7O8R+Qr3lO9AXRtuEKxX4p0bfMwqcFiTQPr80twVVdF3wCrZVkcpJysZUL5w=="; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.15.0.tgz"; + sha512 = "0SfuEE7E6XVLhu8th5JG/ACtnIWq4Tad0iSst3+De9HOMSz1RI0Tl1MLXzetudI670rqfCs4m37XCTMRgu8oxg=="; }; }; "javascript-stringify-1.6.0" = { @@ -18861,13 +19464,13 @@ let sha1 = "135b992c0575c985cfa0f494a3227ed238583ece"; }; }; - "jquery-3.4.0" = { + "jquery-3.4.1" = { name = "jquery"; packageName = "jquery"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery/-/jquery-3.4.0.tgz"; - sha512 = "ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ=="; + url = "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz"; + sha512 = "36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="; }; }; "jquery-ui-bundle-1.12.1" = { @@ -18888,13 +19491,13 @@ let sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; }; }; - "js-beautify-1.9.1" = { + "js-beautify-1.10.0" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.1.tgz"; - sha512 = "oxxvVZdOdUfzk8IOLBF2XUZvl2GoBEfA+b0of4u2EBY/46NlXasi8JdFvazA5lCrf9/lQhTjyVy2QCUW7iq0MQ=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.0.tgz"; + sha512 = "OMwf/tPDpE/BLlYKqZOhqWsd3/z2N3KOlyn1wsCRGFwViE8LOQTcDtathQvHvZc+q+zWmcNAbwKSC+iJoMaH2Q=="; }; }; "js-levenshtein-1.1.6" = { @@ -18978,13 +19581,13 @@ let sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; }; - "js2xmlparser-3.0.0" = { + "js2xmlparser-4.0.0" = { name = "js2xmlparser"; packageName = "js2xmlparser"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz"; - sha1 = "3fb60eaa089c5440f9319f51760ccd07e2499733"; + url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.0.tgz"; + sha512 = "WuNgdZOXVmBk5kUPMcTcVUpbGRzLfNkv7+7APq7WiDihpXVKrgxo6wwRpRl9OQeEBgKCVk9mR7RbzrnNWC8oBw=="; }; }; "jsbn-0.1.1" = { @@ -19275,6 +19878,15 @@ let sha512 = "3MWTH77OHLf3muMknZJS4GnDhGPMITyF9D84hpRQrjt1Hk3pBtTiyZcqodHUDSaDq8VDy9YyIbanRI+3RoW3FA=="; }; }; + "jsonc-parser-1.0.3" = { + name = "jsonc-parser"; + packageName = "jsonc-parser"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-1.0.3.tgz"; + sha512 = "hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g=="; + }; + }; "jsonfile-1.0.1" = { name = "jsonfile"; packageName = "jsonfile"; @@ -19690,13 +20302,13 @@ let sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; }; }; - "klaw-2.0.0" = { + "klaw-3.0.0" = { name = "klaw"; packageName = "klaw"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz"; - sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; + url = "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz"; + sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g=="; }; }; "kleur-3.0.3" = { @@ -20122,6 +20734,15 @@ let sha512 = "DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog=="; }; }; + "limit-spawn-0.0.3" = { + name = "limit-spawn"; + packageName = "limit-spawn"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/limit-spawn/-/limit-spawn-0.0.3.tgz"; + sha1 = "cc09c24467a0f0a1ed10a5196dba597cad3f65dc"; + }; + }; "linewise-0.0.3" = { name = "linewise"; packageName = "linewise"; @@ -20194,6 +20815,15 @@ let sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; }; }; + "load-plugin-2.3.0" = { + name = "load-plugin"; + packageName = "load-plugin"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-plugin/-/load-plugin-2.3.0.tgz"; + sha512 = "OxHNMfT3aeHFSpzeMQRcE40kXULv3KA8fGgnySC+rO3Be+0oMWkcRKMJ5zWzUCTuUnabCsQyJzNjo/BLdbmRxA=="; + }; + }; "loader-runner-2.4.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -20662,6 +21292,15 @@ let sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"; }; }; + "lodash.assigninwith-4.2.0" = { + name = "lodash.assigninwith"; + packageName = "lodash.assigninwith"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assigninwith/-/lodash.assigninwith-4.2.0.tgz"; + sha1 = "af02c98432ac86d93da695b4be801401971736af"; + }; + }; "lodash.bind-2.4.1" = { name = "lodash.bind"; packageName = "lodash.bind"; @@ -20716,6 +21355,15 @@ let sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; }; }; + "lodash.defaults-4.0.1" = { + name = "lodash.defaults"; + packageName = "lodash.defaults"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.0.1.tgz"; + sha1 = "05678e612a9716c64b5bf2cecf045131ca3d3402"; + }; + }; "lodash.defaults-4.2.0" = { name = "lodash.defaults"; packageName = "lodash.defaults"; @@ -20851,6 +21499,15 @@ let sha1 = "60bb98a87cb923c68ca1e51325483314849f553f"; }; }; + "lodash.intersection-4.4.0" = { + name = "lodash.intersection"; + packageName = "lodash.intersection"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.intersection/-/lodash.intersection-4.4.0.tgz"; + sha1 = "0a11ba631d0e95c23c7f2f4cbb9a692ed178e705"; + }; + }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -20959,6 +21616,15 @@ let sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; + "lodash.iteratee-4.7.0" = { + name = "lodash.iteratee"; + packageName = "lodash.iteratee"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.iteratee/-/lodash.iteratee-4.7.0.tgz"; + sha1 = "be4177db289a8ccc3c0990f1db26b5b22fc1554c"; + }; + }; "lodash.keys-2.4.1" = { name = "lodash.keys"; packageName = "lodash.keys"; @@ -21112,6 +21778,15 @@ let sha1 = "fc7de8131d8c8ac07e4b49f74ffe829d1f2bec44"; }; }; + "lodash.rest-4.0.5" = { + name = "lodash.rest"; + packageName = "lodash.rest"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.5.tgz"; + sha1 = "954ef75049262038c96d1fc98b28fdaf9f0772aa"; + }; + }; "lodash.restparam-3.6.1" = { name = "lodash.restparam"; packageName = "lodash.restparam"; @@ -21211,6 +21886,15 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; + "lodash.unescape-4.0.1" = { + name = "lodash.unescape"; + packageName = "lodash.unescape"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz"; + sha1 = "bf2249886ce514cda112fae9218cdc065211fc9c"; + }; + }; "lodash.union-4.6.0" = { name = "lodash.union"; packageName = "lodash.union"; @@ -21274,13 +21958,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-4.1.0" = { + "log4js-4.1.1" = { name = "log4js"; packageName = "log4js"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-4.1.0.tgz"; - sha512 = "eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA=="; + url = "https://registry.npmjs.org/log4js/-/log4js-4.1.1.tgz"; + sha512 = "tSQUF9bBMdcBtuLD6vD7hBM9Ci6Lng/NVHZEq4YbuRGo7ObmLiZuhxz33HKAmJItit74pAjvZgirqYX2LRaoGA=="; }; }; "logform-2.1.2" = { @@ -21292,6 +21976,24 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; + "loglevel-1.6.1" = { + name = "loglevel"; + packageName = "loglevel"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz"; + sha1 = "e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"; + }; + }; + "loglevel-colored-level-prefix-1.0.0" = { + name = "loglevel-colored-level-prefix"; + packageName = "loglevel-colored-level-prefix"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz"; + sha1 = "6a40218fdc7ae15fc76c3d0f3e676c465388603e"; + }; + }; "lokijs-1.5.3" = { name = "lokijs"; packageName = "lokijs"; @@ -21841,13 +22543,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "markdown-escapes-1.0.2" = { + "markdown-escapes-1.0.3" = { name = "markdown-escapes"; packageName = "markdown-escapes"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz"; - sha512 = "lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA=="; + url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.3.tgz"; + sha512 = "XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw=="; }; }; "markdown-it-8.4.2" = { @@ -21859,6 +22561,15 @@ let sha512 = "GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ=="; }; }; + "markdown-it-anchor-5.0.2" = { + name = "markdown-it-anchor"; + packageName = "markdown-it-anchor"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.0.2.tgz"; + sha512 = "AFM/woBI8QDJMS/9+MmsBMT5/AR+ImfOsunQZTZhzcTmna3rIzAzbOh5E0l6mlFM/i9666BpUtkqQ9bS7WApCg=="; + }; + }; "markdown-it-emoji-1.4.0" = { name = "markdown-it-emoji"; packageName = "markdown-it-emoji"; @@ -21904,15 +22615,6 @@ let sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; }; }; - "marked-0.3.19" = { - name = "marked"; - packageName = "marked"; - version = "0.3.19"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz"; - sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; - }; - }; "marked-0.4.0" = { name = "marked"; packageName = "marked"; @@ -21922,6 +22624,33 @@ let sha512 = "tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="; }; }; + "marked-0.6.2" = { + name = "marked"; + packageName = "marked"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.6.2.tgz"; + sha512 = "LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA=="; + }; + }; + "match-casing-1.0.1" = { + name = "match-casing"; + packageName = "match-casing"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/match-casing/-/match-casing-1.0.1.tgz"; + sha512 = "zUroBN1AtMqqtIOb2qfwgncEuUAG7b5wQ1J9/D8jYRxbdvUZnpuRIlkqFyrX/1RbWJNzERwHG4BMj2LTtZW48g=="; + }; + }; + "match-index-1.0.1" = { + name = "match-index"; + packageName = "match-index"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/match-index/-/match-index-1.0.1.tgz"; + sha1 = "b4b673e99ab3ac5a6af303ccf4db709812bc3f58"; + }; + }; "matchdep-2.0.0" = { name = "matchdep"; packageName = "matchdep"; @@ -21967,6 +22696,24 @@ let sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; }; }; + "mdast-comment-marker-1.1.0" = { + name = "mdast-comment-marker"; + packageName = "mdast-comment-marker"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.1.0.tgz"; + sha512 = "NqHAs8nmu08I6MGzpKzgTd9qiCP7oshkyzQrlZxLMsLPUOPjp/Zb/ZtorKD0oOJ38vdZxFCdOlXvlDf77AqEDg=="; + }; + }; + "mdast-util-to-nlcst-3.2.2" = { + name = "mdast-util-to-nlcst"; + packageName = "mdast-util-to-nlcst"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-3.2.2.tgz"; + sha512 = "TmJlri8dHt7duRU6jfWBMqf5gW+VZ6o/8GHaWzwdxslseB2lL8bSOiox6c8VwYX5v2E4CzUWm/1GkAYqgbNw9A=="; + }; + }; "mdmanifest-1.0.8" = { name = "mdmanifest"; packageName = "mdmanifest"; @@ -22660,6 +23407,15 @@ let sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA=="; }; }; + "misspellings-1.1.0" = { + name = "misspellings"; + packageName = "misspellings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/misspellings/-/misspellings-1.1.0.tgz"; + sha1 = "53d500266cbd09cda9d94c4cf392e60589b5b324"; + }; + }; "mixin-deep-1.3.1" = { name = "mixin-deep"; packageName = "mixin-deep"; @@ -22795,13 +23551,13 @@ let sha512 = "gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw=="; }; }; - "mooremachine-2.2.1" = { + "mooremachine-2.3.0" = { name = "mooremachine"; packageName = "mooremachine"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mooremachine/-/mooremachine-2.2.1.tgz"; - sha1 = "0d9891aa7c2cf32ca73e72f52a3561ed787e2e8c"; + url = "https://registry.npmjs.org/mooremachine/-/mooremachine-2.3.0.tgz"; + sha512 = "IrhznRheWtDcT/TEL3cqaT4UJOqc5G3K8TnGq29PRXZil+sWGPkcM6SHVUZVirTKFKceuCadfyDMjmRoXCN21A=="; }; }; "morgan-1.6.1" = { @@ -22822,6 +23578,15 @@ let sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; }; }; + "mout-0.5.0" = { + name = "mout"; + packageName = "mout"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mout/-/mout-0.5.0.tgz"; + sha1 = "ff967566a90f29595e9cb8b6e7800a5b56635583"; + }; + }; "move-concurrently-1.0.1" = { name = "move-concurrently"; packageName = "move-concurrently"; @@ -23065,13 +23830,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-3.3.2" = { + "multiserver-3.3.3" = { name = "multiserver"; packageName = "multiserver"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.3.2.tgz"; - sha512 = "VR1VOH4lZiF8SwiAx/en8ShfOOiA7xtDu8HMawnKk0snmK0vn28/gFKnJGrYgBsoZHBzhB2mU6ZWb9VDGklN4A=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.3.3.tgz"; + sha512 = "hbYf5A3DELSQdVUN4KcdD6It2yGE4f3CyHcz3qY0Lq+EojThFZaoe9ov1zFoaYnYqAEUnnRD1cTB6n/xZvu5Lw=="; }; }; "multiserver-address-1.0.1" = { @@ -23263,15 +24028,6 @@ let sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; }; }; - "nan-2.10.0" = { - name = "nan"; - packageName = "nan"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; - sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="; - }; - }; "nan-2.12.1" = { name = "nan"; packageName = "nan"; @@ -23609,13 +24365,13 @@ let sha512 = "U8HkIv90/lrdNlHVp63PoF3FeuQUvJ6toMX6InqRqpBmQq9iukZRAnq/yCE4Ii6WHZRYa6DEiTH/EGFTZ0rIGg=="; }; }; - "needle-2.3.0" = { + "needle-2.3.1" = { name = "needle"; packageName = "needle"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz"; - sha512 = "QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg=="; + url = "https://registry.npmjs.org/needle/-/needle-2.3.1.tgz"; + sha512 = "CaLXV3W8Vnbps8ZANqDGz7j4x7Yj1LW4TWF/TQuDfj7Cfx4nAPTvw98qgTevtto1oHDrh3pQkaODbqupXlsWTg=="; }; }; "negotiator-0.3.0" = { @@ -23645,6 +24401,15 @@ let sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; "neo-async-2.6.0" = { name = "neo-async"; packageName = "neo-async"; @@ -23771,6 +24536,42 @@ let sha1 = "04b035cb530d46859d1018839a518c029133f676"; }; }; + "nlcst-is-literal-1.1.2" = { + name = "nlcst-is-literal"; + packageName = "nlcst-is-literal"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.1.2.tgz"; + sha512 = "eFdFvG7XE/YwPFbRk3ryzinTVGWpAEBQNH/FWc4sVSHXUumZtdSVaJYsz0axK4uF1pmlIAWgYWhzDuQ8NTf79A=="; + }; + }; + "nlcst-normalize-2.1.2" = { + name = "nlcst-normalize"; + packageName = "nlcst-normalize"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.2.tgz"; + sha512 = "fvXY7r3MsPFoB7nAUxhuBUJ8UC8wzBpWXuPRNL5DYca805CvThsV1wEIbkD9X/t506vvRfL3rRjXnfmbcl7O4Q=="; + }; + }; + "nlcst-search-1.5.0" = { + name = "nlcst-search"; + packageName = "nlcst-search"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-1.5.0.tgz"; + sha512 = "2OYlim0rafAJRtwhqUxgwyXskQNSiDHrMWXjUaPzzYwWfG3XnM3OAextLxj0i/iObl1mG4ZAGKY6nwtfogJMzQ=="; + }; + }; + "nlcst-to-string-2.0.2" = { + name = "nlcst-to-string"; + packageName = "nlcst-to-string"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.2.tgz"; + sha512 = "DV7wVvMcAsmZ5qEwvX1JUNF4lKkAAKbChwNlIH7NLsPR7LWWoeIt53YlZ5CQH5KDXEXQ9Xa3mw0PbPewymrtew=="; + }; + }; "no-case-2.3.2" = { name = "no-case"; packageName = "no-case"; @@ -23780,13 +24581,31 @@ let sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="; }; }; - "node-abi-2.7.1" = { + "no-cliches-0.1.1" = { + name = "no-cliches"; + packageName = "no-cliches"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/no-cliches/-/no-cliches-0.1.1.tgz"; + sha512 = "mYihjs47X5+N71CN3P+QBrEIBuclIfMMpgWEpkmLqFPvrOXdzokvDlhbLfjdBNZOqYgniaeZC6J1ZCgxFdyvXw=="; + }; + }; + "no-cliches-0.2.2" = { + name = "no-cliches"; + packageName = "no-cliches"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/no-cliches/-/no-cliches-0.2.2.tgz"; + sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg=="; + }; + }; + "node-abi-2.8.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.7.1.tgz"; - sha512 = "OV8Bq1OrPh6z+Y4dqwo05HqrRL9YNF7QVMRfq1/pguwKLG+q9UB/Lk0x5qXjO23JjJg+/jqCHSTaG1P3tfKfuw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.8.0.tgz"; + sha512 = "1/aa2clS0pue0HjckL62CsbhWWU35HARvBDXcJtYKbYR7LnIutmpxmXbuDMV9kEviD2lP/wACOgWmmwljghHyQ=="; }; }; "node-addon-api-1.6.3" = { @@ -23889,13 +24708,13 @@ let sha1 = "ab884e8e7e57e38a944753cec706f788d1768bb5"; }; }; - "node-fetch-2.3.0" = { + "node-fetch-2.5.0" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz"; - sha512 = "MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.5.0.tgz"; + sha512 = "YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw=="; }; }; "node-fetch-npm-2.0.2" = { @@ -23916,13 +24735,13 @@ let sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; }; }; - "node-gyp-3.8.0" = { + "node-gyp-4.0.0" = { name = "node-gyp"; packageName = "node-gyp"; - version = "3.8.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz"; - sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz"; + sha512 = "2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA=="; }; }; "node-gyp-build-3.7.0" = { @@ -23934,13 +24753,13 @@ let sha512 = "L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w=="; }; }; - "node-gyp-build-3.8.0" = { + "node-gyp-build-3.9.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.8.0"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.8.0.tgz"; - sha512 = "bYbpIHyRqZ7sVWXxGpz8QIRug5JZc/hzZH4GbdT9HTZi6WmKCZ8GLvP8OZ9TTiIBvwPFKgtGrlWQSXDAvYdsPw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.9.0.tgz"; + sha512 = "zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A=="; }; }; "node-int64-0.4.0" = { @@ -24096,13 +24915,13 @@ let sha512 = "mkw8HOosXHMBRdyJkio77vPx4Ls5IY26P5ZyoMWmKMkimXKTnX00DdpmNlkW+dHwMDYq1H66WzFtQhNOdEAbgA=="; }; }; - "node-releases-1.1.16" = { + "node-releases-1.1.18" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.16"; + version = "1.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.16.tgz"; - sha512 = "BOMWCW9CaT4sffMa5S9Mj4vYObvVShyo6JoM9WzzQOKVyNUn1+OVMUaQT3fo2tJKCMwHjqaDW/Pf3/JsYmPD2g=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.18.tgz"; + sha512 = "/mnVgm6u/8OwlIsoyRXtTI0RfQcxZoAZbdwyXap0EeWwcOpDDymyCHM2/aR9XKmHXrvizHoPAOs0pcbiJ6RUaA=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -24195,13 +25014,13 @@ let sha512 = "hKGCoeNdFL2W7S76J/Oucbw0/qRlfG815tENdhzcqTpSjKgAN91mFOqU2lQUflRRxFM7iZvCyaFcAR9noc/CqQ=="; }; }; - "nodemon-1.18.11" = { + "nodemon-1.19.0" = { name = "nodemon"; packageName = "nodemon"; - version = "1.18.11"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.11.tgz"; - sha512 = "KdN3tm1zkarlqNo4+W9raU3ihM4H15MVMSE/f9rYDZmFgDHAfAJsomYrHhApAkuUemYjFyEeXlpCOQ2v5gtBEw=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.0.tgz"; + sha512 = "NHKpb/Je0Urmwi3QPDHlYuFY9m1vaVfTsRZG5X73rY46xPj0JpNe8WhUGQdkDXQDOxrBNIU3JrcflE9Y44EcuA=="; }; }; "nomnom-1.8.1" = { @@ -24312,13 +25131,13 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "normalize-uri-1.1.1" = { + "normalize-uri-1.1.2" = { name = "normalize-uri"; packageName = "normalize-uri"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-uri/-/normalize-uri-1.1.1.tgz"; - sha512 = "bui9/kzRGymbkxJsZEBZgDHK2WJWGOHzR0pCr404EpkpVFTkCOYaRwQTlehUE+7oI70mWNENncCWqUxT/icfHw=="; + url = "https://registry.npmjs.org/normalize-uri/-/normalize-uri-1.1.2.tgz"; + sha512 = "fHgUX0J9LLSfIQAX1jfn+E47Sh24eKm41flnEjLeMKL9VoW3z/QkOrlJqKbcnO5qWcKSH57o5nH+3V0NOXmvDw=="; }; }; "normalize-url-2.0.1" = { @@ -24393,13 +25212,13 @@ let sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "npm-lifecycle-2.1.0" = { + "npm-lifecycle-2.1.1" = { name = "npm-lifecycle"; packageName = "npm-lifecycle"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz"; - sha512 = "QbBfLlGBKsktwBZLj6AviHC6Q9Y3R/AY4a2PYSIRhSKSS0/CxRyD/PfxEX6tPeOCXQgMSNdwGeECacstgptc+g=="; + url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-2.1.1.tgz"; + sha512 = "+Vg6I60Z75V/09pdcH5iUo/99Q/vop35PaI99elvxk56azSVVsdsSsS/sXqKDNwbRRNN1qSxkcO45ZOu0yOWew=="; }; }; "npm-package-arg-6.1.0" = { @@ -24627,6 +25446,15 @@ let sha1 = "4ad080936d443c2561aed9f2197efffe25f4e506"; }; }; + "nuxt-helper-json-1.0.0" = { + name = "nuxt-helper-json"; + packageName = "nuxt-helper-json"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nuxt-helper-json/-/nuxt-helper-json-1.0.0.tgz"; + sha512 = "MwFMhg8Xwjlo7dJeAuUImJxVMwyGGXfSjE7COiw0cAT7bFVJrA11ZJCwLrqPZQBfuBq3QxL8Q3/GzqA0BDr+Ug=="; + }; + }; "nwmatcher-1.4.4" = { name = "nwmatcher"; packageName = "nwmatcher"; @@ -24636,13 +25464,13 @@ let sha512 = "3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ=="; }; }; - "nwsapi-2.1.3" = { + "nwsapi-2.1.4" = { name = "nwsapi"; packageName = "nwsapi"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.3.tgz"; - sha512 = "RowAaJGEgYXEZfQ7tvvdtAQUKPyTR6T6wNu0fwlNsGQYr/h3yQc6oI8WnVZh3Y/Sylwc+dtAlvPqfFZjhTyk3A=="; + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz"; + sha512 = "iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="; }; }; "oauth-0.9.15" = { @@ -24772,6 +25600,15 @@ let sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; }; }; + "object-keys-0.4.0" = { + name = "object-keys"; + packageName = "object-keys"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"; + sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336"; + }; + }; "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; @@ -25465,6 +26302,15 @@ let sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; + "p-debounce-1.0.0" = { + name = "p-debounce"; + packageName = "p-debounce"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-debounce/-/p-debounce-1.0.0.tgz"; + sha1 = "cb7f2cbeefd87a09eba861e112b67527e621e2fd"; + }; + }; "p-defer-1.0.0" = { name = "p-defer"; packageName = "p-defer"; @@ -25816,6 +26662,15 @@ let sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw=="; }; }; + "parse-english-4.1.1" = { + name = "parse-english"; + packageName = "parse-english"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-english/-/parse-english-4.1.1.tgz"; + sha512 = "g7hegR9AFIlGXl5645mG8nQeeWW7SrK7lgmgIWR0KKWvGyZO5mxa4GGoNxRLm6VW2LGpLnn6g4O9yyLJQ4IzQw=="; + }; + }; "parse-entities-1.2.1" = { name = "parse-entities"; packageName = "parse-entities"; @@ -25861,6 +26716,15 @@ let sha512 = "kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw=="; }; }; + "parse-gitignore-1.0.1" = { + name = "parse-gitignore"; + packageName = "parse-gitignore"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-gitignore/-/parse-gitignore-1.0.1.tgz"; + sha512 = "UGyowyjtx26n65kdAMWhm6/3uy5uSrpcuH7tt+QEVudiBoVS+eqHxD5kbi9oWVRwj7sCzXqwuM+rUGw7earl6A=="; + }; + }; "parse-glob-3.0.4" = { name = "parse-glob"; packageName = "parse-glob"; @@ -25906,6 +26770,15 @@ let sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; }; + "parse-latin-4.1.1" = { + name = "parse-latin"; + packageName = "parse-latin"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-latin/-/parse-latin-4.1.1.tgz"; + sha512 = "9fPVvDdw6G8LxL3o/PL6IzSGNGpF+3HEjCzFe0dN83sZPstftyr+McP9dNi3+EnR7ICYOHbHKCZ0l7JD90K5xQ=="; + }; + }; "parse-node-version-1.0.1" = { name = "parse-node-version"; packageName = "parse-node-version"; @@ -26104,6 +26977,15 @@ let sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; }; + "passive-voice-0.1.0" = { + name = "passive-voice"; + packageName = "passive-voice"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passive-voice/-/passive-voice-0.1.0.tgz"; + sha1 = "16ff91ae40ba0e92c43e671763fdc842a70270b1"; + }; + }; "passport-0.4.0" = { name = "passport"; packageName = "passport"; @@ -26212,6 +27094,15 @@ let sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; }; + "path-is-absolute-1.0.0" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; + sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + }; + }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -26608,6 +27499,15 @@ let sha512 = "6Rtbp7criZRwedlvWbUYxqlqJoAlMvYHo2UcRWq79xZ54vZcaNHpVBOcWkX3ErT2aUA69tv+uiv4zKJbhD/Wgg=="; }; }; + "pkg-conf-1.1.3" = { + name = "pkg-conf"; + packageName = "pkg-conf"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-1.1.3.tgz"; + sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; + }; + }; "pkg-dir-2.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -26852,6 +27752,15 @@ let sha512 = "NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg=="; }; }; + "postcss-7.0.16" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz"; + sha512 = "MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA=="; + }; + }; "postcss-calc-7.0.1" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -27158,22 +28067,13 @@ let sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; - "posthtml-0.11.3" = { + "posthtml-0.11.4" = { name = "posthtml"; packageName = "posthtml"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.11.3.tgz"; - sha512 = "quMHnDckt2DQ9lRi6bYLnuyBDnVzK+McHa8+ar4kTdYbWEo/92hREOu3h70ZirudOOp/my2b3r0m5YtxY52yrA=="; - }; - }; - "posthtml-parser-0.3.3" = { - name = "posthtml-parser"; - packageName = "posthtml-parser"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.3.3.tgz"; - sha512 = "H/Z/yXGwl49A7hYQLV1iQ3h87NE0aZ/PMZhFwhw3lKeCAN+Ti4idrHvVvh4/GX10I7u77aQw+QB4vV5/Lzvv5A=="; + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.11.4.tgz"; + sha512 = "ezlzBkoPoRgh0jkmT1dsM8eT+lr2azyZ546kbda8oHnVnzvyaB3Ywo6UxUz8wPSOkFAAflCxZJhvvpQH1F6qcA=="; }; }; "posthtml-parser-0.4.1" = { @@ -27185,13 +28085,13 @@ let sha512 = "h7vXIQ21Ikz2w5wPClPakNP6mJeJCK6BT0GpqnQrNNABdR7/TchNlFyryL1Bz6Ww53YWCKkr6tdZuHlxY1AVdQ=="; }; }; - "posthtml-render-1.1.4" = { + "posthtml-render-1.1.5" = { name = "posthtml-render"; packageName = "posthtml-render"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.1.4.tgz"; - sha512 = "jL6eFIzoN3xUEvbo33OAkSDE2VIKU4JQ1wENOows1DpfnrdapR/K3Q1/fB43Mq7wQlcSgRm23nFrvoioufM7eA=="; + url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.1.5.tgz"; + sha512 = "yvt54j0zCBHQVEFAuR+yHld8CZrCa/E1Z/OcFNCV1IEWTLVxT8O7nYnM4IIw1CD4r8kaRd3lc42+0lgCKgm87w=="; }; }; "prebuild-install-4.0.0" = { @@ -27212,6 +28112,15 @@ let sha512 = "6uZgMVg7yDfqlP5CPurVhtq3hUKBFNufiar4J5hZrlHTo59DDBEtyxw01xCdFss9j0Zb9+qzFVf/s4niayba3w=="; }; }; + "prebuild-install-5.3.0" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.0.tgz"; + sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg=="; + }; + }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -27266,6 +28175,15 @@ let sha512 = "4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA=="; }; }; + "prettier-1.17.0" = { + name = "prettier"; + packageName = "prettier"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-1.17.0.tgz"; + sha512 = "sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw=="; + }; + }; "prettier-bytes-1.0.4" = { name = "prettier-bytes"; packageName = "prettier-bytes"; @@ -27275,6 +28193,24 @@ let sha1 = "994b02aa46f699c50b6257b5faaa7fe2557e62d6"; }; }; + "prettier-eslint-8.8.2" = { + name = "prettier-eslint"; + packageName = "prettier-eslint"; + version = "8.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-8.8.2.tgz"; + sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; + }; + }; + "pretty-format-23.6.0" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "23.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz"; + sha512 = "zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw=="; + }; + }; "pretty-hash-1.0.1" = { name = "pretty-hash"; packageName = "pretty-hash"; @@ -27572,6 +28508,15 @@ let sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; }; }; + "property-information-5.0.1" = { + name = "property-information"; + packageName = "property-information"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/property-information/-/property-information-5.0.1.tgz"; + sha512 = "nAtBDVeSwFM3Ot/YxT7s4NqZmqXI7lLzf46BThvotEtYf2uk2yH0ACYuWQkJ7gxKs49PPtKVY0UlDGkyN9aJlw=="; + }; + }; "proto-list-1.2.4" = { name = "proto-list"; packageName = "proto-list"; @@ -28184,13 +29129,13 @@ let sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; }; }; - "pull-stream-3.6.9" = { + "pull-stream-3.6.11" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.6.9"; + version = "3.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.9.tgz"; - sha512 = "hJn4POeBrkttshdNl0AoSCVjMVSuBwuHocMerUdoZ2+oIUzrWHFTwJMlbHND7OiKLVgvz6TFj8ZUVywUMXccbw=="; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.11.tgz"; + sha512 = "43brwtqO0OSltctKbW1mgzzKH4TNE8egkW+Y4BFzlDWiG2Ayl7VKr4SeuoKacfgPfUWcSwcPlHsf40BEqNR32A=="; }; }; "pull-stringify-2.0.0" = { @@ -28301,6 +29246,15 @@ let sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; }; + "pump-chain-1.0.0" = { + name = "pump-chain"; + packageName = "pump-chain"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump-chain/-/pump-chain-1.0.0.tgz"; + sha1 = "7d57d8d9ad8181ea808f5413c4f2bc1e786a5e37"; + }; + }; "pumpify-1.5.1" = { name = "pumpify"; packageName = "pumpify"; @@ -28571,6 +29525,15 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; + "quotation-1.1.1" = { + name = "quotation"; + packageName = "quotation"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quotation/-/quotation-1.1.1.tgz"; + sha512 = "bjz7kEsfg6D3uMeed+VbeypnooGlX7enMnDbx0KLYEEM8J1k24jk2pc+1nyQ1sExnERz8xKXRSZ0EYNIwLM83g=="; + }; + }; "quote-stream-1.0.2" = { name = "quote-stream"; packageName = "quote-stream"; @@ -29066,13 +30029,13 @@ let sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "recast-0.17.5" = { + "recast-0.17.6" = { name = "recast"; packageName = "recast"; - version = "0.17.5"; + version = "0.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.17.5.tgz"; - sha512 = "K+DgfAMIyEjNKjaFSWgg9TTu7wFgU/4KTyw4E9vl6M5QPDuUYbyt49Yzb0EIDbZks+6lXk/UZ9eTuE4jlLyf2A=="; + url = "https://registry.npmjs.org/recast/-/recast-0.17.6.tgz"; + sha512 = "yoQRMRrK1lszNtbkGyM4kN45AwylV5hMiuEveUBlxytUViWevjvX6w+tzJt1LH4cfUhWt4NZvy3ThIhu6+m5wQ=="; }; }; "rechoir-0.6.2" = { @@ -29255,13 +30218,31 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp-tree-0.1.5" = { + "regexp-tree-0.1.6" = { name = "regexp-tree"; packageName = "regexp-tree"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.5.tgz"; - sha512 = "nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ=="; + url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.6.tgz"; + sha512 = "LFrA98Dw/heXqDojz7qKFdygZmFoiVlvE1Zp7Cq2cvF+ZA+03Gmhy0k0PQlsC1jvHPiTUSs+pDHEuSWv6+6D7w=="; + }; + }; + "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=="; + }; + }; + "regexpp-1.1.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; + sha512 = "LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="; }; }; "regexpp-2.0.1" = { @@ -29363,6 +30344,15 @@ let sha512 = "RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ=="; }; }; + "rehype-sort-attribute-values-1.0.1" = { + name = "rehype-sort-attribute-values"; + packageName = "rehype-sort-attribute-values"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rehype-sort-attribute-values/-/rehype-sort-attribute-values-1.0.1.tgz"; + sha512 = "ZbIbqEAqEulXFAJGkL5Ogb+oCd5sOe1Fc/DQPCqsYpOfPyioE6HomqTfDQfNL0LD5ODTZyrj2yigzfjfqJuSGQ=="; + }; + }; "reinterval-1.1.0" = { name = "reinterval"; packageName = "reinterval"; @@ -29408,6 +30398,15 @@ let sha1 = "802a38c3aa98c9e1e3ea015eeba211d27cb65e1f"; }; }; + "remark-5.1.0" = { + name = "remark"; + packageName = "remark"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark/-/remark-5.1.0.tgz"; + sha1 = "cb463bd3dbcb4b99794935eee1cf71d7a8e3068c"; + }; + }; "remark-frontmatter-1.3.1" = { name = "remark-frontmatter"; packageName = "remark-frontmatter"; @@ -29426,6 +30425,33 @@ let sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; }; }; + "remark-message-control-4.1.1" = { + name = "remark-message-control"; + packageName = "remark-message-control"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-message-control/-/remark-message-control-4.1.1.tgz"; + sha512 = "DojJPPeSux/U7aHCN6GUWBgp6F1EQFPUNvnk2gfuGgiMCHVubz/xAC3TkvPaf5w1F0PEGaOEpCtvxJK6O4Kmiw=="; + }; + }; + "remark-parse-1.1.0" = { + name = "remark-parse"; + packageName = "remark-parse"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-1.1.0.tgz"; + sha1 = "c3ca10f9a8da04615c28f09aa4e304510526ec21"; + }; + }; + "remark-parse-4.0.0" = { + name = "remark-parse"; + packageName = "remark-parse"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-4.0.0.tgz"; + sha512 = "XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw=="; + }; + }; "remark-parse-5.0.0" = { name = "remark-parse"; packageName = "remark-parse"; @@ -29435,6 +30461,24 @@ let sha512 = "b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA=="; }; }; + "remark-retext-3.1.2" = { + name = "remark-retext"; + packageName = "remark-retext"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-retext/-/remark-retext-3.1.2.tgz"; + sha512 = "+48KzJdSXvsPupY5pj5AY7oBUSiDOqFPZBKebX5WemrMyIG+RImIt9hgeqelluVDd1kooHen33K/aybTPyoI9g=="; + }; + }; + "remark-stringify-1.1.0" = { + name = "remark-stringify"; + packageName = "remark-stringify"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-1.1.0.tgz"; + sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092"; + }; + }; "remove-array-items-1.1.1" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -29678,6 +30722,15 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; + "require-relative-0.8.7" = { + name = "require-relative"; + packageName = "require-relative"; + version = "0.8.7"; + src = fetchurl { + url = "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz"; + sha1 = "7999539fc9e047a37928fa196f8e1563dabd36de"; + }; + }; "require-uncached-1.0.3" = { name = "require-uncached"; packageName = "require-uncached"; @@ -29714,13 +30767,13 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "requizzle-0.2.1" = { + "requizzle-0.2.2" = { name = "requizzle"; packageName = "requizzle"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz"; - sha1 = "6943c3530c4d9a7e46f1cddd51c158fc670cdbde"; + url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.2.tgz"; + sha512 = "oJ6y7JcUJkblRGhMByGNcszeLgU0qDxNKFCiUZR1XyzHyVsev+Mxb1tyygxLd1ORsKee1SA5BInFdUwY64GE/A=="; }; }; "resolve-1.1.7" = { @@ -29732,13 +30785,13 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.10.0" = { + "resolve-1.10.1" = { name = "resolve"; packageName = "resolve"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; - sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz"; + sha512 = "KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA=="; }; }; "resolve-1.7.1" = { @@ -29759,13 +30812,13 @@ let sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; }; }; - "resolve-dependencies-2.2.2" = { + "resolve-dependencies-2.2.3" = { name = "resolve-dependencies"; packageName = "resolve-dependencies"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-2.2.2.tgz"; - sha512 = "lZARvM5mDaVOBUNam2fbaHYydBBPMlMt6jjlQYvD8D2N//SOlq6iqqFrCWsYkBGYtXgix4EAiTFuZLpt5lXQtA=="; + url = "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-2.2.3.tgz"; + sha512 = "EIZcqEE3q+fWNapzpQ2iiCPal+J7TsLfLnoeGq4h5L4GYjnf4xKzVHN7VBjLGgOJwUs/Z+a6nqA80AhwP7IPlQ=="; }; }; "resolve-dir-1.0.1" = { @@ -29921,6 +30974,33 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; + "retext-english-3.0.2" = { + name = "retext-english"; + packageName = "retext-english"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/retext-english/-/retext-english-3.0.2.tgz"; + sha512 = "iWffdWUvJngqaRlE570SaYRgQbn4/QVBfGa/XseEBuBazymnyW24o37oLPY0vm+PJdLmDghnjZX0UbkZSZF0Cg=="; + }; + }; + "retext-equality-3.2.0" = { + name = "retext-equality"; + packageName = "retext-equality"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retext-equality/-/retext-equality-3.2.0.tgz"; + sha512 = "dzcpZmEQ99ECZs1Y8WhfvJ4kEq+zfrI3ONMUFlSu8DmRJJY3p97v/2ZfVrufhrKlDr/wa902NJiIwupRnZy3/w=="; + }; + }; + "retext-profanities-4.4.0" = { + name = "retext-profanities"; + packageName = "retext-profanities"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-4.4.0.tgz"; + sha512 = "Gesb0Act9oeJ5N0KztREitP2E0zo7euzgTu2X4HLP6IJmcrRbRnqNwV11tzNy5JFJzKB1JTJFc7KseojTeGwOA=="; + }; + }; "retry-0.10.1" = { name = "retry"; packageName = "retry"; @@ -30155,6 +31235,15 @@ let sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697"; }; }; + "round-to-3.0.0" = { + name = "round-to"; + packageName = "round-to"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/round-to/-/round-to-3.0.0.tgz"; + sha512 = "h8xeIC7dRHkY++BGKtXTlO/FifRJdUmW5YObBk/8X9nc/2syNXKN8qUA6OvCgmPdtYlWvDqKZOuxz/CX6dcZNg=="; + }; + }; "router-0.6.2" = { name = "router"; packageName = "router"; @@ -30317,13 +31406,13 @@ let sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw=="; }; }; - "rxjs-6.5.1" = { + "rxjs-6.5.2" = { name = "rxjs"; packageName = "rxjs"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.1.tgz"; - sha512 = "y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz"; + sha512 = "HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg=="; }; }; "s3-stream-upload-2.0.2" = { @@ -30452,6 +31541,15 @@ let sha1 = "612da1c96473fa02dccda92dcd5b4ab164a6772a"; }; }; + "sax-0.5.8" = { + name = "sax"; + packageName = "sax"; + version = "0.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; + sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; + }; + }; "sax-1.1.4" = { name = "sax"; packageName = "sax"; @@ -30497,15 +31595,6 @@ let sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; }; }; - "scrollparent-2.0.1" = { - name = "scrollparent"; - packageName = "scrollparent"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/scrollparent/-/scrollparent-2.0.1.tgz"; - sha1 = "715d5b9cc57760fb22bdccc3befb5bfe06b1a317"; - }; - }; "scuid-1.1.0" = { name = "scuid"; packageName = "scuid"; @@ -30524,13 +31613,13 @@ let sha1 = "033d60a3ad20ecf2e00940d14f97823465774335"; }; }; - "secret-handshake-1.1.16" = { + "secret-handshake-1.1.18" = { name = "secret-handshake"; packageName = "secret-handshake"; - version = "1.1.16"; + version = "1.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.16.tgz"; - sha512 = "iJgGEykTXa8772vmYMGM20jYifTV7lg96bFeitGjly99aIEkIKHkiJWb+3KZ98dg4gwtF/6L+XhL/76iBgKhpA=="; + url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.18.tgz"; + sha512 = "uP8s0ALmbJtjLEShGnJ5HHJSM1+TT8hbUme2/H2grw+WbiofSG6kr6AK1HHOmSublCVNFwfggjnWZXnEPTvIwQ=="; }; }; "secret-stack-5.1.1" = { @@ -30641,6 +31730,15 @@ let sha512 = "WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="; }; }; + "semver-5.5.0" = { + name = "semver"; + packageName = "semver"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; + }; + }; "semver-5.5.1" = { name = "semver"; packageName = "semver"; @@ -30794,6 +31892,15 @@ let sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; }; }; + "send-0.17.0" = { + name = "send"; + packageName = "send"; + version = "0.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.0.tgz"; + sha512 = "NYR0jCuwnBaGA2X5bO3+QDZmmJ+PUCvFCRTED5nx9l/BK3Pr8mD8Ryvk9bw08JJUdXxt2u+tVIGoqJPrHWGqSA=="; + }; + }; "sentence-case-2.1.1" = { name = "sentence-case"; packageName = "sentence-case"; @@ -30803,6 +31910,24 @@ let sha1 = "1f6e2dda39c168bf92d13f86d4a918933f667ed4"; }; }; + "sentence-splitter-2.3.2" = { + name = "sentence-splitter"; + packageName = "sentence-splitter"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-2.3.2.tgz"; + sha512 = "QnpHNykm4nI4T6mT+NoVayh9Ixl5DohYCSVqMgPJsO2WejOcqaYTh4HQOkmzaDzXH3NO5pif4z/hpo2NGtgNlg=="; + }; + }; + "sentence-splitter-3.0.11" = { + name = "sentence-splitter"; + packageName = "sentence-splitter"; + version = "3.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-3.0.11.tgz"; + sha512 = "8k/74ErjpdvgBVLQ7kI7jbbaqNdgMXVqMF8gWlJan25xfm1mg8cYmHQgMb+zx8xyocm1Dq46af4TpmnKWHr/yA=="; + }; + }; "sentiment-2.1.0" = { name = "sentiment"; packageName = "sentiment"; @@ -30920,6 +32045,15 @@ let sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; }; }; + "serve-static-1.14.0" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.0.tgz"; + sha512 = "Kg15ayeXWLhAE5T9adD3xGcEHchIZsDUExIIfSTOzg6kgmIa86NP8NpuOAYKLbPEYU1OQ+KCQrtKh8AG3h7KAQ=="; + }; + }; "serve-static-1.8.1" = { name = "serve-static"; packageName = "serve-static"; @@ -30938,6 +32072,15 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; + "set-blocking-1.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-1.0.0.tgz"; + sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5"; + }; + }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -31235,13 +32378,13 @@ let sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; }; }; - "simple-git-1.110.0" = { + "simple-git-1.113.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.110.0"; + version = "1.113.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.110.0.tgz"; - sha512 = "UYY0rQkknk0P5eb+KW+03F4TevZ9ou0H+LoGaj7iiVgpnZH4wdj/HTViy/1tNNkmIPcmtxuBqXWiYt2YwlRKOQ=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.113.0.tgz"; + sha512 = "i9WVsrK2u0G/cASI9nh7voxOk9mhanWY9eGtWBDSYql6m49Yk5/Fan6uZsDr/xmzv8n+eQ8ahKCoEr8cvU3h+g=="; }; }; "simple-markdown-0.4.4" = { @@ -31424,6 +32567,15 @@ let sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; }; }; + "sliced-1.0.1" = { + name = "sliced"; + packageName = "sliced"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz"; + sha1 = "0b3a662b5d04c3177b1926bea82b03f837a2ef41"; + }; + }; "slide-1.1.6" = { name = "slide"; packageName = "slide"; @@ -31550,13 +32702,13 @@ let sha512 = "eCsFKHHE4J2DpD/1NzAtCmkmVDK310OXRtmoW0RlLnld1ESprJ5A/QRJ5Zxx1JbA8gjuwERY5vfUFA8lEJeopA=="; }; }; - "snyk-docker-plugin-1.22.1" = { + "snyk-docker-plugin-1.24.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "1.22.1"; + version = "1.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.22.1.tgz"; - sha512 = "4Qj+Fn9uCD7ydl60soVFfDG27ghZ6sCIiVPs5Wr62zgzbpnKCNF2MzXtxmsbZA1QRLKH2YxbJTog1Rvu013akA=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.24.1.tgz"; + sha512 = "Y130BbrZ5hEPhjR1s57n5m1kNnlh4ydA000nPY4HvXylAX3JWQZR3/HFJ6nCKLes/z1cH19EsSdBNw7+r/N2ag=="; }; }; "snyk-go-parser-1.0.2" = { @@ -31568,22 +32720,22 @@ let sha512 = "vQfrPecK3j5JYwEI5lO0Gsy+QvFN2dHusGecmiXYpQPiyn1QLnYFTBxFIu94buxlxdKtujYkR/lA4dB82LJ8Lw=="; }; }; - "snyk-go-plugin-1.7.0" = { + "snyk-go-plugin-1.7.1" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.7.0.tgz"; - sha512 = "4gGWFiilx3BINIqVau/GGhyOin5Vf0qzL5VYKV3FeZdJ22RBxqO3+NjRwsOzDJdIEgixp+NGV2hnuSKQCGsr9A=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.7.1.tgz"; + sha512 = "jtsK4V/pOiUMfTjM2ASFb2D4u/xOF3zqOteqbtK6N64o0ndQf5D8SMkIRB0APJV5ZjqhPDHzItRyKRtscSkx4Q=="; }; }; - "snyk-gradle-plugin-2.7.1" = { + "snyk-gradle-plugin-2.10.1" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "2.7.1"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.7.1.tgz"; - sha512 = "Is/I1r4Hy24rFhEZejcBvXyF6pfNtIpfr7jGcPaP4Riqe4yE6TNYnEFNcc02UUcAvI6S/EyOSH6XyJLFSnAugg=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.10.1.tgz"; + sha512 = "Jl+KSs5aUXO1qSs3kJ2k5RZP4tpDWFbqfo9s2YmRmL56uBzqS0DwwuCrbQvAw9T+7rgnhh6L+W7CjuTDmjwJww=="; }; }; "snyk-module-1.9.1" = { @@ -31595,13 +32747,13 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.0.1" = { + "snyk-mvn-plugin-2.3.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.0.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.0.1.tgz"; - sha512 = "TBrdcFXHdYuRYFCvpyUeFC+mCi6SOV3vdxgHrP7JRNnJwO8PYaKCObLJyhpRWa8IaHv/8CjJTmnEbWIh7BPHAA=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.3.0.tgz"; + sha512 = "LOSiJu+XUPVqKCXcnQPLhlyTGm3ikDwjvYw5fpiEnvjMWkMDd8IfzZqulqreebJDmadUpP7Cn0fabfx7TszqxA=="; }; }; "snyk-nodejs-lockfile-parser-1.13.0" = { @@ -31613,13 +32765,13 @@ let sha512 = "fC1o9SJ+iM+IYeBUYtvCIYh005WAvWMzqhEH3hI4zGPdCYQqGYIfVpXf29aCOKoorkTR345k5g6Etx54+BbrTQ=="; }; }; - "snyk-nuget-plugin-1.9.2" = { + "snyk-nuget-plugin-1.10.0" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.9.2"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.9.2.tgz"; - sha512 = "62muXgrn3oSSMsWT7foBQDqKBFgbXc4XIrZDmzFE0lyuchDYGLM14BO5erAMUbbc/xffXyQaAHi8d1R8LGvf5Q=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.10.0.tgz"; + sha512 = "V69AIWcHw4KrgEFC8kNWoqHo54wZkWGfqyVv+kJjQxARWYmQqV4YL/vxfLAoZ7mDsNXgjPn5M4ZEaeHFCeWcyA=="; }; }; "snyk-paket-parser-1.4.3" = { @@ -31631,13 +32783,13 @@ let sha512 = "6m736zGVoeT/zS9KEtlmqTSPEPjAfLe8iYoQ3AwbyxDhzuLY49lTaV67MyZtGwjhi1x4KBe+XOgeWwyf6Avf/A=="; }; }; - "snyk-php-plugin-1.5.2" = { + "snyk-php-plugin-1.5.3" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.2.tgz"; - sha512 = "s/s9s7mslHjLnzin2BNLGdy/s6tNBfJ4/T/d9JBjsjIwdJFaUKY/ciWwBLNaWt2Aqtyr3DiUcqg3j/pwTKhEDg=="; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.3.tgz"; + sha512 = "iZB3UpleLbeOL1D1bNLMFfh5hSflbQnepxmtXxXSD3S+euAhqJTZz/26QrsUIAtLQ2eHl3LfAXGTp6131tWyGw=="; }; }; "snyk-policy-1.13.5" = { @@ -31649,13 +32801,13 @@ let sha512 = "KI6GHt+Oj4fYKiCp7duhseUj5YhyL/zJOrrJg0u6r59Ux9w8gmkUYT92FHW27ihwuT6IPzdGNEuy06Yv2C9WaQ=="; }; }; - "snyk-python-plugin-1.9.2" = { + "snyk-python-plugin-1.10.0" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.9.2"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.9.2.tgz"; - sha512 = "Gx5UnADHCxdSfblrbhZV/tbTYTfdkLxS2/TV1KSHiIIlsaAkpuznDKg/6/kT1Qe/AKKlD1h4HqR/fhrNZWrxQw=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.10.0.tgz"; + sha512 = "U88Om9HxKxRp6EQ3Mn/iySr60ozjxzVaui+/Vmv6tcXqAEotstW/q24EBC3wmnRyAxzfZ7qTMQ+6XJxnYSKa2w=="; }; }; "snyk-resolve-1.0.1" = { @@ -31928,13 +33080,13 @@ let sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA=="; }; }; - "sodium-native-2.3.0" = { + "sodium-native-2.4.2" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.3.0.tgz"; - sha512 = "TYId1m2iLXXot2Q3KA6u8Ti9pmL24T2cm8nb9OUGFFmTxdw4I+vnkjcPVA4LT1acw+A86iJkEn+8iV51jcTWUg=="; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.4.2.tgz"; + sha512 = "qwHcUnzFpRSGSm6F49j/h5SnxPFBgSNdDwZkAqjvuAoHQIVBFOXYb+oCUTJV80K5hRqSYCihpbX06vbrtPbilg=="; }; }; "sodium-universal-2.0.0" = { @@ -32054,6 +33206,15 @@ let sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; }; }; + "source-map-0.1.43" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.43"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + }; "source-map-0.4.4" = { name = "source-map"; packageName = "source-map"; @@ -32162,6 +33323,15 @@ let sha512 = "CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg=="; }; }; + "space-separated-tokens-1.1.3" = { + name = "space-separated-tokens"; + packageName = "space-separated-tokens"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.3.tgz"; + sha512 = "/M5RAdBuQlSDPNfA5ube+fkHbHyY08pMuADLmsAQURzo56w90r681oiOoz3o3ZQyWdSeNucpTFjL+Ggd5qui3w=="; + }; + }; "spark-md5-1.0.1" = { name = "spark-md5"; packageName = "spark-md5"; @@ -32207,6 +33377,15 @@ let sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; }; }; + "spawn-to-readstream-0.1.3" = { + name = "spawn-to-readstream"; + packageName = "spawn-to-readstream"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/spawn-to-readstream/-/spawn-to-readstream-0.1.3.tgz"; + sha1 = "96768b72739ac64ffa77c8ce2cbf98c2d21d8dbf"; + }; + }; "spdx-correct-3.1.0" = { name = "spdx-correct"; packageName = "spdx-correct"; @@ -32270,6 +33449,24 @@ let sha512 = "z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ=="; }; }; + "speedtest-net-1.5.1" = { + name = "speedtest-net"; + packageName = "speedtest-net"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/speedtest-net/-/speedtest-net-1.5.1.tgz"; + sha512 = "az10ue3vkUUt49p5ommRO5eKXB5GfzyLehWCNRUnO686GjtdXJcSJFPnluc93UdoWTtWbr4fCVeH9Kka1OpHIA=="; + }; + }; + "split-0.2.10" = { + name = "split"; + packageName = "split"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz"; + sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; + }; + }; "split-0.3.3" = { name = "split"; packageName = "split"; @@ -32297,6 +33494,15 @@ let sha1 = "b7e8e0ab51345158b72c1f6dbef2406d51f1d027"; }; }; + "split-lines-2.0.0" = { + name = "split-lines"; + packageName = "split-lines"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-lines/-/split-lines-2.0.0.tgz"; + sha512 = "gaIdhbqxkB5/VflPXsJwZvEzh/kdwiRPF9iqpkxX4us+lzB8INedFwjCyo6vwuz5x2Ddlnav2zh270CEjCG8mA=="; + }; + }; "split-skip-0.0.1" = { name = "split-skip"; packageName = "split-skip"; @@ -32324,6 +33530,24 @@ let sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; }; + "split-string-words-1.0.0" = { + name = "split-string-words"; + packageName = "split-string-words"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string-words/-/split-string-words-1.0.0.tgz"; + sha1 = "a5e1c7bc96499d3caa000a81d074f32774027ddd"; + }; + }; + "split-transform-stream-0.1.1" = { + name = "split-transform-stream"; + packageName = "split-transform-stream"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split-transform-stream/-/split-transform-stream-0.1.1.tgz"; + sha1 = "825236a78d52a18ff912a631ad3034c15ded5fe3"; + }; + }; "split2-2.2.0" = { name = "split2"; packageName = "split2"; @@ -32369,13 +33593,13 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sqlite3-4.0.6" = { + "sqlite3-4.0.7" = { name = "sqlite3"; packageName = "sqlite3"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.6.tgz"; - sha512 = "EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.7.tgz"; + sha512 = "TGEeSBB8O48bEu8KUUMqzeB22WrfTxzhIf0lFm8wLTo3a6yJBonF2sPKMYrYtOne1F1t9AHAEn+DTISq8WebQg=="; }; }; "srt2vtt-1.3.1" = { @@ -32405,13 +33629,13 @@ let sha512 = "6T0jy3Im7sJg2BlX/OKJ4qCvtOMM9Xo3TMd3FrMuAtC+qMob/S6XT5001Its0vWc6/1Thhw4o31F7lT1s7QQKw=="; }; }; - "ssb-client-4.7.2" = { + "ssb-client-4.7.4" = { name = "ssb-client"; packageName = "ssb-client"; - version = "4.7.2"; + version = "4.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.2.tgz"; - sha512 = "sZPs/i5Zm8f3faJDbYYpBlxocIYi8VR4KksQrHbncYCnCo1n4diBmLx76dNRC3p0rpyqgkX38gMcEVIYe4dYZw=="; + url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.4.tgz"; + sha512 = "//zHVdTZ4RTFPl1izXGu6vlinwPhTwio8oJHJ4Zix3AI9L8k6K+Jau9jVwltT1lBfQJmeUIWj7f9X9s8nvOiew=="; }; }; "ssb-config-2.3.9" = { @@ -32432,13 +33656,13 @@ let sha512 = "/4nFP7yj1JD5jrwX9bHG2nipBefl++xXXbNWD14eL+Ohs3X8kdmJeBKnHgiIF7Je4HQOI31OmEIdyyLKum5niQ=="; }; }; - "ssb-ebt-5.6.3" = { + "ssb-ebt-5.6.4" = { name = "ssb-ebt"; packageName = "ssb-ebt"; - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.6.3.tgz"; - sha512 = "17olprA/zAm6yevoAgNjyl0JpUvZm7pDQm6m5A4zgqroMFG6v1WJkvzIhBMQZdgXkDShe8Ehwl4NBjNmH3lQVw=="; + url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.6.4.tgz"; + sha512 = "ZNqOECzKyFBJW15N8Fl4iY7MGvb1ZTBxBVjcrQy7NydJn8sbHpC7PUU3QnnNgECwzoEWkuxzkn04GHJHJypo3g=="; }; }; "ssb-friends-3.1.13" = { @@ -32477,22 +33701,22 @@ let sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5"; }; }; - "ssb-keys-7.1.5" = { + "ssb-keys-7.1.6" = { name = "ssb-keys"; packageName = "ssb-keys"; - version = "7.1.5"; + version = "7.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.1.5.tgz"; - sha512 = "GQ7cgTFROOrQpHjmZdeIrVO15+KImjTCCdM4IaJCAMgEybaXl53wEi2guPqYAskqBggWxYG0VNwXT45JI9nXiA=="; + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.1.6.tgz"; + sha512 = "DCl6BTz7zy7fElWgok1aBvYBfe6aUzafW1Q7z5WkpgdT8H90oqXe2l5DyTd7k77yyg82uDSjPOKfPAE9eBqfug=="; }; }; - "ssb-links-3.0.4" = { + "ssb-links-3.0.6" = { name = "ssb-links"; packageName = "ssb-links"; - version = "3.0.4"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.4.tgz"; - sha512 = "npTjUeg+qH8NgnZqKsRSe5kLCu2KYQs9vxtckBph8Z5/VJX+RAG5a5FlLEOLWv4h//BICe4L7Rpvbxol+39jhQ=="; + url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.6.tgz"; + sha512 = "X+Hhj9E1PoGS5fQMBsUMgbULLI+e93kQTrygKs9EL9nUeIOOpMelQ1XDdBUIgP40qHK8esAVVES6dWmba15TfA=="; }; }; "ssb-marked-0.5.4" = { @@ -32684,6 +33908,15 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; + "stampit-1.2.0" = { + name = "stampit"; + packageName = "stampit"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stampit/-/stampit-1.2.0.tgz"; + sha1 = "51f9c6a08c146473fcd021af551c9f32ed5c7b9d"; + }; + }; "stat-mode-0.2.2" = { name = "stat-mode"; packageName = "stat-mode"; @@ -32693,13 +33926,13 @@ let sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; }; }; - "state-toggle-1.0.1" = { + "state-toggle-1.0.2" = { name = "state-toggle"; packageName = "state-toggle"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz"; - sha512 = "Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og=="; + url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.2.tgz"; + sha512 = "8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw=="; }; }; "static-eval-2.0.2" = { @@ -33062,13 +34295,13 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; - "string-kit-0.9.3" = { + "string-kit-0.9.4" = { name = "string-kit"; packageName = "string-kit"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/string-kit/-/string-kit-0.9.3.tgz"; - sha512 = "FlUfMA5VPS6ujLjuD49ScLgywiMfDyrZ+bkBYbM0UEvB+eAqtFFXIANEaeV4XkLnr2w1k3ttYCfCXLiKlcJQfQ=="; + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.9.4.tgz"; + sha512 = "B/NRR/m4Lb/DCUGgFqEGx1v6qo/5NQphxgasd+cSm1/pT++V+qb8MkMz81hmtaeh0lkxdxeiL9sCaDXh8MZwUw=="; }; }; "string-length-2.0.0" = { @@ -33413,6 +34646,15 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; + "strip-json-comments-3.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; + sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="; + }; + }; "strip-outer-1.0.1" = { name = "strip-outer"; packageName = "strip-outer"; @@ -33467,6 +34709,33 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; + "stylint-1.5.9" = { + name = "stylint"; + packageName = "stylint"; + version = "1.5.9"; + src = fetchurl { + url = "https://registry.npmjs.org/stylint/-/stylint-1.5.9.tgz"; + sha1 = "29f4dc129fa1ca22150cd867223cee2bed5ff6a2"; + }; + }; + "stylus-0.54.5" = { + name = "stylus"; + packageName = "stylus"; + version = "0.54.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz"; + sha1 = "42b9560931ca7090ce8515a798ba9e6aa3d6dc79"; + }; + }; + "stylus-supremacy-2.12.7" = { + name = "stylus-supremacy"; + packageName = "stylus-supremacy"; + version = "2.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/stylus-supremacy/-/stylus-supremacy-2.12.7.tgz"; + sha512 = "Z5P0XttU45C+s1F360Bn9pd/5rZrct28NTfhKnrXC33Y7KDWwJCYHvT8Ypwie6Huxnt9W1ffCjBbkZYlk9yXYw=="; + }; + }; "subarg-1.0.0" = { name = "subarg"; packageName = "subarg"; @@ -33611,6 +34880,15 @@ let sha512 = "Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg=="; }; }; + "supports-color-4.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; + sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; + }; + }; "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; @@ -33710,6 +34988,15 @@ let sha1 = "c39203a4587385fad3c850a0bd1bcafa081974e3"; }; }; + "symbol-0.2.3" = { + name = "symbol"; + packageName = "symbol"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol/-/symbol-0.2.3.tgz"; + sha1 = "3b9873b8a901e47c6efe21526a3ac372ef28bbc7"; + }; + }; "symbol-observable-1.0.1" = { name = "symbol-observable"; packageName = "symbol-observable"; @@ -33773,13 +35060,22 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "table-5.2.3" = { + "table-4.0.2" = { name = "table"; packageName = "table"; - version = "5.2.3"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-5.2.3.tgz"; - sha512 = "N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ=="; + url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz"; + sha512 = "UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA=="; + }; + }; + "table-5.3.2" = { + name = "table"; + packageName = "table"; + version = "5.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-5.3.2.tgz"; + sha512 = "gDBrfla2z1JiBio5BE7nudwkjTjPOTduCzJC94fc1JjnuzI+tUsMiDskxFQCskxAtMB2c/ZwD6R2lg65zCptdQ=="; }; }; "table-layout-0.4.4" = { @@ -34044,6 +35340,15 @@ let sha1 = "6b0446856a9b1114d1856ffcbe509cccb0977265"; }; }; + "tempy-0.2.1" = { + name = "tempy"; + packageName = "tempy"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tempy/-/tempy-0.2.1.tgz"; + sha512 = "LB83o9bfZGrntdqPuRdanIVCPReam9SOZKW0fOy5I9X3A854GGWi0tjCqoXEk84XIEYBc/x9Hq3EFop/H5wJaw=="; + }; + }; "term-size-1.2.0" = { name = "term-size"; packageName = "term-size"; @@ -34116,6 +35421,33 @@ let sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; }; + "textlint-rule-helper-1.2.0" = { + name = "textlint-rule-helper"; + packageName = "textlint-rule-helper"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-1.2.0.tgz"; + sha1 = "be68d47a5146b16dd116278c9aeb7bd35631ccda"; + }; + }; + "textlint-rule-helper-2.1.1" = { + name = "textlint-rule-helper"; + packageName = "textlint-rule-helper"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-2.1.1.tgz"; + sha512 = "6fxgHzoJVkjl3LaC1b2Egi+5wbhG4i0pU0knJmQujVhxIJ3D3AcQQZPs457xKAi5xKz1WayYeTeJ5jrD/hnO7g=="; + }; + }; + "textlint-util-to-string-1.2.1" = { + name = "textlint-util-to-string"; + packageName = "textlint-util-to-string"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-util-to-string/-/textlint-util-to-string-1.2.1.tgz"; + sha1 = "1cf89956d27555a55e9588c06b35a50f0d1d46f9"; + }; + }; "then-fs-2.0.0" = { name = "then-fs"; packageName = "then-fs"; @@ -34206,6 +35538,15 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; + "through2-0.4.2" = { + name = "through2"; + packageName = "through2"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz"; + sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b"; + }; + }; "through2-0.6.5" = { name = "through2"; packageName = "through2"; @@ -34467,13 +35808,13 @@ let sha512 = "NQPUaywaVC2hzWkBBsTX3sV2XfxU0mc409rJyrA7iCu5DSTjMLUqI+U4KJVSy/Ltp0zgbWMWua471R7zMql9Pw=="; }; }; - "tmp-promise-1.0.5" = { + "tmp-promise-1.1.0" = { name = "tmp-promise"; packageName = "tmp-promise"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.0.5.tgz"; - sha512 = "hOabTz9Tp49wCozFwuJe5ISrOqkECm6kzw66XTP23DuzNU7QS/KiZq5LC9Y7QSy8f1rPSLy4bKaViP0OwGI1cA=="; + url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.1.0.tgz"; + sha512 = "8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw=="; }; }; "tmpl-1.0.4" = { @@ -34638,6 +35979,33 @@ let sha1 = "88defecd43adb2ef598625f0e3d59f7f342941ba"; }; }; + "to-vfile-2.2.0" = { + name = "to-vfile"; + packageName = "to-vfile"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-vfile/-/to-vfile-2.2.0.tgz"; + sha512 = "saGC8/lWdGrEoBMLUtgzhRHWAkQMP8gdldA3MOAUhBwTGEb1RSMVcflHGSx4ZJsdEZ9o1qDBCPp47LCPrbZWow=="; + }; + }; + "to-vfile-4.0.0" = { + name = "to-vfile"; + packageName = "to-vfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-vfile/-/to-vfile-4.0.0.tgz"; + sha512 = "Y7EDM+uoU8TZxF5ej2mUR0dLO4qbuuNRnJKxEht2QJWEq2421pyG1D1x8YxPKmyTc6nHh7Td/jLGFxYo+9vkLA=="; + }; + }; + "to-vfile-5.0.2" = { + name = "to-vfile"; + packageName = "to-vfile"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-vfile/-/to-vfile-5.0.2.tgz"; + sha512 = "Gp2q0HCUR+4At6c6mvFKug75NP/8Cu5r7ONvEcJJPBGiDT4HeLBrRnPKJbOe84nHJqYhIah2y367Tr2+IUkwMA=="; + }; + }; "toidentifier-1.0.0" = { name = "toidentifier"; packageName = "toidentifier"; @@ -34674,6 +36042,24 @@ let sha512 = "y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="; }; }; + "too-wordy-0.1.6" = { + name = "too-wordy"; + packageName = "too-wordy"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/too-wordy/-/too-wordy-0.1.6.tgz"; + sha512 = "MV5F74YF9+UYsvwXGXTh+5YP3EqH/ivwWfyFE2/YHWQQxm9jDPmkIC23nkN133Ye4nO3HTXmiMcfGqJ5xRPfOA=="; + }; + }; + "too-wordy-0.2.2" = { + name = "too-wordy"; + packageName = "too-wordy"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/too-wordy/-/too-wordy-0.2.2.tgz"; + sha512 = "ePZfjs1ajL4b8jT4MeVId+9Ci5hJCzAtNIEXIHyFYmKmQuX+eHC/RNv6tuLMUhrGrhJ+sYWW/lBF/LKILHGZEA=="; + }; + }; "topo-3.0.3" = { name = "topo"; packageName = "topo"; @@ -34863,6 +36249,24 @@ let sha512 = "7mV4KbsLMuA6ths3J1wpVUj2PLmLdoNEGnP9fm3kxef4UXYC/A0rL5gKsqtkUaCMuRYUMORyioy8IpBWUBQ1Ig=="; }; }; + "tree-sitter-0.13.23" = { + name = "tree-sitter"; + packageName = "tree-sitter"; + version = "0.13.23"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.13.23.tgz"; + sha512 = "75AiPbMEstv+YK8h4FkAHnmAJ6nNIUj/NFzRvKCHovmwSEKMi8Wc/E/crB4lJnHBOfV/f/DMQjN+e1Y36kagug=="; + }; + }; + "tree-sitter-bash-0.13.9" = { + name = "tree-sitter-bash"; + packageName = "tree-sitter-bash"; + version = "0.13.9"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-sitter-bash/-/tree-sitter-bash-0.13.9.tgz"; + sha512 = "b0L+QLS2eeIVrHnnbkFlvO1nElhPwqTxLIwyTeJytPYT0TS50Pe7bP+uPi3gkHT1YajxcauCxX1aDWDiZK1h5Q=="; + }; + }; "trim-0.0.1" = { name = "trim"; packageName = "trim"; @@ -34872,13 +36276,13 @@ let sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; }; }; - "trim-lines-1.1.1" = { + "trim-lines-1.1.2" = { name = "trim-lines"; packageName = "trim-lines"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/trim-lines/-/trim-lines-1.1.1.tgz"; - sha512 = "X+eloHbgJGxczUk1WSjIvn7aC9oN3jVE3rQfRVKcgpavi3jxtCn0VVKtjOBj64Yop96UYn/ujJRpTbCdAF1vyg=="; + url = "https://registry.npmjs.org/trim-lines/-/trim-lines-1.1.2.tgz"; + sha512 = "3GOuyNeTqk3FAqc3jOJtw7FTjYl94XBR5aD9QnDbK/T4CA9sW/J0l9RoaRPE9wyPP7NF331qnHnvJFBJ+IDkmQ=="; }; }; "trim-newlines-1.0.0" = { @@ -35079,6 +36483,15 @@ let sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; + "turndown-4.0.2" = { + name = "turndown"; + packageName = "turndown"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/turndown/-/turndown-4.0.2.tgz"; + sha512 = "pqZ6WrHFGnxXC9q2xJ3Qa7EoLAwrojgFRajWZjxTKwbz9vnNnyi8lLjiD5h86UTPOcMlEyHjm6NMhjEDdlc25A=="; + }; + }; "tweetnacl-0.14.5" = { name = "tweetnacl"; packageName = "tweetnacl"; @@ -35106,13 +36519,13 @@ let sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; }; }; - "twig-1.13.2" = { + "twig-1.13.3" = { name = "twig"; packageName = "twig"; - version = "1.13.2"; + version = "1.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/twig/-/twig-1.13.2.tgz"; - sha512 = "F7o4sDD2DaIj2II8VrbmDXnompOO6ESNQSh97rtJuif00v5FoUWTlkJE1ZlfeFNAwSCU9rexWsB1+3oF8jmU/Q=="; + url = "https://registry.npmjs.org/twig/-/twig-1.13.3.tgz"; + sha512 = "Kjart2102Kf0IdsEmLonSJKcByU7o9uiJhBde3GhrNHrX4XenT5WSKu4Hpkx+rF6Kyppeyd48BKsCREIOPXd/g=="; }; }; "twitter-ng-0.6.2" = { @@ -35124,6 +36537,15 @@ let sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; }; }; + "txt-to-ast-3.0.3" = { + name = "txt-to-ast"; + packageName = "txt-to-ast"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/txt-to-ast/-/txt-to-ast-3.0.3.tgz"; + sha512 = "/XrQjW0e5Z915m1A0qeXD9tSLDmz8zGjR6imhGDme6rMtXYudFpXXhaToKnM52nPPCNdCh6YQsLLkwbbkFvzVA=="; + }; + }; "type-check-0.3.2" = { name = "type-check"; packageName = "type-check"; @@ -35160,13 +36582,13 @@ let sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; }; }; - "type-is-1.6.16" = { + "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; - version = "1.6.16"; + version = "1.6.18"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz"; - sha512 = "HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q=="; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; "typechecker-4.7.0" = { @@ -35196,6 +36618,15 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; + "typescript-2.9.2" = { + name = "typescript"; + packageName = "typescript"; + version = "2.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz"; + sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="; + }; + }; "typescript-3.0.3" = { name = "typescript"; packageName = "typescript"; @@ -35223,6 +36654,15 @@ let sha512 = "YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw=="; }; }; + "typescript-eslint-parser-16.0.1" = { + name = "typescript-eslint-parser"; + packageName = "typescript-eslint-parser"; + version = "16.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript-eslint-parser/-/typescript-eslint-parser-16.0.1.tgz"; + sha512 = "IKawLTu4A2xN3aN/cPLxvZ0bhxZHILGDKTZWvWNJ3sLNhJ3PjfMEDQmR2VMpdRPrmWOadgWXRwjLBzSA8AGsaQ=="; + }; + }; "typewise-1.0.3" = { name = "typewise"; packageName = "typewise"; @@ -35295,6 +36735,15 @@ let sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; }; }; + "uglify-js-3.5.11" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.5.11"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.11.tgz"; + sha512 = "izPJg8RsSyqxbdnqX36ExpbH3K7tDBsAU/VfNv89VkMFy3z39zFjunQGsSHOlGlyIfGLGprGeosgQno3bo2/Kg=="; + }; + }; "uglify-js-3.5.3" = { name = "uglify-js"; packageName = "uglify-js"; @@ -35304,15 +36753,6 @@ let sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; }; }; - "uglify-js-3.5.6" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.6.tgz"; - sha512 = "YDKRX8F0Y+Jr7LhoVk0n4G7ltR3Y7qFAj+DtVBthlOgCcIj1hyMigCfousVfn9HKmvJ+qiFlLDwaHx44/e5ZKw=="; - }; - }; "uglify-to-browserify-1.0.2" = { name = "uglify-to-browserify"; packageName = "uglify-to-browserify"; @@ -35385,15 +36825,6 @@ let sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }; }; - "uint48be-1.0.2" = { - name = "uint48be"; - packageName = "uint48be"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uint48be/-/uint48be-1.0.2.tgz"; - sha512 = "jNn1eEi81BLiZfJkjbiAKPDMj7iFrturKazqpBu0aJYLr6evgkn+9rgkX/gUwPBj5j2Ri5oUelsqC/S1zmpWBA=="; - }; - }; "uint48be-2.0.1" = { name = "uint48be"; packageName = "uint48be"; @@ -35520,15 +36951,6 @@ let sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; }; }; - "underscore-1.8.3" = { - name = "underscore"; - packageName = "underscore"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - }; "underscore-1.9.1" = { name = "underscore"; packageName = "underscore"; @@ -35538,15 +36960,6 @@ let sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; - "underscore-contrib-0.3.0" = { - name = "underscore-contrib"; - packageName = "underscore-contrib"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz"; - sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7"; - }; - }; "underscore.string-2.3.3" = { name = "underscore.string"; packageName = "underscore.string"; @@ -35646,6 +37059,15 @@ let sha1 = "14bc6cd40d98ffff75b405506bad873ecbbac3ba"; }; }; + "unified-4.2.1" = { + name = "unified"; + packageName = "unified"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unified/-/unified-4.2.1.tgz"; + sha1 = "76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e"; + }; + }; "unified-6.2.0" = { name = "unified"; packageName = "unified"; @@ -35655,6 +37077,51 @@ let sha512 = "1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA=="; }; }; + "unified-7.1.0" = { + name = "unified"; + packageName = "unified"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unified/-/unified-7.1.0.tgz"; + sha512 = "lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw=="; + }; + }; + "unified-diff-1.0.2" = { + name = "unified-diff"; + packageName = "unified-diff"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unified-diff/-/unified-diff-1.0.2.tgz"; + sha1 = "920b33da9abae087dd444904372e7c3fbd367d85"; + }; + }; + "unified-engine-4.0.1" = { + name = "unified-engine"; + packageName = "unified-engine"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-4.0.1.tgz"; + sha1 = "9692aa97fd5c4ec36889779e12514bef8e863fc3"; + }; + }; + "unified-engine-6.0.1" = { + name = "unified-engine"; + packageName = "unified-engine"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-6.0.1.tgz"; + sha512 = "iDJYH82TgcezQA4IZzhCNJQx7vBsGk4h9s4Q7Fscrb3qcPsxBqVrVNYez2W3sBVTxuU1bFAhyRpA6ba/R4j93A=="; + }; + }; + "unified-message-control-1.0.4" = { + name = "unified-message-control"; + packageName = "unified-message-control"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-1.0.4.tgz"; + sha512 = "e1dEtN4Z/TvLn/qHm+xeZpzqhJTtfZusFErk336kkZVpqrJYiV9ptxq+SbRPFMlN0OkjDYHmVJ929KYjsMTo3g=="; + }; + }; "union-0.4.6" = { name = "union"; packageName = "union"; @@ -35745,6 +37212,42 @@ let sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; }; }; + "unist-util-filter-0.2.1" = { + name = "unist-util-filter"; + packageName = "unist-util-filter"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-filter/-/unist-util-filter-0.2.1.tgz"; + sha1 = "e2f7876828903a6a9308e362051f86b14f35b545"; + }; + }; + "unist-util-find-1.0.1" = { + name = "unist-util-find"; + packageName = "unist-util-find"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-find/-/unist-util-find-1.0.1.tgz"; + sha1 = "1062bbb6928c7a97c6adc89b53745d4c46c222a2"; + }; + }; + "unist-util-inspect-4.1.3" = { + name = "unist-util-inspect"; + packageName = "unist-util-inspect"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-4.1.3.tgz"; + sha512 = "Fv9R88ZBbDp7mHN+wsbxS1r8VW3unyhZh/F18dcJRQsg0+g3DxNQnMS+AEG/uotB8Md+HMK/TfzSU5lUDWxkZg=="; + }; + }; + "unist-util-is-1.0.0" = { + name = "unist-util-is"; + packageName = "unist-util-is"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-1.0.0.tgz"; + sha1 = "4c7b3c5c0f6aa963640056fe4af7b5fcfdbb8ef0"; + }; + }; "unist-util-is-2.1.2" = { name = "unist-util-is"; packageName = "unist-util-is"; @@ -35754,6 +37257,33 @@ let sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw=="; }; }; + "unist-util-map-1.0.4" = { + name = "unist-util-map"; + packageName = "unist-util-map"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-map/-/unist-util-map-1.0.4.tgz"; + sha512 = "Qv68pQz05hQbjPI+TubZQI5XII5DScRVWaKNc6+qfmHaFGxaGUbkV8i++mM2nk7XgwXE+vei99d/Q2d1tMA3EQ=="; + }; + }; + "unist-util-modify-children-1.1.3" = { + name = "unist-util-modify-children"; + packageName = "unist-util-modify-children"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.3.tgz"; + sha512 = "Aw3Us+NPrJGYWyLhcaqYzgxd/pryIanDNHVVvwdtTEEQ3Yfa/+sjnT2EeAAHbtTMAaYEdPW3XN6jxbzVWAo/BQ=="; + }; + }; + "unist-util-position-3.0.2" = { + name = "unist-util-position"; + packageName = "unist-util-position"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.2.tgz"; + sha512 = "npmFu92l/+b1Ao6uGP4I1WFz9hsKv7qleZ4aliw6x0RVu6A9A3tAf57NMpFfzQ02jxRtJZuRn+C8xWT7GWnH0g=="; + }; + }; "unist-util-remove-position-1.1.2" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; @@ -35763,6 +37293,15 @@ let sha512 = "XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q=="; }; }; + "unist-util-select-1.5.0" = { + name = "unist-util-select"; + packageName = "unist-util-select"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-select/-/unist-util-select-1.5.0.tgz"; + sha1 = "a93c2be8c0f653827803b81331adec2aa24cd933"; + }; + }; "unist-util-stringify-position-1.1.2" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; @@ -35781,6 +37320,15 @@ let sha512 = "FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw=="; }; }; + "unist-util-visit-children-1.1.2" = { + name = "unist-util-visit-children"; + packageName = "unist-util-visit-children"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-1.1.2.tgz"; + sha512 = "q4t6aprUcSQ2/+xlswuh2wUKwUUuMmDjSkfwkMjeVwCXc8NqX8g0FSmNf68CznCmbkrsOPDUR0wj14bCFXXqbA=="; + }; + }; "unist-util-visit-parents-2.0.1" = { name = "unist-util-visit-parents"; packageName = "unist-util-visit-parents"; @@ -35790,13 +37338,13 @@ let sha512 = "6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA=="; }; }; - "universal-user-agent-2.0.3" = { + "universal-user-agent-2.1.0" = { name = "universal-user-agent"; packageName = "universal-user-agent"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-2.0.3.tgz"; - sha512 = "eRHEHhChCBHrZsA4WEhdgiOKgdvgrMIHwnwnqD0r5C6AO8kwKcG7qSku3iXdhvHL3YvsS9ZkSGN8h/hIpoFC8g=="; + url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-2.1.0.tgz"; + sha512 = "8itiX7G05Tu3mGDTdNY2fB4KJ8MgZLS54RdG6PkkfwMAavrXu1mV/lls/GABx9O3Rw4PnTtasxrvbMQoBYY92Q=="; }; }; "universalify-0.1.2" = { @@ -36042,6 +37590,15 @@ let sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; }; }; + "urijs-1.19.1" = { + name = "urijs"; + packageName = "urijs"; + version = "1.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz"; + sha512 = "xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg=="; + }; + }; "urix-0.1.0" = { name = "urix"; packageName = "urix"; @@ -36096,13 +37653,13 @@ let sha512 = "rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw=="; }; }; - "url-parse-1.4.6" = { + "url-parse-1.4.7" = { name = "url-parse"; packageName = "url-parse"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.6.tgz"; - sha512 = "/B8AD9iQ01seoXmXf9z/MjLZQIdOoYl/+gvsQF6+mpnxaTfG9P7srYaiqaDMyKkR36XMXfhqSHss5MyFAO8lew=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz"; + sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg=="; }; }; "url-parse-lax-1.0.0" = { @@ -36402,13 +37959,13 @@ let sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; - "v8-compile-cache-2.0.2" = { + "v8-compile-cache-2.0.3" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz"; - sha512 = "1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw=="; + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz"; + sha512 = "CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w=="; }; }; "v8-debug-1.0.1" = { @@ -36438,13 +37995,13 @@ let sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; }; }; - "v8flags-3.1.2" = { + "v8flags-3.1.3" = { name = "v8flags"; packageName = "v8flags"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.2.tgz"; - sha512 = "MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw=="; + url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz"; + sha512 = "amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w=="; }; }; "valid-identifier-0.0.2" = { @@ -36582,13 +38139,13 @@ let sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94"; }; }; - "vendors-1.0.2" = { + "vendors-1.0.3" = { name = "vendors"; packageName = "vendors"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz"; - sha512 = "w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ=="; + url = "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz"; + sha512 = "fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw=="; }; }; "verror-1.1.0" = { @@ -36654,6 +38211,15 @@ let sha512 = "ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w=="; }; }; + "vfile-3.0.1" = { + name = "vfile"; + packageName = "vfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile/-/vfile-3.0.1.tgz"; + sha512 = "y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ=="; + }; + }; "vfile-find-down-1.0.0" = { name = "vfile-find-down"; packageName = "vfile-find-down"; @@ -36672,6 +38238,15 @@ let sha1 = "5604da6fe453b34350637984eb5fe4909e280390"; }; }; + "vfile-find-up-2.0.2" = { + name = "vfile-find-up"; + packageName = "vfile-find-up"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-2.0.2.tgz"; + sha512 = "kYGgsSNpYjPxcEoud1aHNFfchsV0Z6Pyc8M5LfD1wX/tV0/bn32MKHDfv4fqV9DBLVuw2YSGOs31nRY/42DfUA=="; + }; + }; "vfile-location-2.0.4" = { name = "vfile-location"; packageName = "vfile-location"; @@ -36699,6 +38274,24 @@ let sha1 = "21a7009bfe55e24df8ff432aa5bf6f6efa74e418"; }; }; + "vfile-reporter-4.0.0" = { + name = "vfile-reporter"; + packageName = "vfile-reporter"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-4.0.0.tgz"; + sha1 = "ea6f0ae1342f4841573985e05f941736f27de9da"; + }; + }; + "vfile-reporter-5.1.1" = { + name = "vfile-reporter"; + packageName = "vfile-reporter"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-5.1.1.tgz"; + sha512 = "A/cfKvfVmeEmAKx1yyOWggCjC/k184Vkl5pVJAw5CEdppHd5FHBVcdyJ1JBSqIdJjJqyhZY4ZD3JycHr/uwmlA=="; + }; + }; "vfile-sort-1.0.0" = { name = "vfile-sort"; packageName = "vfile-sort"; @@ -36708,6 +38301,24 @@ let sha1 = "17ee491ba43e8951bb22913fcff32a7dc4d234d4"; }; }; + "vfile-sort-2.2.0" = { + name = "vfile-sort"; + packageName = "vfile-sort"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.0.tgz"; + sha512 = "RgxLXVWrJBWb2GuP8FsSkqK7HmbjXjnI8qx3nD6NTWhsWaelaKvJuxfh1F1d1lkCPD7imo4zzi8cf6IOMgaTnQ=="; + }; + }; + "vfile-statistics-1.1.2" = { + name = "vfile-statistics"; + packageName = "vfile-statistics"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.2.tgz"; + sha512 = "16wAC9eEGXdsD35LX9m/iXCRIZyX5LIrDgDtAF92rbATSqsBRbC4n05e0Rj5vt3XRpcKu0UJeWnTxWsSyvNZ+w=="; + }; + }; "vhost-3.0.2" = { name = "vhost"; packageName = "vhost"; @@ -36861,6 +38472,33 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; + "vscode-css-languageservice-3.0.13" = { + name = "vscode-css-languageservice"; + packageName = "vscode-css-languageservice"; + version = "3.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-3.0.13.tgz"; + sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; + }; + }; + "vscode-emmet-helper-1.2.15" = { + name = "vscode-emmet-helper"; + packageName = "vscode-emmet-helper"; + version = "1.2.15"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-1.2.15.tgz"; + sha512 = "JplvmMMWSvm/6/dZezix2ADPM49u6YahPYjs/QToohUpomW/2Eb27ecCrkCyOGBPfKLKGiOPHCssss8TSDA9ag=="; + }; + }; + "vscode-html-languageservice-2.1.12" = { + name = "vscode-html-languageservice"; + packageName = "vscode-html-languageservice"; + version = "2.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.1.12.tgz"; + sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; + }; + }; "vscode-jsonrpc-3.6.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -36879,6 +38517,15 @@ let sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="; }; }; + "vscode-jsonrpc-4.1.0-next.2" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "4.1.0-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.2.tgz"; + sha512 = "GsBLjP9DxQ42yl1mW9GEIlnSc0+R8mfzhaebwmmTPEJjezD5SPoAo3DFrIAFZha9yvQ1nzZfZlhtVpGQmgxtXg=="; + }; + }; "vscode-languageclient-4.0.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -36897,6 +38544,15 @@ let sha512 = "bxj9nRadNkXYfVG/fjA5a+KA5WaJCeP1F2Tnj3rYFS0pKALZQCPNqk3KO/LdiGFidjyICMG7xoHvYO9J9xosXg=="; }; }; + "vscode-languageserver-4.4.2" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.4.2.tgz"; + sha512 = "61y8Raevi9EigDgg9NelvT9cUAohiEbUl1LOwQQgOCAaNX62yKny/ddi0uC+FUTm4CzsjhBu+06R+vYgfCYReA=="; + }; + }; "vscode-languageserver-5.2.1" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -36906,6 +38562,15 @@ let sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A=="; }; }; + "vscode-languageserver-5.3.0-next.6" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "5.3.0-next.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.3.0-next.6.tgz"; + sha512 = "7DtEBFc0bkcIaKhhx5Q4ZvIkJ1PAtX0pqTnI6QyA14yLL1TfqSSoNRczamb9khpGbLyN5oje7kBJD1kiOvsM+Q=="; + }; + }; "vscode-languageserver-protocol-3.14.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -36915,6 +38580,15 @@ let sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g=="; }; }; + "vscode-languageserver-protocol-3.15.0-next.5" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.15.0-next.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.5.tgz"; + sha512 = "rR7Zo5WZTGSsE9lq7pPSgO+VMhVV8UVq6emrDoQ3x5dUyhLKB2/gbMkGKucQpsKGLtF/NuccCa+3jMsO788HjQ=="; + }; + }; "vscode-languageserver-protocol-3.6.0" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -36924,6 +38598,15 @@ let sha512 = "PN5hVQQQxrtHSZR8UCstqaoI9f2H9JctFTtdIpONWjzQNurWrc48qSXXU/vTfnbSrNou8qrJgkZ4QEZsyozOMA=="; }; }; + "vscode-languageserver-protocol-foldingprovider-2.0.1" = { + name = "vscode-languageserver-protocol-foldingprovider"; + packageName = "vscode-languageserver-protocol-foldingprovider"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.1.tgz"; + sha512 = "N8bOS8i0xuQMn/y0bijyefDbOsMl6hiH6LDREYWavTLTM5jbj44EiQfStsbmAv/0eaFKkL/jf5hW7nWwBy2HBw=="; + }; + }; "vscode-languageserver-types-3.14.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -36933,6 +38616,33 @@ let sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="; }; }; + "vscode-languageserver-types-3.15.0-next.1" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.15.0-next.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.1.tgz"; + sha512 = "R0kzmaI8gOGEoU7b9huYQAzgZzRQ/5Q8HKjsIUdfz0MjXcBZ4tr1ik1So1p1O5kGrI1VTCd22Fw/wI7ECGoIPw=="; + }; + }; + "vscode-nls-3.2.5" = { + name = "vscode-nls"; + packageName = "vscode-nls"; + version = "3.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-3.2.5.tgz"; + sha512 = "ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw=="; + }; + }; + "vscode-nls-4.1.0" = { + name = "vscode-nls"; + packageName = "vscode-nls"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.0.tgz"; + sha512 = "zKsFWVzL1wlCezgaI3XiN42IT8DIPM1Qr+G+RBhiU3U0bJCdC8pPELakRCtuVT4wF3gBZjBrUDQ8mowL7hmgwA=="; + }; + }; "vscode-uri-1.0.3" = { name = "vscode-uri"; packageName = "vscode-uri"; @@ -36969,31 +38679,49 @@ let sha512 = "gWZsSbfHR2CmMLgpHxj6viwLczUdZ3zdwkXPoEUa7yn34Z8mZJW/fokwhPONgQNTrs3KNcq+zNQA7ED09+fP4A=="; }; }; - "vue-observe-visibility-0.4.3" = { - name = "vue-observe-visibility"; - packageName = "vue-observe-visibility"; - version = "0.4.3"; + "vue-eslint-parser-2.0.3" = { + name = "vue-eslint-parser"; + packageName = "vue-eslint-parser"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.3.tgz"; - sha512 = "YyyO3a5OUkgpmC0NEf+xWJR0jVdFWzVbKRDzUumOVMhfr3+jxXEycYNHCM3rEO5lcj3ZNJpDomZEYEx0Wqqh9A=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz"; + sha512 = "ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw=="; }; }; - "vue-resize-0.4.5" = { - name = "vue-resize"; - packageName = "vue-resize"; - version = "0.4.5"; + "vue-eslint-parser-5.0.0" = { + name = "vue-eslint-parser"; + packageName = "vue-eslint-parser"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.5.tgz"; - sha512 = "bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz"; + sha512 = "JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g=="; }; }; - "vue-virtual-scroller-1.0.0-rc.2" = { - name = "vue-virtual-scroller"; - packageName = "vue-virtual-scroller"; - version = "1.0.0-rc.2"; + "vue-eslint-parser-6.0.4" = { + name = "vue-eslint-parser"; + packageName = "vue-eslint-parser"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/vue-virtual-scroller/-/vue-virtual-scroller-1.0.0-rc.2.tgz"; - sha512 = "4YFx1a+QDP4f6HW/HBI/qHcmSTlh7BMH6IjEH8WC3ylt499cErl0LpvLLAx9yo3c6NtuK/XvjYXi0vvdxFB5dw=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-6.0.4.tgz"; + sha512 = "GYsDsDWwKaGtnkW4nGUxr01wqIO2FB9/QHQTW1Gl5SUr5OyQvpnR90/D+Gq2cIxURX7aJ7+VyD+37Yx9eFwTgw=="; + }; + }; + "vue-onsenui-helper-json-1.0.2" = { + name = "vue-onsenui-helper-json"; + packageName = "vue-onsenui-helper-json"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-onsenui-helper-json/-/vue-onsenui-helper-json-1.0.2.tgz"; + sha512 = "ikg8ruE17tIXF9mrVvKoOR3oyM9nk0TcmUHyeBWod5ILEH9DRN0+seX4gwsSbjdxMYlIIvmnCFPQeMdlcJqPJQ=="; + }; + }; + "vuetify-helper-json-1.0.0" = { + name = "vuetify-helper-json"; + packageName = "vuetify-helper-json"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify-helper-json/-/vuetify-helper-json-1.0.0.tgz"; + sha512 = "JNjc77FJbWEOk+Y9uzPr8u3cogRivjUE1Ha9DhPruBJutRO1Lf4ZVff44/N37vwC9e9JJGjj7y4JtT2kY7exrw=="; }; }; "w3c-hr-time-1.0.1" = { @@ -37068,6 +38796,15 @@ let sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; + "weasel-words-0.1.1" = { + name = "weasel-words"; + packageName = "weasel-words"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/weasel-words/-/weasel-words-0.1.1.tgz"; + sha1 = "7137946585c73fe44882013853bd000c5d687a4e"; + }; + }; "webassemblyjs-1.8.5" = { name = "webassemblyjs"; packageName = "webassemblyjs"; @@ -37095,22 +38832,22 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.30.0" = { + "webpack-4.31.0" = { name = "webpack"; packageName = "webpack"; - version = "4.30.0"; + version = "4.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.30.0.tgz"; - sha512 = "4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.31.0.tgz"; + sha512 = "n6RVO3X0LbbipoE62akME9K/JI7qYrwwufs20VvgNNpqUoH4860KkaxJTbGq5bgkVZF9FqyyTG/0WPLH3PVNJA=="; }; }; - "webpack-cli-3.3.1" = { + "webpack-cli-3.3.2" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.1.tgz"; - sha512 = "c2inFU7SM0IttEgF7fK6AaUsbBnORRzminvbyRKS+NlbQHVZdCtzKBlavRL5359bFsywXGRAItA5di/IruC8mg=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.2.tgz"; + sha512 = "FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA=="; }; }; "webpack-core-0.6.9" = { @@ -37365,6 +39102,15 @@ let sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; }; }; + "window-size-0.2.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; + sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; + }; + }; "windows-no-runnable-0.0.6" = { name = "windows-no-runnable"; packageName = "windows-no-runnable"; @@ -37518,13 +39264,13 @@ let sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw=="; }; }; - "worker-farm-1.6.0" = { + "worker-farm-1.7.0" = { name = "worker-farm"; packageName = "worker-farm"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz"; - sha512 = "6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ=="; + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz"; + sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; "wrap-ansi-2.1.0" = { @@ -37599,6 +39345,15 @@ let sha512 = "s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g=="; }; }; + "write-good-0.11.3" = { + name = "write-good"; + packageName = "write-good"; + version = "0.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/write-good/-/write-good-0.11.3.tgz"; + sha512 = "fDKIHO5wCzTLCOGNJl1rzzJrZlTIzfZl8msOoJQZzRhYo0X/tFTm4+2B1zTibFYK01Nnd1kLZBjj4xjcFLePNQ=="; + }; + }; "write-json-file-2.3.0" = { name = "write-json-file"; packageName = "write-json-file"; @@ -37716,6 +39471,24 @@ let sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; }; }; + "x-is-array-0.1.0" = { + name = "x-is-array"; + packageName = "x-is-array"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/x-is-array/-/x-is-array-0.1.0.tgz"; + sha1 = "de520171d47b3f416f5587d629b89d26b12dc29d"; + }; + }; + "x-is-function-1.0.4" = { + name = "x-is-function"; + packageName = "x-is-function"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/x-is-function/-/x-is-function-1.0.4.tgz"; + sha1 = "5d294dc3d268cbdd062580e0c5df77a391d1fa1e"; + }; + }; "x-is-string-0.1.0" = { name = "x-is-string"; packageName = "x-is-string"; @@ -37851,13 +39624,13 @@ let sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; }; - "xmlcreate-1.0.2" = { + "xmlcreate-2.0.1" = { name = "xmlcreate"; packageName = "xmlcreate"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz"; - sha1 = "fa6bf762a60a413fb3dd8f4b03c5b269238d308f"; + url = "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.1.tgz"; + sha512 = "MjGsXhKG8YjTKrDCXseFo3ClbMGvUD4en29H2Cev1dv4P/chlpw6KdYmlCWDkhosBVKRDjM836+3e3pm1cBNJA=="; }; }; "xmldom-0.1.27" = { @@ -37942,13 +39715,22 @@ let sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; }; }; - "xstream-11.10.0" = { + "xstream-11.11.0" = { name = "xstream"; packageName = "xstream"; - version = "11.10.0"; + version = "11.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/xstream/-/xstream-11.10.0.tgz"; - sha512 = "jzFCiRqGtrJi2S1/RPxVFgJwWVBzy4suMPBXlhOi0BJC7VvsXgo2yOHWnOasnj24n2Dlj2Mgfl6fJXPOYmpHFA=="; + url = "https://registry.npmjs.org/xstream/-/xstream-11.11.0.tgz"; + sha512 = "0zF3PLsHrmbToPBgX1jYZFNw+t5octSFJgVRH44HGlGBBjY7gscvDQOZvty8IQV15Snia1RcLPECWDfEaE4aXg=="; + }; + }; + "xtend-2.1.2" = { + name = "xtend"; + packageName = "xtend"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"; + sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"; }; }; "xtend-3.0.0" = { @@ -38113,6 +39895,15 @@ let sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; }; }; + "yargs-4.7.1" = { + name = "yargs"; + packageName = "yargs"; + version = "4.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-4.7.1.tgz"; + sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; + }; + }; "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; @@ -38167,6 +39958,24 @@ let sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw=="; }; }; + "yargs-parser-13.1.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.0.tgz"; + sha512 = "Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA=="; + }; + }; + "yargs-parser-2.4.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; + sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -38362,17 +40171,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "7.3.8"; + version = "7.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.8.tgz"; - sha512 = "5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.9.tgz"; + sha512 = "7oJj7CKDlFUbQav1x1CV4xKKcbt0pnxY4unKcm7Q1tVXhu8bU2bc3cDA0aJnbofcYb6TJcd/C2qHgCt78q7edA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.13.8" - sources."@angular-devkit/core-7.3.8" - sources."@angular-devkit/schematics-7.3.8" - sources."@schematics/angular-7.3.8" - sources."@schematics/update-0.13.8" + sources."@angular-devkit/architect-0.13.9" + sources."@angular-devkit/core-7.3.9" + sources."@angular-devkit/schematics-7.3.9" + sources."@schematics/angular-7.3.9" + sources."@schematics/update-0.13.9" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.2.1" @@ -38497,11 +40306,11 @@ in sources."fs-minipass-1.2.5" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."genfun-5.0.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."glob-7.1.4" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -38647,7 +40456,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" @@ -38800,10 +40609,10 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "1.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-1.0.0.tgz"; - sha512 = "MBiDU5cDr9UWuY2F0zq2fZlnyRq1aOPmJGMas22Qa14K1odpRXL3xkMHPN3uw2hAK5mD89Q+/KidOUtpi4V0Cg=="; + url = "https://registry.npmjs.org/asar/-/asar-2.0.1.tgz"; + sha512 = "Vo9yTuUtyFahkVMFaI6uMuX6N7k5DWa6a/8+7ov0/f8Lq9TVR0tUjzSzxQSxT1Y+RJIZgnP7BVb6Uhi+9cjxqA=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -38814,18 +40623,17 @@ in sources."concat-map-0.0.1" sources."cuint-0.2.2" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."once-1.4.0" - sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" - sources."pify-4.0.1" - sources."tmp-0.0.33" - sources."tmp-promise-1.0.5" + sources."rimraf-2.6.3" + sources."tmp-0.1.0" + sources."tmp-promise-1.1.0" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -38840,10 +40648,10 @@ in azure-functions-core-tools = nodeEnv.buildNodePackage { name = "azure-functions-core-tools"; packageName = "azure-functions-core-tools"; - version = "2.6.666"; + version = "2.7.1158"; src = fetchurl { - url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.6.666.tgz"; - sha512 = "upfBIn8oNw4gdgeFUwHep+3UTDdiMKOLoKDdKX3n40ymxGundNb4nAI7HhAauz6Hx0bvL8HURojnVCrep5kCeQ=="; + url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.7.1158.tgz"; + sha512 = "40RPWifao1FogT0OaDM5/VMik1d+rZ/moMitdzTThuiP1n7RAjUzqoVZSeEbOyijTZG++HBLiaIp2gXFv/Gadw=="; }; dependencies = [ sources."agent-base-4.2.1" @@ -38907,6 +40715,212 @@ in production = true; bypassCache = true; }; + bash-language-server = nodeEnv.buildNodePackage { + name = "bash-language-server"; + packageName = "bash-language-server"; + version = "1.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.5.6.tgz"; + sha512 = "GqW24myNihrUroXdL40AemizC3lBvr2wOiF0GzxYWqsBsJvi6CQor0Y9t10jOGn11evMhncmR2f2LoQdjsNpqw=="; + }; + dependencies = [ + sources."abab-2.0.0" + sources."acorn-5.7.3" + (sources."acorn-globals-4.3.2" // { + dependencies = [ + sources."acorn-6.1.1" + ]; + }) + sources."acorn-walk-6.1.1" + sources."ajv-6.10.0" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."array-equal-1.0.0" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bl-1.2.2" + sources."brace-expansion-1.1.11" + sources."browser-process-hrtime-0.1.3" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" + sources."caseless-0.12.0" + sources."chownr-1.1.1" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.7" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."cssom-0.3.6" + sources."cssstyle-1.2.2" + sources."dashdash-1.14.1" + (sources."data-urls-1.1.0" // { + dependencies = [ + sources."whatwg-url-7.0.0" + ]; + }) + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."domexception-1.0.1" + sources."ecc-jsbn-0.1.2" + sources."end-of-stream-1.4.1" + sources."escodegen-1.11.1" + sources."esprima-3.1.3" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."expand-template-2.0.3" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fs-constants-1.0.0" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."github-from-package-0.0.0" + sources."glob-7.1.4" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-unicode-2.0.1" + sources."html-encoding-sniffer-1.0.2" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."jsdom-11.12.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."left-pad-1.3.0" + sources."levn-0.3.0" + sources."lodash-4.17.11" + sources."lodash.sortby-4.7.0" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."nan-2.13.2" + sources."napi-build-utils-1.0.1" + sources."node-abi-2.8.0" + sources."noop-logger-0.1.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."nwsapi-2.1.4" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."optionator-0.8.2" + sources."os-homedir-1.0.2" + sources."parse5-4.0.0" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."pn-1.1.0" + sources."prebuild-install-5.3.0" + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.0" + sources."psl-1.1.31" + sources."pump-2.0.1" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."rc-1.2.8" + sources."readable-stream-2.3.6" + sources."request-2.88.0" + sources."request-promise-core-1.1.2" + sources."request-promise-native-1.0.7" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."simple-concat-1.0.0" + sources."simple-get-2.8.1" + sources."source-map-0.6.1" + sources."sshpk-1.16.1" + sources."stealthy-require-1.1.1" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."symbol-tree-3.2.2" + (sources."tar-fs-1.16.3" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."tar-stream-1.6.2" + sources."to-buffer-1.1.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tr46-1.0.1" + sources."tree-sitter-0.13.23" + sources."tree-sitter-bash-0.13.9" + sources."tunnel-agent-0.6.0" + sources."turndown-4.0.2" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."uri-js-4.2.2" + sources."urijs-1.19.1" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + sources."vscode-jsonrpc-4.0.0" + sources."vscode-languageserver-4.4.2" + sources."vscode-languageserver-protocol-3.14.1" + sources."vscode-languageserver-types-3.14.0" + sources."vscode-uri-1.0.6" + sources."w3c-hr-time-1.0.1" + sources."webidl-conversions-4.0.2" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-6.5.0" + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.3" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."ws-5.2.2" + sources."xml-name-validator-3.0.0" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A language server for Bash"; + homepage = "https://github.com/mads-hartmann/bash-language-server#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; @@ -39023,10 +41037,10 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" (sources."rimraf-2.6.3" // { dependencies = [ - sources."glob-7.1.3" + sources."glob-7.1.4" ]; }) sources."semver-5.7.0" @@ -39076,7 +41090,7 @@ in sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."asn1.js-4.10.1" - (sources."assert-1.4.1" // { + (sources."assert-1.5.0" // { dependencies = [ sources."inherits-2.0.1" sources."util-0.10.3" @@ -39135,7 +41149,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."has-1.0.3" sources."hash-base-3.0.4" sources."hash.js-1.1.7" @@ -39162,6 +41176,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."module-deps-6.2.0" + sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-browserify-0.3.0" sources."pako-1.0.10" @@ -39187,7 +41202,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" sources."sha.js-2.4.11" @@ -39355,7 +41370,7 @@ in sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."got-1.2.2" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" @@ -39372,7 +41387,7 @@ in sources."inquirer-0.8.5" sources."internal-ip-1.2.0" sources."ip-1.1.5" - sources."ip-set-1.0.1" + sources."ip-set-1.0.2" sources."ipaddr.js-1.9.0" sources."is-arrayish-0.2.1" sources."is-finite-1.0.2" @@ -39522,7 +41537,7 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.0" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."rimraf-2.6.3" sources."router-0.6.2" sources."run-parallel-1.1.9" @@ -39732,14 +41747,14 @@ in sources."color-string-1.5.3" sources."colornames-1.1.1" sources."colors-1.3.3" - sources."colorspace-1.1.1" + sources."colorspace-1.1.2" sources."commander-2.19.0" sources."core-util-is-1.0.2" sources."debug-3.2.6" sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.5" - sources."eventemitter3-3.1.0" + sources."eventemitter3-3.1.2" sources."fast-safe-stringify-2.0.6" sources."fecha-2.3.3" sources."follow-redirects-1.7.0" @@ -39798,9 +41813,9 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-11.13.7" + sources."@types/node-12.0.0" sources."abbrev-1.1.1" - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."ajv-6.10.0" sources."ansi-0.3.1" sources."ansi-align-2.0.0" @@ -39877,7 +41892,7 @@ in sources."color-name-1.1.3" sources."combined-stream-1.0.7" sources."component-emitter-1.3.0" - sources."compressible-2.0.16" + sources."compressible-2.0.17" sources."compression-1.7.4" sources."concat-map-0.0.1" sources."conf-1.4.0" @@ -39999,7 +42014,7 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -40124,7 +42139,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nanomatch-1.2.13" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."nice-try-1.0.5" sources."nopt-4.0.1" sources."normalize-package-data-2.5.0" @@ -40217,14 +42232,14 @@ in sources."tough-cookie-2.4.3" ]; }) - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."resumer-0.0.0" sources."ret-0.1.15" sources."run-async-2.3.0" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -40335,7 +42350,7 @@ in sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.16" + sources."type-is-1.6.18" sources."underscore-1.9.1" (sources."union-value-1.0.0" // { dependencies = [ @@ -40411,7 +42426,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-11.13.7" + sources."@types/node-12.0.0" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -40513,7 +42528,7 @@ in sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."glob-7.1.4" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -40617,7 +42632,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-buffer-5.1.2" @@ -40743,7 +42758,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-11.13.7" + sources."@types/node-12.0.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -40772,7 +42787,7 @@ in sources."d-1.0.0" sources."debug-3.2.6" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.49" + sources."es5-ext-0.10.50" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-set-0.1.5" @@ -40859,7 +42874,7 @@ in ]; }) sources."which-1.3.1" - sources."xstream-11.10.0" + sources."xstream-11.11.0" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -40874,10 +42889,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.0.0.tgz"; - sha512 = "0Q54JOwb88ccGTIG6C9KAwY9sO7ZEKVsh3g1BcHr/NvdQjZu8j6jHqQQlgiGZeevjrOhPlPFdUnd2OaNdVGezA=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.0.1.tgz"; + sha512 = "uOLGMyegGQbm7/kWbHUzsqM16MiehRItBq3WXamzYsKLXdXXAHxEEX57WqcFwd/XybeD/1/KSYkroJdEyk7swA=="; }; dependencies = [ sources."ansi-escapes-3.2.0" @@ -40912,7 +42927,7 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."has-flag-3.0.0" sources."hyperquest-2.1.3" @@ -40943,7 +42958,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-6.0.0" @@ -41299,7 +43314,7 @@ in sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."global-4.3.2" sources."global-dirs-0.1.1" sources."got-6.7.1" @@ -41324,7 +43339,7 @@ in ]; }) sources."hypercore-crypto-1.0.0" - (sources."hypercore-protocol-6.9.0" // { + (sources."hypercore-protocol-6.10.0" // { dependencies = [ sources."varint-5.0.0" ]; @@ -41448,7 +43463,7 @@ in sources."neat-tasks-1.1.1" sources."nets-3.2.0" sources."network-address-1.1.2" - sources."node-gyp-build-3.8.0" + sources."node-gyp-build-3.9.0" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -41574,7 +43589,7 @@ in ]; }) sources."sodium-javascript-0.5.5" - sources."sodium-native-2.3.0" + sources."sodium-native-2.4.2" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" @@ -41885,10 +43900,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "5.1.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-5.1.0.tgz"; - sha512 = "V01evtLxcM9Zy7lkVJBKJo0M0mYt/D9qum8VL+SCvSSfrh6pYyw1K2gaIJaYDIl+r7eZZPXTSY+G8pJDRtAJAg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.0.0.tgz"; + sha512 = "ymamj4Gp1dubQaQ/WL8cK4gyXB/1+cY9Ztv9zoEUBjvHe0d07IM92O2V7rgc5AJ/5nOishy4CcJubAMayqix0w=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -41897,7 +43912,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.2" sources."asynckit-0.4.0" - sources."aws-sdk-2.441.0" + sources."aws-sdk-2.453.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -41909,7 +43924,7 @@ in sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."decimal.js-10.1.1" + sources."decimal.js-10.2.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."events-1.1.1" @@ -42020,7 +44035,7 @@ in dependencies = [ sources."@cnakazawa/watch-1.0.3" sources."@sindresorhus/is-0.7.0" - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."ansi-styles-3.2.1" sources."anymatch-2.0.0" sources."arr-diff-4.0.0" @@ -42120,7 +44135,11 @@ in sources."kind-of-5.1.0" ]; }) - sources."express-4.16.4" + (sources."express-4.16.4" // { + dependencies = [ + sources."serve-static-1.13.2" + ]; + }) (sources."express-ws-4.0.0" // { dependencies = [ sources."ws-5.2.2" @@ -42212,7 +44231,7 @@ in }) sources."ms-2.0.0" sources."nanomatch-1.2.13" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."nice-try-1.0.5" sources."node-int64-0.4.0" sources."normalize-path-2.1.1" @@ -42274,7 +44293,16 @@ in sources."sane-4.1.0" sources."semver-5.7.0" sources."send-0.16.2" - sources."serve-static-1.13.2" + (sources."serve-static-1.14.0" // { + dependencies = [ + sources."http-errors-1.7.2" + sources."mime-1.6.0" + sources."ms-2.1.1" + sources."send-0.17.0" + sources."setprototypeof-1.1.1" + sources."statuses-1.5.0" + ]; + }) (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -42350,7 +44378,8 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."type-is-1.6.16" + sources."toidentifier-1.0.0" + sources."type-is-1.6.18" (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -42470,7 +44499,7 @@ in ]; }) sources."encodeurl-1.0.2" - sources."es5-ext-0.10.49" + sources."es5-ext-0.10.50" sources."es6-iterator-2.0.3" sources."es6-promisify-6.0.1" sources."es6-symbol-3.1.1" @@ -42479,7 +44508,7 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."event-emitter-0.3.5" - sources."eventemitter3-3.1.0" + sources."eventemitter3-3.1.2" (sources."execa-0.10.0" // { dependencies = [ sources."cross-spawn-6.0.5" @@ -42506,7 +44535,7 @@ in sources."for-own-0.1.5" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-base-0.3.0" @@ -42869,8 +44898,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" sources."binary-extensions-1.13.1" - sources."binwrap-0.2.0" - sources."block-stream-0.0.9" + sources."binwrap-0.2.1" sources."bluebird-3.5.4" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -42886,9 +44914,10 @@ in sources."chalk-2.1.0" (sources."chokidar-2.1.2" // { dependencies = [ - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" ]; }) + sources."chownr-1.1.1" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -42972,9 +45001,9 @@ in sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."fs-extra-0.30.0" + sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" sources."fsevents-1.2.4" - sources."fstream-1.0.11" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.1" @@ -43033,6 +45062,12 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.0" + (sources."minipass-2.3.5" // { + dependencies = [ + sources."yallist-3.0.3" + ]; + }) + sources."minizlib-1.2.1" sources."mixin-deep-1.3.1" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -43087,7 +45122,7 @@ in sources."ret-0.1.15" (sources."rimraf-2.6.3" // { dependencies = [ - sources."glob-7.1.3" + sources."glob-7.1.4" ]; }) sources."safe-buffer-5.1.2" @@ -43154,7 +45189,11 @@ in sources."stealthy-require-1.1.1" sources."string_decoder-1.1.1" sources."supports-color-4.2.0" - sources."tar-2.2.1" + (sources."tar-4.4.8" // { + dependencies = [ + sources."yallist-3.0.3" + ]; + }) (sources."temp-0.8.3" // { dependencies = [ sources."rimraf-2.2.8" @@ -43396,7 +45435,7 @@ in sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" sources."require-from-string-1.2.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" sources."safe-buffer-5.1.2" @@ -43506,8 +45545,8 @@ in sources."flatted-2.0.0" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.3" - sources."globals-11.11.0" + sources."glob-7.1.4" + sources."globals-11.12.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" @@ -43553,7 +45592,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safer-buffer-2.1.2" sources."semver-5.7.0" sources."shebang-command-1.2.0" @@ -43569,7 +45608,7 @@ in }) sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."table-5.2.3" // { + (sources."table-5.3.2" // { dependencies = [ sources."string-width-3.1.0" sources."strip-ansi-5.2.0" @@ -43651,8 +45690,8 @@ in sources."flatted-2.0.0" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.3" - sources."globals-11.11.0" + sources."glob-7.1.4" + sources."globals-11.12.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" @@ -43696,12 +45735,12 @@ in sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-2.0.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-from-4.0.0" sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safer-buffer-2.1.2" sources."semver-5.7.0" sources."shebang-command-1.2.0" @@ -43717,7 +45756,7 @@ in }) sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."table-5.2.3" // { + (sources."table-5.3.2" // { dependencies = [ sources."string-width-3.1.0" sources."strip-ansi-5.2.0" @@ -43903,7 +45942,7 @@ in sources."repeating-2.0.1" sources."request-2.88.0" sources."request-progress-2.0.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -44080,10 +46119,10 @@ in sources."read-pkg-up-3.0.0" sources."readable-stream-2.3.6" sources."redent-2.0.0" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sec-1.0.0" @@ -44249,9 +46288,9 @@ in }) sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.15" @@ -44586,7 +46625,7 @@ in sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.1.1" - sources."simple-git-1.110.0" + sources."simple-git-1.113.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -44612,7 +46651,6 @@ in sources."chloride-test-1.2.4" sources."commander-2.20.0" sources."debug-4.1.1" - sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" sources."diff-3.5.0" sources."discontinuous-range-1.0.0" @@ -44633,7 +46671,7 @@ in sources."is-canonical-base64-1.1.1" sources."is-electron-2.2.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.19.0" + sources."is-my-json-valid-2.20.0" sources."is-property-1.0.2" sources."is-valid-domain-0.0.9" sources."json-buffer-2.0.11" @@ -44656,13 +46694,13 @@ in sources."moo-0.4.3" sources."ms-2.1.1" sources."multicb-1.2.2" - sources."multiserver-3.3.2" + sources."multiserver-3.3.3" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" sources."nan-2.13.2" sources."nearley-2.16.0" - sources."node-gyp-build-3.8.0" + sources."node-gyp-build-3.9.0" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" sources."options-0.0.6" @@ -44709,7 +46747,7 @@ in sources."pull-pushable-2.2.0" sources."pull-reader-1.3.1" sources."pull-skip-footer-0.1.0" - sources."pull-stream-3.6.9" + sources."pull-stream-3.6.11" (sources."pull-through-1.0.18" // { dependencies = [ sources."looper-3.0.0" @@ -44723,7 +46761,7 @@ in sources."remove-markdown-0.1.0" sources."ret-0.1.15" sources."safe-buffer-5.1.2" - sources."secret-handshake-1.1.16" + sources."secret-handshake-1.1.18" sources."semver-5.7.0" sources."separator-escape-0.0.0" sources."sha.js-2.4.5" @@ -44737,15 +46775,15 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.3.0" + sources."sodium-native-2.4.2" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" - sources."ssb-client-4.7.2" + sources."ssb-client-4.7.4" sources."ssb-config-2.3.9" sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" - sources."ssb-keys-7.1.5" + sources."ssb-keys-7.1.6" sources."ssb-marked-0.6.0" (sources."ssb-mentions-0.1.2" // { dependencies = [ @@ -44820,7 +46858,7 @@ in sources."yargs-parser-7.0.0" ]; }) - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."agent-base-4.2.1" sources."ajv-6.10.0" sources."ansi-align-2.0.0" @@ -44989,7 +47027,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."global-dirs-0.1.1" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -45007,7 +47045,7 @@ in sources."ms-2.1.1" ]; }) - sources."graphql-14.2.1" + sources."graphql-14.3.0" (sources."graphql-cli-prepare-1.4.19" // { dependencies = [ sources."chalk-2.3.1" @@ -45157,10 +47195,10 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."nice-try-1.0.5" sources."no-case-2.3.2" - sources."node-fetch-2.3.0" + sources."node-fetch-2.5.0" sources."node-request-by-swagger-1.1.4" sources."normalize-package-data-2.5.0" sources."npm-path-2.0.4" @@ -45262,13 +47300,13 @@ in sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-dir-1.0.1" sources."resolve-from-4.0.0" sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."scuid-1.1.0" @@ -45335,7 +47373,7 @@ in sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.16" + sources."type-is-1.6.18" sources."unique-string-1.0.0" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -45576,7 +47614,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -45661,7 +47699,7 @@ in }) sources."urix-0.1.0" sources."use-3.1.1" - sources."v8flags-3.1.2" + sources."v8flags-3.1.3" sources."which-1.3.1" ]; buildInputs = globalBuildInputs; @@ -45676,10 +47714,10 @@ in gulp = nodeEnv.buildNodePackage { name = "gulp"; packageName = "gulp"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gulp/-/gulp-4.0.1.tgz"; - sha512 = "yDVtVunxrAdsk7rIV/b7lVSBifPN1Eqe6wTjsESGrFcL+MEVzaaeNTkpUuGTUptloSOU+8oJm/lBJbgPV+tMAw=="; + url = "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz"; + sha512 = "dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA=="; }; dependencies = [ sources."ansi-colors-1.1.0" @@ -45794,7 +47832,7 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.1" sources."error-ex-1.3.2" - sources."es5-ext-0.10.49" + sources."es5-ext-0.10.50" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -45845,11 +47883,11 @@ in sources."fragment-cache-0.2.1" sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."glob-7.1.4" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -45999,7 +48037,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -46113,7 +48151,7 @@ in sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."v8flags-3.1.2" + sources."v8flags-3.1.3" sources."validate-npm-package-license-3.0.4" sources."value-or-function-3.0.0" sources."vinyl-2.2.0" @@ -46200,7 +48238,7 @@ in sources."detect-file-1.0.0" sources."each-props-1.3.2" sources."error-ex-1.3.2" - sources."es5-ext-0.10.49" + sources."es5-ext-0.10.50" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" (sources."expand-brackets-2.1.4" // { @@ -46375,7 +48413,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -46462,7 +48500,7 @@ in sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."v8flags-3.1.2" + sources."v8flags-3.1.3" sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" sources."which-module-1.0.0" @@ -46618,7 +48656,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.5.6" + sources."uglify-js-3.5.11" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -46644,7 +48682,7 @@ in sources."corser-2.0.1" sources."debug-3.2.6" sources."ecstatic-3.3.1" - sources."eventemitter3-3.1.0" + sources."eventemitter3-3.1.2" sources."follow-redirects-1.7.0" sources."he-1.2.0" sources."http-proxy-1.17.0" @@ -46708,7 +48746,7 @@ in sources."extsprintf-1.4.0" sources."fs.realpath-1.0.0" sources."fuzzyset.js-0.0.1" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."hue-sdk-0.1.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -46757,7 +48795,7 @@ in sources."@ionic/utils-stream-0.0.1" sources."@ionic/utils-subprocess-0.1.0" sources."@ionic/utils-terminal-0.0.1" - sources."@types/node-8.10.46" + sources."@types/node-8.10.48" sources."agent-base-4.2.1" (sources."ansi-align-2.0.0" // { dependencies = [ @@ -46768,7 +48806,7 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."ast-types-0.12.3" + sources."ast-types-0.12.4" sources."astral-regex-1.0.0" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" @@ -46847,7 +48885,7 @@ in sources."readable-stream-3.3.0" ]; }) - sources."glob-7.1.3" + sources."glob-7.1.4" sources."global-dirs-0.1.1" (sources."got-6.7.1" // { dependencies = [ @@ -46991,7 +49029,7 @@ in sources."rimraf-2.6.3" sources."rsvp-3.6.2" sources."run-async-2.3.0" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -47186,7 +49224,7 @@ in sources."async-limiter-1.0.0" sources."chrome-remote-interface-0.26.1" sources."commander-2.11.0" - sources."node-fetch-2.3.0" + sources."node-fetch-2.5.0" sources."safe-buffer-5.1.2" sources."semver-5.7.0" sources."source-map-0.7.3" @@ -47267,12 +49305,12 @@ in sources."fast-json-patch-2.1.0" sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."iterare-1.1.2" - (sources."jaeger-client-3.14.4" // { + (sources."jaeger-client-3.15.0" // { dependencies = [ sources."opentracing-0.13.0" ]; @@ -47321,10 +49359,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.124"; + version = "1.0.125"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.124.tgz"; - sha512 = "+ADcAggh5HUOZLEW3Q60KcV7Mz86w+2wYrkG6mHtnyJ+nqEdXHWwOG3g61QH9A+3w3vSFDUvEMs6wraGg+ySQQ=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.125.tgz"; + sha512 = "UeFp4ZIP1BuAGVwBYetHk6bB/JS8fbVrrUY277Q/dVOW0n9DRz58dTegFIuQBCVQieyKSM71iQudp55SxvW23Q=="; }; dependencies = [ sources."@cronvel/get-pixels-3.3.1" @@ -47436,7 +49474,7 @@ in sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" - sources."fault-1.0.2" + sources."fault-1.0.3" sources."file-type-10.11.0" sources."find-up-2.1.0" sources."follow-redirects-1.7.0" @@ -47459,7 +49497,7 @@ in sources."get-stdin-5.0.1" sources."getpass-0.1.7" sources."github-from-package-0.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -47572,14 +49610,14 @@ in sources."nan-2.13.2" sources."ndarray-1.0.18" sources."ndarray-pack-1.2.1" - (sources."needle-2.3.0" // { + (sources."needle-2.3.1" // { dependencies = [ sources."debug-4.1.1" ]; }) sources."nextgen-events-1.1.1" sources."no-case-2.3.2" - sources."node-abi-2.7.1" + sources."node-abi-2.8.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" @@ -47591,7 +49629,7 @@ in sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" - sources."nwsapi-2.1.3" + sources."nwsapi-2.1.4" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-to-arguments-0.0.8" // { @@ -47671,15 +49709,11 @@ in sources."source-map-0.6.1" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - (sources."sqlite3-4.0.6" // { - dependencies = [ - sources."nan-2.10.0" - ]; - }) + sources."sqlite3-4.0.7" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-kit-0.9.3" + sources."string-kit-0.9.4" sources."string-padding-1.0.2" sources."string-to-stream-1.1.1" (sources."string-width-1.0.2" // { @@ -47749,7 +49783,7 @@ in sources."unpack-string-0.0.2" sources."upper-case-1.1.3" sources."uri-js-4.2.2" - sources."url-parse-1.4.6" + sources."url-parse-1.4.7" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."valid-url-1.0.9" @@ -47791,41 +49825,41 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.5.5"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz"; - sha512 = "6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.1.tgz"; + sha512 = "mMMsst31b8c7/Z6ewnO6ORIdVMwsobg1enX9b/2XAzW8mM3KuMANRWcMD1KMBq91IAUMOIhC5NsXu7xvNQrRyQ=="; }; dependencies = [ - sources."babylon-7.0.0-beta.19" + sources."@babel/parser-7.4.4" + sources."argparse-1.0.10" sources."bluebird-3.5.4" - sources."catharsis-0.8.9" - sources."escape-string-regexp-1.0.5" + sources."catharsis-0.8.10" + sources."entities-1.1.2" + sources."escape-string-regexp-2.0.0" sources."graceful-fs-4.1.15" - sources."js2xmlparser-3.0.0" - sources."klaw-2.0.0" - sources."marked-0.3.19" + sources."js2xmlparser-4.0.0" + sources."klaw-3.0.0" + sources."linkify-it-2.1.0" + sources."lodash-4.17.11" + sources."markdown-it-8.4.2" + sources."markdown-it-anchor-5.0.2" + sources."marked-0.6.2" + sources."mdurl-1.0.1" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - (sources."requizzle-0.2.1" // { - dependencies = [ - sources."underscore-1.6.0" - ]; - }) - sources."strip-json-comments-2.0.1" + sources."requizzle-0.2.2" + sources."sprintf-js-1.0.3" + sources."strip-json-comments-3.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."xmlcreate-1.0.2" + sources."uc.micro-1.0.6" + sources."underscore-1.9.1" + sources."xmlcreate-2.0.1" ]; buildInputs = globalBuildInputs; meta = { description = "An API documentation generator for JavaScript."; - homepage = "https://github.com/jsdoc3/jsdoc#readme"; + homepage = "https://github.com/jsdoc/jsdoc#readme"; license = "Apache-2.0"; }; production = true; @@ -47858,7 +49892,7 @@ in sources."entities-1.0.0" sources."exit-0.1.2" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."htmlparser2-3.8.3" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -47901,10 +49935,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.1.tgz"; - sha512 = "oxxvVZdOdUfzk8IOLBF2XUZvl2GoBEfA+b0of4u2EBY/46NlXasi8JdFvazA5lCrf9/lQhTjyVy2QCUW7iq0MQ=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.0.tgz"; + sha512 = "OMwf/tPDpE/BLlYKqZOhqWsd3/z2N3KOlyn1wsCRGFwViE8LOQTcDtathQvHvZc+q+zWmcNAbwKSC+iJoMaH2Q=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -47915,7 +49949,7 @@ in sources."config-chain-1.1.12" sources."editorconfig-0.15.3" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -48058,7 +50092,7 @@ in sha512 = "MfU7069e/kLp1e33n3JQ2DAH9UJrs/UYlXbzWgegBTXoGEmVkIzkO3T8ZyIkCTDBWzUeGTCBZV7brdyTcm6LWg=="; }; dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."ajv-6.10.0" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" @@ -48071,9 +50105,9 @@ in sources."aws4-1.8.0" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" - sources."body-parser-1.18.3" + sources."body-parser-1.19.0" sources."boxen-1.3.0" - sources."bytes-3.0.0" + sources."bytes-3.1.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" @@ -48085,8 +50119,12 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."compressible-2.0.16" - sources."compression-1.7.4" + sources."compressible-2.0.17" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + ]; + }) sources."configstore-3.1.2" sources."connect-pause-0.1.1" sources."content-disposition-0.5.2" @@ -48111,13 +50149,20 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" - sources."errorhandler-1.5.0" + sources."errorhandler-1.5.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-0.7.0" (sources."express-4.16.4" // { dependencies = [ + sources."body-parser-1.18.3" + sources."bytes-3.0.0" + sources."http-errors-1.6.3" + sources."iconv-lite-0.4.23" + sources."qs-6.5.2" + sources."raw-body-2.3.3" + sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; }) @@ -48149,9 +50194,9 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" - sources."http-errors-1.6.3" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inherits-2.0.3" @@ -48206,7 +50251,7 @@ in sources."morgan-1.9.1" sources."ms-2.0.0" sources."nanoid-2.0.1" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -48244,13 +50289,17 @@ in sources."psl-1.1.31" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.5.2" + sources."qs-6.7.0" sources."range-parser-1.2.0" - sources."raw-body-2.3.3" + sources."raw-body-2.4.0" sources."rc-1.2.8" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."request-2.88.0" + (sources."request-2.88.0" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."safe-buffer-5.1.2" @@ -48260,13 +50309,15 @@ in sources."semver-diff-2.1.0" (sources."send-0.16.2" // { dependencies = [ + sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; }) sources."serve-static-1.13.2" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -48280,6 +50331,7 @@ in sources."supports-color-5.5.0" sources."term-size-1.2.0" sources."timed-out-4.0.1" + sources."toidentifier-1.0.0" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -48287,7 +50339,7 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.16" + sources."type-is-1.6.18" sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" @@ -48361,7 +50413,7 @@ in sha512 = "xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw=="; }; dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."after-0.8.2" (sources."anymatch-2.0.0" // { dependencies = [ @@ -48391,13 +50443,13 @@ in sources."binary-extensions-1.13.1" sources."blob-0.0.5" sources."bluebird-3.5.4" - sources."body-parser-1.18.3" + sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."bytes-3.0.0" + sources."bytes-3.1.0" sources."cache-base-1.0.1" sources."callsite-1.0.0" sources."chokidar-2.1.5" @@ -48453,7 +50505,7 @@ in sources."engine.io-parser-2.1.3" sources."ent-2.2.0" sources."escape-html-1.0.3" - sources."eventemitter3-3.1.0" + sources."eventemitter3-3.1.2" sources."expand-brackets-2.1.4" sources."extend-3.0.2" sources."extend-shallow-2.0.1" @@ -48479,9 +50531,9 @@ in sources."fragment-cache-0.2.1" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."glob-7.1.4" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -48500,9 +50552,9 @@ in sources."kind-of-4.0.0" ]; }) - sources."http-errors-1.6.3" + sources."http-errors-1.7.2" sources."http-proxy-1.17.0" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -48535,7 +50587,7 @@ in sources."jsonfile-4.0.0" sources."kind-of-3.2.2" sources."lodash-4.17.11" - (sources."log4js-4.1.0" // { + (sources."log4js-4.1.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" @@ -48573,7 +50625,7 @@ in sources."kind-of-6.0.2" ]; }) - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."normalize-path-3.0.0" sources."object-component-0.0.3" sources."object-copy-0.1.0" @@ -48593,9 +50645,9 @@ in sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" sources."qjobs-1.2.0" - sources."qs-6.5.2" + sources."qs-6.7.0" sources."range-parser-1.2.0" - sources."raw-body-2.3.3" + sources."raw-body-2.4.0" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" (sources."regex-not-1.0.2" // { @@ -48616,7 +50668,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."set-value-2.0.0" - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" (sources."snapdragon-0.8.2" // { dependencies = [ sources."source-map-0.5.7" @@ -48676,7 +50728,8 @@ in ]; }) sources."to-regex-range-2.1.1" - sources."type-is-1.6.16" + sources."toidentifier-1.0.0" + sources."type-is-1.6.18" sources."ultron-1.1.1" (sources."union-value-1.0.0" // { dependencies = [ @@ -48746,7 +50799,7 @@ in sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" sources."graceful-fs-4.1.15" @@ -48889,7 +50942,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -49069,16 +51122,16 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.13.3"; + version = "3.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.13.3.tgz"; - sha512 = "0TkG40F02A4wjKraJBztPtj87BjUezFmaZKAha8eLdtngZkSpAdrSANa5K7jnnA8mywmpQwrKJuBmjdNpm9cBw=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.13.4.tgz"; + sha512 = "qTp22nlpcgVrJGZuD7oHnFbTk72j2USFimc2Pj4kC0/rXmcU2xPtCiyuxLl8y6/6Lj5g9kwEuvKDZtSXujjX/A=="; }; dependencies = [ sources."@lerna/add-3.13.3" sources."@lerna/batch-packages-3.13.0" sources."@lerna/bootstrap-3.13.3" - sources."@lerna/changed-3.13.3" + sources."@lerna/changed-3.13.4" sources."@lerna/check-working-tree-3.13.3" sources."@lerna/child-process-3.13.3" sources."@lerna/clean-3.13.3" @@ -49098,7 +51151,7 @@ in sources."@lerna/github-client-3.13.3" sources."@lerna/global-options-3.13.0" sources."@lerna/has-npm-version-3.13.3" - sources."@lerna/import-3.13.3" + sources."@lerna/import-3.13.4" sources."@lerna/init-3.13.3" sources."@lerna/link-3.13.3" sources."@lerna/list-3.13.3" @@ -49115,7 +51168,7 @@ in sources."@lerna/package-graph-3.13.0" sources."@lerna/project-3.13.1" sources."@lerna/prompt-3.13.0" - sources."@lerna/publish-3.13.3" + sources."@lerna/publish-3.13.4" sources."@lerna/pulse-till-done-3.13.0" sources."@lerna/resolve-symlink-3.13.0" sources."@lerna/rimraf-dir-3.13.3" @@ -49126,14 +51179,24 @@ in sources."@lerna/symlink-dependencies-3.13.0" sources."@lerna/timer-3.13.0" sources."@lerna/validation-error-3.13.0" - sources."@lerna/version-3.13.3" + sources."@lerna/version-3.13.4" sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@octokit/endpoint-4.0.0" + (sources."@octokit/endpoint-5.1.1" // { + dependencies = [ + sources."is-plain-object-3.0.0" + sources."isobject-4.0.0" + ]; + }) sources."@octokit/plugin-enterprise-rest-2.2.2" - sources."@octokit/request-3.0.0" - sources."@octokit/rest-16.25.0" + (sources."@octokit/request-3.0.2" // { + dependencies = [ + sources."is-plain-object-3.0.0" + sources."isobject-4.0.0" + ]; + }) + sources."@octokit/rest-16.25.3" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.2.1" @@ -49172,7 +51235,6 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."before-after-hook-1.4.0" - sources."block-stream-0.0.9" sources."bluebird-3.5.4" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -49369,7 +51431,6 @@ in sources."fs-minipass-1.2.5" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" (sources."gauge-2.7.4" // { dependencies = [ sources."is-fullwidth-code-point-1.0.0" @@ -49414,7 +51475,7 @@ in sources."git-up-4.0.1" sources."git-url-parse-11.1.2" sources."gitconfiglocal-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."glob-parent-3.1.0" sources."glob-to-regexp-0.3.0" sources."globby-8.0.2" @@ -49586,19 +51647,18 @@ in sources."nanomatch-1.2.13" sources."neo-async-2.6.0" sources."nice-try-1.0.5" - sources."node-fetch-2.3.0" + sources."node-fetch-2.5.0" sources."node-fetch-npm-2.0.2" - (sources."node-gyp-3.8.0" // { + (sources."node-gyp-4.0.0" // { dependencies = [ sources."semver-5.3.0" - sources."tar-2.2.1" ]; }) sources."nopt-3.0.6" sources."normalize-package-data-2.5.0" sources."normalize-url-3.3.0" sources."npm-bundled-1.0.6" - sources."npm-lifecycle-2.1.0" + sources."npm-lifecycle-2.1.1" sources."npm-package-arg-6.1.0" sources."npm-packlist-1.4.1" sources."npm-pick-manifest-2.2.3" @@ -49722,7 +51782,7 @@ in sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -49736,7 +51796,7 @@ in sources."rimraf-2.6.3" sources."run-async-2.3.0" sources."run-queue-1.0.3" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -49855,7 +51915,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - (sources."uglify-js-3.5.6" // { + (sources."uglify-js-3.5.11" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -49870,7 +51930,7 @@ in }) sources."unique-filename-1.1.1" sources."unique-slug-2.0.1" - sources."universal-user-agent-2.0.3" + sources."universal-user-agent-2.1.0" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { dependencies = [ @@ -50037,7 +52097,7 @@ in sha512 = "Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw=="; }; dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -50143,7 +52203,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from-0.1.7" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { dependencies = [ @@ -50158,7 +52218,7 @@ in ]; }) sources."http-auth-3.1.3" - (sources."http-errors-1.6.3" // { + (sources."http-errors-1.7.2" // { dependencies = [ sources."statuses-1.5.0" ]; @@ -50188,7 +52248,7 @@ in sources."map-stream-0.1.0" sources."map-visit-1.0.0" sources."micromatch-3.1.10" - sources."mime-1.4.1" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mixin-deep-1.3.1" @@ -50196,7 +52256,7 @@ in sources."ms-2.0.0" sources."nan-2.13.2" sources."nanomatch-1.2.13" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -50236,19 +52296,26 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - (sources."send-0.16.2" // { + (sources."send-0.17.0" // { dependencies = [ - sources."statuses-1.4.0" + sources."ms-2.1.1" + sources."statuses-1.5.0" + ]; + }) + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" ]; }) - sources."serve-index-1.9.1" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" ]; }) - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -50311,6 +52378,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" + sources."toidentifier-1.0.0" (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -50358,7 +52426,7 @@ in sha512 = "C5x12+bwk7m2Sx3U27VZ7h5KP7vIlKfZGCabMi73nBGp0zPHtCaxQTPXDRoX5479EZUvycYJI0aD4h1d4+ds7w=="; }; dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."after-0.8.2" sources."ajv-6.10.0" sources."anymatch-1.3.2" @@ -50391,9 +52459,9 @@ in sources."better-assert-1.0.2" sources."binary-extensions-1.13.1" sources."blob-0.0.5" - sources."body-parser-1.18.3" + sources."body-parser-1.19.0" sources."braces-1.8.5" - sources."bytes-3.0.0" + sources."bytes-3.1.0" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -50465,6 +52533,13 @@ in sources."expand-range-1.8.2" (sources."express-4.16.4" // { dependencies = [ + sources."body-parser-1.18.3" + sources."bytes-3.0.0" + sources."http-errors-1.6.3" + sources."iconv-lite-0.4.23" + sources."qs-6.5.2" + sources."raw-body-2.3.3" + sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; }) @@ -50492,7 +52567,7 @@ in sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.2.1" @@ -50523,9 +52598,9 @@ in ]; }) sources."html-entities-1.2.1" - sources."http-errors-1.6.3" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."indexof-0.0.1" sources."inherits-2.0.3" sources."innertext-1.0.3" @@ -50603,7 +52678,7 @@ in sources."kind-of-6.0.2" ]; }) - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."normalize-path-2.1.1" sources."oauth-sign-0.9.0" sources."object-component-0.0.3" @@ -50646,7 +52721,7 @@ in sources."proxy-addr-2.0.5" sources."psl-1.1.31" sources."punycode-2.1.1" - sources."qs-6.5.2" + sources."qs-6.7.0" (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" @@ -50654,7 +52729,7 @@ in ]; }) sources."range-parser-1.2.0" - sources."raw-body-2.3.3" + sources."raw-body-2.4.0" sources."readable-stream-2.3.6" (sources."readdirp-2.2.1" // { dependencies = [ @@ -50712,7 +52787,11 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."request-2.88.0" + (sources."request-2.88.0" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-buffer-5.1.2" @@ -50720,6 +52799,8 @@ in sources."safer-buffer-2.1.2" (sources."send-0.16.2" // { dependencies = [ + sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; }) @@ -50729,7 +52810,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -50808,6 +52889,7 @@ in sources."is-number-3.0.0" ]; }) + sources."toidentifier-1.0.0" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -50815,7 +52897,7 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.16" + sources."type-is-1.6.18" sources."uc.micro-1.0.6" (sources."union-value-1.0.0" // { dependencies = [ @@ -50863,80 +52945,80 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/core-7.4.3" - sources."@babel/generator-7.4.0" + sources."@babel/core-7.4.4" + sources."@babel/generator-7.4.4" sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" - sources."@babel/helper-call-delegate-7.4.0" - sources."@babel/helper-create-class-features-plugin-7.4.3" - sources."@babel/helper-define-map-7.4.0" + sources."@babel/helper-call-delegate-7.4.4" + sources."@babel/helper-create-class-features-plugin-7.4.4" + sources."@babel/helper-define-map-7.4.4" sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" sources."@babel/helper-get-function-arity-7.0.0" - sources."@babel/helper-hoist-variables-7.4.0" + sources."@babel/helper-hoist-variables-7.4.4" sources."@babel/helper-member-expression-to-functions-7.0.0" sources."@babel/helper-module-imports-7.0.0" - sources."@babel/helper-module-transforms-7.4.3" + sources."@babel/helper-module-transforms-7.4.4" sources."@babel/helper-optimise-call-expression-7.0.0" sources."@babel/helper-plugin-utils-7.0.0" - sources."@babel/helper-regex-7.4.3" + sources."@babel/helper-regex-7.4.4" sources."@babel/helper-remap-async-to-generator-7.1.0" - sources."@babel/helper-replace-supers-7.4.0" + sources."@babel/helper-replace-supers-7.4.4" sources."@babel/helper-simple-access-7.1.0" - sources."@babel/helper-split-export-declaration-7.4.0" + sources."@babel/helper-split-export-declaration-7.4.4" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.4.3" + sources."@babel/helpers-7.4.4" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.3" + sources."@babel/parser-7.4.4" sources."@babel/plugin-external-helpers-7.0.0" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" - sources."@babel/plugin-proposal-class-properties-7.4.0" + sources."@babel/plugin-proposal-class-properties-7.4.4" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.4.3" + sources."@babel/plugin-proposal-object-rest-spread-7.4.4" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.4.0" + sources."@babel/plugin-proposal-unicode-property-regex-7.4.4" sources."@babel/plugin-syntax-async-generators-7.2.0" sources."@babel/plugin-syntax-json-strings-7.2.0" sources."@babel/plugin-syntax-object-rest-spread-7.2.0" sources."@babel/plugin-syntax-optional-catch-binding-7.2.0" sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.4.0" + sources."@babel/plugin-transform-async-to-generator-7.4.4" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.4.0" - sources."@babel/plugin-transform-classes-7.4.3" + sources."@babel/plugin-transform-block-scoping-7.4.4" + sources."@babel/plugin-transform-classes-7.4.4" sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.4.3" - sources."@babel/plugin-transform-dotall-regex-7.4.3" + sources."@babel/plugin-transform-destructuring-7.4.4" + sources."@babel/plugin-transform-dotall-regex-7.4.4" sources."@babel/plugin-transform-duplicate-keys-7.2.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" - sources."@babel/plugin-transform-for-of-7.4.3" - sources."@babel/plugin-transform-function-name-7.4.3" + sources."@babel/plugin-transform-for-of-7.4.4" + sources."@babel/plugin-transform-function-name-7.4.4" sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-member-expression-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.2.0" - sources."@babel/plugin-transform-modules-commonjs-7.4.3" - sources."@babel/plugin-transform-modules-systemjs-7.4.0" + sources."@babel/plugin-transform-modules-commonjs-7.4.4" + sources."@babel/plugin-transform-modules-systemjs-7.4.4" sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.2" - sources."@babel/plugin-transform-new-target-7.4.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.4" + sources."@babel/plugin-transform-new-target-7.4.4" sources."@babel/plugin-transform-object-super-7.2.0" - sources."@babel/plugin-transform-parameters-7.4.3" + sources."@babel/plugin-transform-parameters-7.4.4" sources."@babel/plugin-transform-property-literals-7.2.0" - sources."@babel/plugin-transform-regenerator-7.4.3" + sources."@babel/plugin-transform-regenerator-7.4.4" sources."@babel/plugin-transform-reserved-words-7.2.0" - sources."@babel/plugin-transform-runtime-7.4.3" + sources."@babel/plugin-transform-runtime-7.4.4" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" - sources."@babel/plugin-transform-template-literals-7.2.0" + sources."@babel/plugin-transform-template-literals-7.4.4" sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-unicode-regex-7.4.3" - sources."@babel/preset-env-7.4.3" + sources."@babel/plugin-transform-unicode-regex-7.4.4" + sources."@babel/preset-env-7.4.4" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.4.3" - sources."@babel/template-7.4.0" - sources."@babel/traverse-7.4.3" - sources."@babel/types-7.4.0" + sources."@babel/runtime-7.4.4" + sources."@babel/template-7.4.4" + sources."@babel/traverse-7.4.4" + sources."@babel/types-7.4.4" sources."@calebboyd/semaphore-1.3.1" sources."@comandeer/babel-plugin-banner-4.1.0" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -50947,7 +53029,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-11.13.7" + sources."@types/node-12.0.0" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -51033,7 +53115,7 @@ in sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."asn1.js-4.10.1" - (sources."assert-1.4.1" // { + (sources."assert-1.5.0" // { dependencies = [ sources."inherits-2.0.1" sources."util-0.10.3" @@ -51137,7 +53219,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.5.5" + sources."browserslist-4.5.6" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -51160,7 +53242,7 @@ in }) sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30000962" + sources."caniuse-lite-1.0.30000967" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -51320,7 +53402,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.125" + sources."electron-to-chromium-1.3.133" sources."elliptic-6.4.1" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" @@ -51477,19 +53559,19 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-proxy-2.1.0" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."glob-to-regexp-0.3.0" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" - sources."globals-11.11.0" + sources."globals-11.12.0" (sources."globby-8.0.2" // { dependencies = [ sources."pify-3.0.0" @@ -51684,14 +53766,14 @@ in ]; }) sources."nice-try-1.0.5" - sources."node-fetch-2.3.0" + sources."node-fetch-2.5.0" (sources."node-libs-browser-2.2.0" // { dependencies = [ sources."buffer-4.9.1" sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.16" + sources."node-releases-1.1.18" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" (sources."normalize-url-2.0.1" // { @@ -51872,7 +53954,7 @@ in sources."regenerator-transform-0.13.4" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp-tree-0.1.5" + sources."regexp-tree-0.1.6" sources."regexpu-core-4.5.4" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -51887,9 +53969,9 @@ in sources."replace-ext-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-cwd-2.0.0" - (sources."resolve-dependencies-2.2.2" // { + (sources."resolve-dependencies-2.2.3" // { dependencies = [ sources."dir-glob-2.2.2" sources."globby-9.2.0" @@ -52136,13 +54218,13 @@ in sources."util-0.11.1" sources."util-deprecate-1.0.2" sources."util.promisify-1.0.0" - sources."v8-compile-cache-2.0.2" + sources."v8-compile-cache-2.0.3" sources."validate-npm-package-license-3.0.4" sources."vinyl-2.2.0" sources."vm-browserify-0.0.4" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.30.0" // { + (sources."webpack-4.31.0" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -52184,7 +54266,7 @@ in sources."ms-2.0.0" ]; }) - (sources."webpack-cli-3.3.1" // { + (sources."webpack-cli-3.3.2" // { dependencies = [ sources."supports-color-5.5.0" ]; @@ -52208,7 +54290,7 @@ in sources."pinkie-promise-1.0.0" ]; }) - sources."worker-farm-1.6.0" + sources."worker-farm-1.7.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ sources."string-width-1.0.2" @@ -52425,7 +54507,7 @@ in }) (sources."accord-0.28.0" // { dependencies = [ - sources."glob-7.1.3" + sources."glob-7.1.4" sources."minimatch-3.0.4" sources."semver-5.7.0" sources."uglify-js-2.8.29" @@ -52575,7 +54657,7 @@ in sources."ecc-jsbn-0.1.2" sources."end-of-stream-0.1.5" sources."errno-0.1.7" - sources."es5-ext-0.10.49" + sources."es5-ext-0.10.50" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -52707,7 +54789,7 @@ in sources."clone-2.1.2" sources."clone-stats-1.0.0" sources."extend-shallow-1.1.4" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."glob-stream-6.1.0" sources."graceful-fs-4.1.15" sources."kind-of-1.1.0" @@ -52944,7 +55026,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."request-2.81.0" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -53492,7 +55574,7 @@ in sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.88.0" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."retry-0.10.1" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" @@ -53545,10 +55627,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "3.8.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz"; - sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz"; + sha512 = "2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -53563,9 +55645,9 @@ in sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."block-stream-0.0.9" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" + sources."chownr-1.1.1" sources."code-point-at-1.1.0" sources."combined-stream-1.0.7" sources."concat-map-0.0.1" @@ -53581,11 +55663,11 @@ in sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -53607,6 +55689,8 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.8" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-4.1.2" @@ -53635,7 +55719,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-2.2.1" + sources."tar-4.4.8" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -53650,6 +55734,7 @@ in sources."which-1.3.1" sources."wide-align-1.1.3" sources."wrappy-1.0.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -53663,15 +55748,15 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.8.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.8.0.tgz"; - sha512 = "bYbpIHyRqZ7sVWXxGpz8QIRug5JZc/hzZH4GbdT9HTZi6WmKCZ8GLvP8OZ9TTiIBvwPFKgtGrlWQSXDAvYdsPw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.0.tgz"; + sha512 = "rGLv++nK20BG8gc0MzzcYe1Nl3p3mtwJ74Q2QD0HTEDKZ6NvOFSelY6s2QBPWIHRR8h7hpad0LiwajfClBJfNg=="; }; buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = https://github.com/mafintosh/node-gyp-build; + homepage = https://github.com/prebuild/node-gyp-build; license = "MIT"; }; production = true; @@ -53687,7 +55772,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."after-0.8.2" sources."ajv-4.11.8" sources."ansi-regex-2.1.1" @@ -53825,10 +55910,10 @@ in }) sources."ms-2.0.0" sources."nan-2.13.2" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ - sources."glob-7.1.3" + sources."glob-7.1.4" sources."rimraf-2.6.3" sources."semver-5.7.0" ]; @@ -53875,7 +55960,7 @@ in sources."qs-6.4.0" ]; }) - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -53913,7 +55998,7 @@ in sources."tar-2.2.1" (sources."tar-pack-3.4.1" // { dependencies = [ - sources."glob-7.1.3" + sources."glob-7.1.4" sources."rimraf-2.6.3" ]; }) @@ -53922,7 +56007,7 @@ in sources."truncate-2.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.16" + sources."type-is-1.6.18" sources."uid-0.0.2" sources."uid-number-0.0.6" sources."ultron-1.0.2" @@ -53965,7 +56050,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = https://github.com/node-inspector/node-inspector; + homepage = http://github.com/node-inspector/node-inspector; }; production = true; bypassCache = true; @@ -53973,10 +56058,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; - sha512 = "4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A=="; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz"; + sha512 = "Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -53997,7 +56082,7 @@ in sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."has-unicode-2.0.1" sources."iconv-lite-0.4.24" sources."ignore-walk-3.0.1" @@ -54012,7 +56097,7 @@ in sources."minizlib-1.2.1" sources."mkdirp-0.5.1" sources."ms-2.1.1" - sources."needle-2.3.0" + sources."needle-2.3.1" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" sources."npm-packlist-1.4.1" @@ -54060,10 +56145,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.18.11"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.11.tgz"; - sha512 = "KdN3tm1zkarlqNo4+W9raU3ihM4H15MVMSE/f9rYDZmFgDHAfAJsomYrHhApAkuUemYjFyEeXlpCOQ2v5gtBEw=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.0.tgz"; + sha512 = "NHKpb/Je0Urmwi3QPDHlYuFY9m1vaVfTsRZG5X73rY46xPj0JpNe8WhUGQdkDXQDOxrBNIU3JrcflE9Y44EcuA=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -54180,7 +56265,7 @@ in }) sources."for-in-1.0.2" sources."fragment-cache-0.2.1" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."get-stream-3.0.0" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { @@ -54420,7 +56505,7 @@ in sha512 = "kF95ob7BZSiS1rOuy/QqATVHKCN6tDyybLHiqXYgSGgBcrsE+raYGhQcpS5DaCffl4GecYTNl0ijk6gle2ObXQ=="; }; dependencies = [ - sources."@babel/runtime-7.4.3" + sources."@babel/runtime-7.4.4" sources."@node-red/editor-api-0.20.5" sources."@node-red/editor-client-0.20.5" (sources."@node-red/nodes-0.20.5" // { @@ -54432,7 +56517,7 @@ in sources."@node-red/runtime-0.20.5" sources."@node-red/util-0.20.5" sources."abbrev-1.1.1" - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."addressparser-1.0.1" sources."agent-base-4.2.1" sources."ajv-6.10.0" @@ -54543,7 +56628,7 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."entities-1.1.2" - sources."es5-ext-0.10.49" + sources."es5-ext-0.10.50" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-promise-4.2.6" @@ -54586,7 +56671,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."glob-parent-3.1.0" (sources."glob-stream-6.1.0" // { dependencies = [ @@ -54706,13 +56791,13 @@ in sources."multer-1.4.1" sources."mustache-3.0.1" sources."nan-2.13.1" - (sources."needle-2.3.0" // { + (sources."needle-2.3.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" ]; }) - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."next-tick-1.0.0" (sources."node-pre-gyp-0.12.0" // { dependencies = [ @@ -54835,7 +56920,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."twitter-ng-0.6.2" - sources."type-is-1.6.16" + sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uglify-js-3.5.3" sources."uid-safe-2.1.5" @@ -54966,7 +57051,7 @@ in }) sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-2.0.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -55071,10 +57156,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "3.1.8"; + version = "3.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.8.tgz"; - sha512 = "a/gb2RzV35cBZqVvUtOj6NIg5VODXr5V5fLbP5G+LJTxLosWzsV+SXdmaaXKEAjbNPGl7uZrdXlKuBm/8Mp+HA=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.9.tgz"; + sha512 = "LRyObEEQJQMXqAie74xa7T137KASU+gHCR7YUN5l6t/O+f2quBoWHnpffR/0dbC8NLqiDIJ7APBJITRCjVQNiw=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -55387,7 +57472,7 @@ in sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" @@ -55414,7 +57499,7 @@ in }) sources."internal-ip-1.2.0" sources."ip-1.1.5" - sources."ip-set-1.0.1" + sources."ip-set-1.0.2" sources."ipaddr.js-1.9.0" sources."is-arrayish-0.2.1" sources."is-finite-1.0.2" @@ -55510,7 +57595,7 @@ in sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.6.3" @@ -55669,7 +57754,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."compressible-2.0.16" + sources."compressible-2.0.17" sources."compression-1.5.2" sources."concat-map-0.0.1" (sources."connect-2.30.2" // { @@ -55735,9 +57820,9 @@ in sources."engine.io-parser-1.3.2" (sources."errorhandler-1.4.3" // { dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."escape-html-1.0.3" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" ]; }) sources."escape-html-1.0.2" @@ -55773,7 +57858,7 @@ in sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.0.2" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -55793,7 +57878,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ip-1.1.5" - sources."ip-set-1.0.1" + sources."ip-set-1.0.2" sources."ipaddr.js-1.0.5" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -56014,7 +58099,7 @@ in sources."tsscmp-1.0.5" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.16" + sources."type-is-1.6.18" sources."uid-safe-2.1.5" sources."ultron-1.0.2" sources."uniq-1.0.1" @@ -56048,10 +58133,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.1.1.tgz"; - sha512 = "MqSWfZXft1cQ6rFgpGpl8JIY3O8w8TnTplvjuCPMl4zRxAUAz0Gzr7ARYH6czoiTxBIbbhu41GfbsBfgMSGTwA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.2.0.tgz"; + sha512 = "bujIqiZBgpusV0N/m+PNQ/FAUKc7ue9WqK+FqfN89on44iLEkERYGBWQEZt2a4OMWH4RHzme7muKOQY8ZegD3Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -56086,58 +58171,64 @@ in sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" sources."@babel/helper-builder-react-jsx-7.3.0" - (sources."@babel/helper-call-delegate-7.4.0" // { + (sources."@babel/helper-call-delegate-7.4.4" // { dependencies = [ - sources."@babel/generator-7.4.0" - sources."@babel/parser-7.4.3" - sources."@babel/traverse-7.4.3" - sources."@babel/types-7.4.0" + sources."@babel/generator-7.4.4" + sources."@babel/parser-7.4.4" + sources."@babel/traverse-7.4.4" + sources."@babel/types-7.4.4" sources."source-map-0.5.7" ]; }) - (sources."@babel/helper-define-map-7.4.0" // { + (sources."@babel/helper-define-map-7.4.4" // { dependencies = [ - sources."@babel/types-7.4.0" + sources."@babel/types-7.4.4" ]; }) sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" sources."@babel/helper-get-function-arity-7.0.0" - (sources."@babel/helper-hoist-variables-7.4.0" // { + (sources."@babel/helper-hoist-variables-7.4.4" // { dependencies = [ - sources."@babel/types-7.4.0" + sources."@babel/types-7.4.4" ]; }) sources."@babel/helper-member-expression-to-functions-7.0.0" sources."@babel/helper-module-imports-7.0.0" - sources."@babel/helper-module-transforms-7.4.3" + (sources."@babel/helper-module-transforms-7.4.4" // { + dependencies = [ + sources."@babel/parser-7.4.4" + sources."@babel/template-7.4.4" + sources."@babel/types-7.4.4" + ]; + }) sources."@babel/helper-optimise-call-expression-7.0.0" sources."@babel/helper-plugin-utils-7.0.0" - sources."@babel/helper-regex-7.4.3" + sources."@babel/helper-regex-7.4.4" sources."@babel/helper-remap-async-to-generator-7.1.0" - (sources."@babel/helper-replace-supers-7.4.0" // { + (sources."@babel/helper-replace-supers-7.4.4" // { dependencies = [ - sources."@babel/generator-7.4.0" - sources."@babel/parser-7.4.3" - sources."@babel/traverse-7.4.3" - sources."@babel/types-7.4.0" + sources."@babel/generator-7.4.4" + sources."@babel/parser-7.4.4" + sources."@babel/traverse-7.4.4" + sources."@babel/types-7.4.4" sources."source-map-0.5.7" ]; }) sources."@babel/helper-simple-access-7.1.0" - (sources."@babel/helper-split-export-declaration-7.4.0" // { + (sources."@babel/helper-split-export-declaration-7.4.4" // { dependencies = [ - sources."@babel/types-7.4.0" + sources."@babel/types-7.4.4" ]; }) sources."@babel/helper-wrap-function-7.2.0" - (sources."@babel/helpers-7.4.3" // { + (sources."@babel/helpers-7.4.4" // { dependencies = [ - sources."@babel/generator-7.4.0" - sources."@babel/parser-7.4.3" - sources."@babel/template-7.4.0" - sources."@babel/traverse-7.4.3" - sources."@babel/types-7.4.0" + sources."@babel/generator-7.4.4" + sources."@babel/parser-7.4.4" + sources."@babel/template-7.4.4" + sources."@babel/traverse-7.4.4" + sources."@babel/types-7.4.4" sources."source-map-0.5.7" ]; }) @@ -56145,9 +58236,9 @@ in sources."@babel/parser-7.3.4" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.4.3" + sources."@babel/plugin-proposal-object-rest-spread-7.4.4" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.4.0" + sources."@babel/plugin-proposal-unicode-property-regex-7.4.4" sources."@babel/plugin-syntax-async-generators-7.2.0" sources."@babel/plugin-syntax-flow-7.2.0" sources."@babel/plugin-syntax-json-strings-7.2.0" @@ -56155,35 +58246,35 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.2.0" sources."@babel/plugin-syntax-optional-catch-binding-7.2.0" sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.4.0" + sources."@babel/plugin-transform-async-to-generator-7.4.4" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.4.0" - sources."@babel/plugin-transform-classes-7.4.3" + sources."@babel/plugin-transform-block-scoping-7.4.4" + sources."@babel/plugin-transform-classes-7.4.4" sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.4.3" - sources."@babel/plugin-transform-dotall-regex-7.4.3" + sources."@babel/plugin-transform-destructuring-7.4.4" + sources."@babel/plugin-transform-dotall-regex-7.4.4" sources."@babel/plugin-transform-duplicate-keys-7.2.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" sources."@babel/plugin-transform-flow-strip-types-7.3.4" - sources."@babel/plugin-transform-for-of-7.4.3" - sources."@babel/plugin-transform-function-name-7.4.3" + sources."@babel/plugin-transform-for-of-7.4.4" + sources."@babel/plugin-transform-function-name-7.4.4" sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.2.0" sources."@babel/plugin-transform-modules-commonjs-7.2.0" - sources."@babel/plugin-transform-modules-systemjs-7.4.0" + sources."@babel/plugin-transform-modules-systemjs-7.4.4" sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.2" - sources."@babel/plugin-transform-new-target-7.4.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.4" + sources."@babel/plugin-transform-new-target-7.4.4" sources."@babel/plugin-transform-object-super-7.2.0" - sources."@babel/plugin-transform-parameters-7.4.3" + sources."@babel/plugin-transform-parameters-7.4.4" sources."@babel/plugin-transform-react-jsx-7.3.0" - sources."@babel/plugin-transform-regenerator-7.4.3" + sources."@babel/plugin-transform-regenerator-7.4.4" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" - sources."@babel/plugin-transform-template-literals-7.2.0" + sources."@babel/plugin-transform-template-literals-7.4.4" sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-unicode-regex-7.4.3" + sources."@babel/plugin-transform-unicode-regex-7.4.4" sources."@babel/preset-env-7.3.4" sources."@babel/runtime-7.3.4" sources."@babel/template-7.2.2" @@ -56225,7 +58316,7 @@ in sources."array-unique-0.3.2" sources."asn1-0.2.4" sources."asn1.js-4.10.1" - (sources."assert-1.4.1" // { + (sources."assert-1.5.0" // { dependencies = [ sources."inherits-2.0.1" sources."util-0.10.3" @@ -56277,7 +58368,7 @@ in sources."pako-1.0.10" ]; }) - sources."browserslist-4.5.5" + sources."browserslist-4.5.6" (sources."buffer-4.9.1" // { dependencies = [ sources."isarray-1.0.0" @@ -56293,7 +58384,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30000962" + sources."caniuse-lite-1.0.30000967" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.5" @@ -56386,7 +58477,7 @@ in ]; }) sources."date-now-0.1.4" - sources."deasync-0.1.14" + sources."deasync-0.1.15" sources."debug-4.1.1" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" @@ -56430,7 +58521,7 @@ in sources."ecc-jsbn-0.1.2" sources."editorconfig-0.15.3" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.125" + sources."electron-to-chromium-1.3.133" sources."elliptic-6.4.1" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -56475,19 +58566,19 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."function-bind-1.1.1" sources."get-port-3.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" ]; }) sources."glob-to-regexp-0.3.0" - sources."globals-11.11.0" + sources."globals-11.12.0" sources."graceful-fs-4.1.15" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" @@ -56521,7 +58612,7 @@ in sources."readable-stream-3.3.0" ]; }) - sources."http-errors-1.6.3" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."https-browserify-1.0.0" sources."iconv-lite-0.4.24" @@ -56576,7 +58667,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."js-beautify-1.9.1" + sources."js-beautify-1.10.0" sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" (sources."js-yaml-3.13.1" // { @@ -56624,7 +58715,7 @@ in ]; }) sources."miller-rabin-4.0.1" - sources."mime-1.4.1" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-fn-1.2.0" @@ -56660,13 +58751,13 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.16" + sources."node-releases-1.1.18" sources."nopt-4.0.1" sources."normalize-html-whitespace-0.2.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" - sources."nwsapi-2.1.3" + sources."nwsapi-2.1.4" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-copy-0.1.0" @@ -56702,7 +58793,7 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.14" // { + (sources."postcss-7.0.16" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -56768,15 +58859,9 @@ in sources."postcss-svgo-4.0.2" sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" - (sources."posthtml-0.11.3" // { - dependencies = [ - sources."isarray-1.0.0" - sources."isobject-2.1.0" - sources."posthtml-parser-0.3.3" - ]; - }) + sources."posthtml-0.11.4" sources."posthtml-parser-0.4.1" - sources."posthtml-render-1.1.4" + sources."posthtml-render-1.1.5" sources."prelude-ls-1.1.2" sources."private-0.1.8" sources."process-0.11.10" @@ -56810,7 +58895,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexp-tree-0.1.5" + sources."regexp-tree-0.1.6" sources."regexpu-core-4.5.4" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -56829,7 +58914,7 @@ in }) sources."request-promise-core-1.1.2" sources."request-promise-native-1.0.7" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -56844,17 +58929,20 @@ in sources."safer-eval-1.3.2" sources."sax-1.2.4" sources."semver-5.7.0" - (sources."send-0.16.2" // { + (sources."send-0.17.0" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) ]; }) sources."serialize-to-js-1.2.2" - sources."serve-static-1.13.2" + sources."serve-static-1.14.0" sources."set-value-2.0.0" sources."setimmediate-1.0.5" - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" sources."shallow-copy-0.0.1" sources."shebang-command-1.2.0" @@ -56895,7 +58983,7 @@ in sources."static-eval-2.0.2" sources."static-extend-0.1.2" sources."static-module-2.2.5" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" @@ -56925,6 +59013,7 @@ in ]; }) sources."to-regex-range-2.1.1" + sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."tr46-1.0.1" sources."trim-right-1.0.1" @@ -56976,8 +59065,8 @@ in sources."util-deprecate-1.0.2" sources."util.promisify-1.0.0" sources."uuid-3.3.2" - sources."v8-compile-cache-2.0.2" - sources."vendors-1.0.2" + sources."v8-compile-cache-2.0.3" + sources."vendors-1.0.3" sources."verror-1.10.0" sources."vlq-0.2.3" sources."vm-browserify-0.0.4" @@ -57039,7 +59128,7 @@ in sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."asn1.js-4.10.1" - (sources."assert-1.4.1" // { + (sources."assert-1.5.0" // { dependencies = [ sources."inherits-2.0.1" sources."util-0.10.3" @@ -57119,7 +59208,7 @@ in sources."function-bind-1.1.1" sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."globule-1.2.1" sources."graceful-fs-4.1.15" sources."has-1.0.3" @@ -57166,6 +59255,7 @@ in }) sources."mute-stream-0.0.8" sources."node-static-0.7.11" + sources."object-assign-4.1.1" sources."once-1.4.0" (sources."optimist-0.6.1" // { dependencies = [ @@ -57197,7 +59287,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."rimraf-2.6.3" sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" @@ -57332,7 +59422,7 @@ in sources."escape-string-regexp-1.0.5" sources."eyes-0.1.8" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."has-ansi-2.0.0" sources."i-0.3.6" sources."inflight-1.0.6" @@ -57537,17 +59627,12 @@ in }; dependencies = [ sources."abstract-leveldown-5.0.0" - (sources."aligned-block-file-1.2.0" // { - dependencies = [ - sources."int53-1.0.0" - sources."uint48be-2.0.1" - ]; - }) + sources."aligned-block-file-1.2.0" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."anymatch-1.3.2" - sources."append-batch-0.0.1" + sources."append-batch-0.0.2" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."arr-diff-2.0.0" @@ -57564,7 +59649,7 @@ in sources."atob-2.1.2" sources."atomic-file-1.1.5" sources."attach-ware-1.1.1" - sources."bail-1.0.3" + sources."bail-1.0.4" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -57594,12 +59679,12 @@ in ]; }) sources."camelcase-2.1.1" - sources."ccount-1.0.3" + sources."ccount-1.0.4" sources."chalk-1.1.3" - 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."character-entities-1.2.3" + sources."character-entities-html4-1.1.3" + sources."character-entities-legacy-1.1.3" + sources."character-reference-invalid-1.1.3" sources."charwise-3.0.1" sources."chloride-2.2.14" sources."chloride-test-1.2.4" @@ -57626,7 +59711,7 @@ in sources."cli-cursor-1.0.2" sources."co-3.1.0" sources."code-point-at-1.1.0" - sources."collapse-white-space-1.0.4" + sources."collapse-white-space-1.0.5" sources."collection-visit-1.0.0" sources."commander-2.20.0" sources."compare-at-paths-1.0.0" @@ -57702,7 +59787,7 @@ in ]; }) sources."flumedb-1.0.6" - (sources."flumelog-offset-3.3.2" // { + (sources."flumelog-offset-3.4.1" // { dependencies = [ sources."looper-4.0.0" ]; @@ -57730,7 +59815,7 @@ in sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."get-value-2.0.6" @@ -57769,7 +59854,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."int53-0.2.4" + sources."int53-1.0.0" sources."ip-1.1.5" sources."irregular-plurals-1.4.0" (sources."is-accessor-descriptor-1.0.0" // { @@ -57777,8 +59862,8 @@ in sources."kind-of-6.0.2" ]; }) - sources."is-alphabetical-1.0.2" - sources."is-alphanumerical-1.0.2" + sources."is-alphabetical-1.0.3" + sources."is-alphanumerical-1.0.3" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-callable-1.1.4" @@ -57789,7 +59874,7 @@ in ]; }) sources."is-date-object-1.0.1" - sources."is-decimal-1.0.2" + sources."is-decimal-1.0.3" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.2" @@ -57802,7 +59887,7 @@ in sources."is-extglob-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-2.0.1" - sources."is-hexadecimal-1.0.2" + sources."is-hexadecimal-1.0.3" sources."is-number-2.1.0" (sources."is-plain-object-2.0.4" // { dependencies = [ @@ -57891,7 +59976,7 @@ in sources."multiblob-1.13.4" sources."multiblob-http-0.4.2" sources."multicb-1.2.2" - (sources."multiserver-3.3.2" // { + (sources."multiserver-3.3.3" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" @@ -57927,12 +60012,12 @@ in sources."ncp-2.0.0" sources."nearley-2.16.0" sources."nice-try-1.0.5" - sources."node-abi-2.7.1" - sources."node-gyp-build-3.8.0" + sources."node-abi-2.8.0" + sources."node-gyp-build-3.9.0" sources."non-private-ip-1.4.4" sources."noop-logger-0.1.1" sources."normalize-path-2.1.1" - sources."normalize-uri-1.1.1" + sources."normalize-uri-1.1.2" sources."npm-prefix-1.2.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -58043,7 +60128,7 @@ in sources."pull-reader-1.3.1" sources."pull-sink-through-0.0.0" sources."pull-sort-1.0.2" - sources."pull-stream-3.6.9" + sources."pull-stream-3.6.11" sources."pull-stringify-2.0.0" sources."pull-through-1.0.18" sources."pull-traverse-1.0.3" @@ -58132,20 +60217,20 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" sources."resumer-0.0.0" sources."ret-0.1.15" (sources."rimraf-2.6.3" // { dependencies = [ - sources."glob-7.1.3" + sources."glob-7.1.4" ]; }) sources."rng-0.2.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."secret-handshake-1.1.16" + sources."secret-handshake-1.1.18" (sources."secret-stack-5.1.1" // { dependencies = [ sources."debug-4.1.1" @@ -58202,7 +60287,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.3.0" + sources."sodium-native-2.4.2" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -58214,13 +60299,13 @@ in sources."ms-2.1.1" ]; }) - sources."ssb-client-4.7.2" + sources."ssb-client-4.7.4" sources."ssb-config-2.3.9" sources."ssb-db-18.6.5" - sources."ssb-ebt-5.6.3" + sources."ssb-ebt-5.6.4" sources."ssb-friends-3.1.13" - sources."ssb-keys-7.1.5" - sources."ssb-links-3.0.4" + sources."ssb-keys-7.1.6" + sources."ssb-links-3.0.6" sources."ssb-msgs-5.2.0" (sources."ssb-query-2.3.0" // { dependencies = [ @@ -58260,7 +60345,7 @@ in sources."supports-color-2.0.0" (sources."tape-4.10.1" // { dependencies = [ - sources."glob-7.1.3" + sources."glob-7.1.4" ]; }) (sources."tar-fs-1.16.3" // { @@ -58284,7 +60369,7 @@ in sources."to-space-case-1.0.0" sources."to-vfile-1.0.0" sources."trim-0.0.1" - sources."trim-lines-1.1.1" + sources."trim-lines-1.1.2" sources."trim-trailing-lines-1.1.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -58293,7 +60378,7 @@ in sources."typewise-1.0.3" sources."typewise-core-1.2.0" sources."typewiselite-1.0.0" - sources."uint48be-1.0.2" + sources."uint48be-2.0.1" sources."ultron-1.0.2" sources."unherit-1.1.1" sources."unified-2.1.4" @@ -58374,7 +60459,7 @@ in }; dependencies = [ sources."@zeit/schemas-2.6.0" - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."ajv-6.5.3" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" @@ -58395,7 +60480,7 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."compressible-2.0.16" + sources."compressible-2.0.17" sources."compression-1.7.3" sources."concat-map-0.0.1" sources."content-disposition-0.5.2" @@ -58424,7 +60509,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."ms-2.0.0" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."npm-run-path-2.0.2" sources."on-headers-1.0.2" sources."p-finally-1.0.0" @@ -58480,7 +60565,7 @@ in dependencies = [ sources."CSSselect-0.4.1" sources."CSSwhat-0.4.7" - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."after-0.8.1" sources."ajv-6.10.0" sources."array-flatten-1.1.1" @@ -58598,7 +60683,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-0.3.2" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."oauth-sign-0.9.0" sources."object-component-0.0.3" sources."on-finished-2.3.0" @@ -58667,7 +60752,7 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.16" + sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."uri-js-4.2.2" sources."utf8-2.0.0" @@ -59080,15 +61165,15 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.153.0"; + version = "1.163.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.153.0.tgz"; - sha512 = "RGgh8WvnmJOQqRuYfDAc7nlyw+V1G89q8JmKH3cXF0d+7jrz9o6S0c4TcEuSgC8wZNhqvpRk+W52gPxp3cePNQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.163.3.tgz"; + sha512 = "6J4pzTijED/qpb32vS8G6joWaTys+JavugR3AN+zs3skItFRP1CooQOHYhxhMA6OGb+TF99QpLbzX0nFzkFiMQ=="; }; dependencies = [ sources."@snyk/dep-graph-1.4.1" sources."@snyk/gemfile-1.2.0" - sources."@types/node-8.10.46" + sources."@types/node-8.10.48" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.2.1" @@ -59100,7 +61185,7 @@ in sources."archy-1.0.0" sources."argparse-1.0.10" sources."asap-2.0.6" - sources."ast-types-0.12.3" + sources."ast-types-0.12.4" sources."async-1.5.2" sources."balanced-match-1.0.0" (sources."boxen-1.3.0" // { @@ -59182,7 +61267,9 @@ in sources."debug-4.1.1" ]; }) - sources."glob-7.1.3" + sources."git-up-4.0.1" + sources."git-url-parse-11.1.2" + sources."glob-7.1.4" sources."global-dirs-0.1.1" (sources."got-6.7.1" // { dependencies = [ @@ -59227,6 +61314,7 @@ in sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" + sources."is-ssh-1.3.1" sources."is-stream-1.1.0" sources."is-wsl-1.1.0" sources."isarray-0.0.1" @@ -59273,13 +61361,14 @@ in sources."ms-2.1.1" sources."mute-stream-0.0.7" sources."nconf-0.10.0" - (sources."needle-2.3.0" // { + (sources."needle-2.3.1" // { dependencies = [ sources."debug-4.1.1" ]; }) sources."netmask-1.0.6" sources."nice-try-1.0.5" + sources."normalize-url-3.3.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."once-1.4.0" @@ -59298,6 +61387,8 @@ in ]; }) sources."pako-1.0.10" + sources."parse-path-4.0.1" + sources."parse-url-5.0.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -59306,6 +61397,7 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" sources."promise-7.3.1" + sources."protocols-1.4.7" sources."proxy-agent-3.1.0" sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" @@ -59321,7 +61413,7 @@ in sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -59344,26 +61436,26 @@ in sources."signal-exit-3.0.2" sources."smart-buffer-4.0.2" sources."snyk-config-2.2.1" - (sources."snyk-docker-plugin-1.22.1" // { + (sources."snyk-docker-plugin-1.24.1" // { dependencies = [ sources."semver-5.7.0" ]; }) sources."snyk-go-parser-1.0.2" - (sources."snyk-go-plugin-1.7.0" // { + (sources."snyk-go-plugin-1.7.1" // { dependencies = [ sources."debug-4.1.1" ]; }) - sources."snyk-gradle-plugin-2.7.1" + sources."snyk-gradle-plugin-2.10.1" sources."snyk-module-1.9.1" - sources."snyk-mvn-plugin-2.0.1" + sources."snyk-mvn-plugin-2.3.0" sources."snyk-nodejs-lockfile-parser-1.13.0" - sources."snyk-nuget-plugin-1.9.2" + sources."snyk-nuget-plugin-1.10.0" sources."snyk-paket-parser-1.4.3" - sources."snyk-php-plugin-1.5.2" + sources."snyk-php-plugin-1.5.3" sources."snyk-policy-1.13.5" - sources."snyk-python-plugin-1.9.2" + sources."snyk-python-plugin-1.10.0" sources."snyk-resolve-1.0.1" (sources."snyk-resolve-deps-4.0.3" // { dependencies = [ @@ -59468,7 +61560,7 @@ in sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w=="; }; dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."after-0.8.2" sources."arraybuffer.slice-0.0.7" sources."async-limiter-1.0.0" @@ -59503,7 +61595,7 @@ in sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."ms-2.1.1" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."object-component-0.0.3" sources."parseqs-0.0.5" sources."parseuri-0.0.5" @@ -59534,6 +61626,177 @@ in production = true; bypassCache = true; }; + speed-test = nodeEnv.buildNodePackage { + name = "speed-test"; + packageName = "speed-test"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/speed-test/-/speed-test-2.1.0.tgz"; + sha512 = "sSmX6yMOwzVmVei9PB08Nd5ZLZ7isXSRG+s7fMZxyjyegvSy77cCrZ39Oo2Kk/KkWW4SSCXiQ8LtFxfP/Ujijw=="; + }; + dependencies = [ + sources."agent-base-4.2.1" + sources."ansi-align-2.0.0" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."array-find-index-1.0.2" + sources."arrify-1.0.1" + sources."boxen-1.3.0" + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" + sources."capture-stack-trace-1.0.1" + sources."chalk-2.4.2" + sources."ci-info-1.6.0" + sources."cli-boxes-1.0.0" + sources."cli-cursor-2.1.0" + sources."cli-spinners-2.1.0" + sources."clone-1.0.4" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."configstore-3.1.2" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" + sources."currently-unhandled-0.4.1" + sources."debug-3.1.0" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."deep-extend-0.6.0" + sources."defaults-1.0.3" + sources."dot-prop-4.2.0" + sources."draftlog-1.0.12" + sources."duplexer3-0.1.4" + sources."error-ex-1.3.2" + sources."es6-promise-4.2.6" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + sources."execa-0.7.0" + sources."find-up-2.1.0" + sources."get-stream-3.0.0" + sources."global-dirs-0.1.1" + sources."got-6.7.1" + sources."graceful-fs-4.1.15" + sources."has-flag-3.0.0" + sources."hosted-git-info-2.7.1" + sources."http-proxy-agent-2.1.0" + sources."https-proxy-agent-2.2.1" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."indent-string-3.2.0" + sources."ini-1.3.5" + sources."is-arrayish-0.2.1" + sources."is-ci-1.2.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" + sources."is-obj-1.0.1" + sources."is-path-inside-1.0.1" + sources."is-plain-obj-1.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."isexe-2.0.0" + sources."json-parse-better-errors-1.0.2" + sources."latest-version-3.1.0" + sources."load-json-file-4.0.0" + sources."locate-path-2.0.0" + sources."log-symbols-2.2.0" + sources."log-update-2.3.0" + sources."loud-rejection-1.6.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.5" + sources."make-dir-1.3.0" + sources."map-obj-2.0.0" + sources."meow-5.0.0" + sources."mimic-fn-1.2.0" + sources."minimist-1.2.0" + sources."minimist-options-3.0.2" + sources."ms-2.0.0" + sources."normalize-package-data-2.5.0" + sources."npm-run-path-2.0.2" + sources."onetime-2.0.1" + (sources."ora-3.4.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + 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."parse-json-4.0.0" + sources."path-exists-3.0.0" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."prepend-http-1.0.4" + sources."pseudomap-1.0.2" + sources."quick-lru-1.1.0" + sources."rc-1.2.8" + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + sources."redent-2.0.0" + sources."registry-auth-token-3.4.0" + sources."registry-url-3.1.0" + sources."resolve-1.10.1" + sources."restore-cursor-2.0.0" + sources."round-to-3.0.0" + sources."safe-buffer-5.1.2" + sources."sax-1.2.4" + sources."semver-5.7.0" + sources."semver-diff-2.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.4" + sources."speedtest-net-1.5.1" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."strip-indent-2.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" + sources."term-size-1.2.0" + sources."timed-out-4.0.1" + sources."trim-newlines-2.0.0" + sources."unique-string-1.0.0" + sources."unzip-response-2.0.1" + sources."update-notifier-2.5.0" + sources."url-parse-lax-1.0.0" + sources."validate-npm-package-license-3.0.4" + sources."wcwidth-1.0.1" + sources."which-1.3.1" + sources."widest-line-2.0.1" + sources."wrap-ansi-3.0.1" + sources."write-file-atomic-2.4.2" + sources."xdg-basedir-3.0.0" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."yallist-2.1.2" + sources."yargs-parser-10.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Test your internet connection speed and ping using speedtest.net from the CLI"; + homepage = "https://github.com/sindresorhus/speed-test#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; stackdriver-statsd-backend = nodeEnv.buildNodePackage { name = "stackdriver-statsd-backend"; packageName = "stackdriver-statsd-backend"; @@ -59813,10 +62076,10 @@ in sources."fresh-0.5.2" sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."glob-7.1.4" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -59844,7 +62107,7 @@ in sources."kind-of-4.0.0" ]; }) - (sources."http-errors-1.6.3" // { + (sources."http-errors-1.7.2" // { dependencies = [ sources."statuses-1.5.0" ]; @@ -59949,7 +62212,7 @@ in sources."memory-cache-0.1.6" sources."methods-1.1.2" sources."micromatch-3.1.10" - sources."mime-1.4.1" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" @@ -59975,7 +62238,7 @@ in sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."neo-async-2.6.0" - (sources."nodemon-1.18.11" // { + (sources."nodemon-1.19.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" @@ -60067,19 +62330,20 @@ in sources."sanitize-filename-1.6.1" sources."semver-5.7.0" sources."semver-diff-2.1.0" - (sources."send-0.16.2" // { + (sources."send-0.17.0" // { dependencies = [ - sources."statuses-1.4.0" + sources."ms-2.1.1" + sources."statuses-1.5.0" ]; }) - sources."serve-static-1.13.2" + sources."serve-static-1.14.0" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" ]; }) - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."sigmund-1.0.1" @@ -60185,12 +62449,13 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" + sources."toidentifier-1.0.0" sources."touch-3.1.0" sources."traverse-0.6.6" sources."truncate-utf8-bytes-1.0.2" - sources."type-is-1.6.16" + sources."type-is-1.6.18" sources."typedarray-0.0.6" - (sources."uglify-js-3.5.6" // { + (sources."uglify-js-3.5.11" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -60262,7 +62527,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-11.13.7" + sources."@types/node-11.13.10" sources."ajv-6.10.0" sources."ansi-regex-3.0.0" sources."argparse-1.0.10" @@ -60335,7 +62600,7 @@ in sources."moment-2.24.0" sources."ms-2.1.1" sources."nice-try-1.0.5" - sources."node-fetch-2.3.0" + sources."node-fetch-2.5.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -60409,7 +62674,7 @@ in sources."ws-4.1.0" sources."y18n-4.0.0" sources."yargs-13.2.2" - sources."yargs-parser-13.0.0" + sources."yargs-parser-13.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -60438,7 +62703,7 @@ in sources."enhanced-resolve-2.3.0" sources."errno-0.1.7" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -60470,46 +62735,46 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.2.3"; + version = "11.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.2.3.tgz"; - sha512 = "3bIe/S4Gw1Ln1HNaKRJ+25V4aqDQqtRuLC5GCse/8q4FUGaJYUhqDCVYDR2dXxwcVffPNb01SwSZsSbYcseBgQ=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.2.5.tgz"; + sha512 = "1yEEf0mPEVDfIZII0yWz9VVlo0xF51cfvqHubPtsylxHpQdfgCDX3cLHXhDVT2RTv8lrOGTrudeXtYV3NPoNdQ=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-4.2.1" - sources."@textlint/ast-traverse-2.1.2" - sources."@textlint/feature-flag-3.1.2" - sources."@textlint/fixer-formatter-3.1.3" - sources."@textlint/kernel-3.1.4" - sources."@textlint/linter-formatter-3.1.3" - sources."@textlint/markdown-to-ast-6.1.2" - sources."@textlint/text-to-ast-3.1.2" - sources."@textlint/textlint-plugin-markdown-5.1.4" - sources."@textlint/textlint-plugin-text-4.1.4" - sources."@textlint/types-1.1.3" + sources."@textlint/ast-node-types-4.2.2" + sources."@textlint/ast-traverse-2.1.3" + sources."@textlint/feature-flag-3.1.3" + sources."@textlint/fixer-formatter-3.1.5" + sources."@textlint/kernel-3.1.6" + sources."@textlint/linter-formatter-3.1.5" + sources."@textlint/markdown-to-ast-6.1.3" + sources."@textlint/text-to-ast-3.1.3" + sources."@textlint/textlint-plugin-markdown-5.1.6" + sources."@textlint/textlint-plugin-text-4.1.6" + sources."@textlint/types-1.1.5" sources."@types/bluebird-3.5.26" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" - sources."bail-1.0.3" + sources."bail-1.0.4" sources."balanced-match-1.0.0" sources."bluebird-3.5.4" sources."boundary-1.0.1" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."chalk-1.1.3" - sources."character-entities-1.2.2" - sources."character-entities-legacy-1.1.2" - sources."character-reference-invalid-1.1.2" + sources."character-entities-1.2.3" + sources."character-entities-legacy-1.1.3" + sources."character-reference-invalid-1.1.3" sources."charenc-0.0.2" sources."circular-json-0.3.3" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."collapse-white-space-1.0.4" + sources."collapse-white-space-1.0.5" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" @@ -60526,7 +62791,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."fast-levenshtein-2.0.6" - sources."fault-1.0.2" + sources."fault-1.0.3" sources."file-entry-cache-2.0.0" sources."find-up-2.1.0" sources."flat-cache-1.3.4" @@ -60534,7 +62799,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-stdin-5.0.1" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -60543,22 +62808,22 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."interop-require-1.0.0" - sources."is-alphabetical-1.0.2" - sources."is-alphanumerical-1.0.2" + sources."is-alphabetical-1.0.3" + sources."is-alphanumerical-1.0.3" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-callable-1.1.4" sources."is-date-object-1.0.1" - sources."is-decimal-1.0.2" + sources."is-decimal-1.0.3" sources."is-file-1.0.0" sources."is-fullwidth-code-point-1.0.0" - sources."is-hexadecimal-1.0.2" + sources."is-hexadecimal-1.0.3" sources."is-plain-obj-1.1.0" sources."is-regex-1.0.4" sources."is-symbol-1.0.2" sources."is-utf8-0.2.1" - sources."is-whitespace-character-1.0.2" - sources."is-word-character-1.0.2" + sources."is-whitespace-character-1.0.3" + sources."is-word-character-1.0.3" sources."isarray-1.0.0" sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" @@ -60575,7 +62840,7 @@ in sources."lodash-4.17.11" sources."log-symbols-1.0.2" sources."map-like-2.0.0" - sources."markdown-escapes-1.0.2" + sources."markdown-escapes-1.0.3" sources."md5-2.2.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -60625,7 +62890,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."semver-5.7.0" @@ -60635,7 +62900,7 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.4" sources."sprintf-js-1.0.3" - sources."state-toggle-1.0.1" + sources."state-toggle-1.0.2" sources."string-width-1.0.2" sources."string.prototype.padstart-3.0.0" sources."string_decoder-1.1.1" @@ -60688,13 +62953,708 @@ in production = true; bypassCache = true; }; + textlint-plugin-latex = nodeEnv.buildNodePackage { + name = "textlint-plugin-latex"; + packageName = "textlint-plugin-latex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-plugin-latex/-/textlint-plugin-latex-1.0.4.tgz"; + sha1 = "9139c65b8da891c983b368a50a286338cd76777a"; + }; + dependencies = [ + sources."@textlint/ast-node-types-4.2.2" + sources."txt-to-ast-3.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Latex plugin for [textlint](https://github.com/textlint/textlint "textlint")."; + homepage = https://github.com/elzup/textlint-plugin-latex; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-abbr-within-parentheses = nodeEnv.buildNodePackage { + name = "textlint-rule-abbr-within-parentheses"; + packageName = "textlint-rule-abbr-within-parentheses"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-abbr-within-parentheses/-/textlint-rule-abbr-within-parentheses-1.0.2.tgz"; + sha1 = "8d49dd02b3a7a88d7e6b32817f9e202c5c6596b9"; + }; + dependencies = [ + sources."define-properties-1.1.3" + sources."match-index-1.0.1" + sources."object-keys-1.1.1" + sources."regexp.prototype.flags-1.2.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "textlint rule check that abbreviations within parentheses."; + homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-alex = nodeEnv.buildNodePackage { + name = "textlint-rule-alex"; + packageName = "textlint-rule-alex"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-1.3.1.tgz"; + sha512 = "TP+dtJcCe0+ZR7Gp1E3iJdf3XtOImrEIcUdaQnok4QJJEutZ1dTiP4rCfnyOxz70NZ+2RdBJgZeZZWGhuJzSwA=="; + }; + dependencies = [ + sources."@textlint/ast-node-types-4.2.2" + sources."@textlint/types-1.1.5" + sources."alex-5.1.0" + sources."ansi-align-2.0.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" + sources."array-find-index-1.0.2" + sources."array-iterate-1.1.3" + sources."bail-1.0.4" + sources."balanced-match-1.0.0" + sources."boundary-1.0.1" + (sources."boxen-1.3.0" // { + dependencies = [ + sources."camelcase-4.1.0" + ]; + }) + sources."brace-expansion-1.1.11" + sources."bubble-stream-error-1.0.0" + sources."buffer-from-1.1.1" + sources."camelcase-2.1.1" + sources."camelcase-keys-2.1.0" + sources."capture-stack-trace-1.0.1" + sources."chalk-2.4.2" + sources."character-entities-1.2.3" + sources."character-entities-legacy-1.1.3" + sources."character-reference-invalid-1.1.3" + sources."ci-info-1.6.0" + sources."cli-boxes-1.0.0" + sources."code-point-at-1.1.0" + sources."collapse-white-space-1.0.5" + sources."color-convert-1.9.3" + sources."color-name-1.1.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."configstore-3.1.2" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" + sources."currently-unhandled-0.4.1" + sources."cuss-1.13.1" + sources."debug-0.8.1" + sources."decamelize-1.2.0" + sources."deep-extend-0.6.0" + sources."dot-prop-4.2.0" + sources."duplexer-0.1.1" + sources."duplexer3-0.1.4" + sources."end-of-stream-1.4.1" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."event-stream-3.1.7" + sources."execa-0.7.0" + sources."extend-3.0.2" + sources."fault-1.0.3" + sources."find-up-1.1.2" + sources."fn-name-2.0.1" + sources."format-0.2.2" + sources."from-0.1.7" + sources."fs.realpath-1.0.0" + sources."get-stdin-4.0.1" + sources."get-stream-3.0.0" + sources."git-diff-tree-1.0.0" + sources."git-spawned-stream-0.1.1" + sources."glob-7.1.4" + sources."global-dirs-0.1.1" + sources."got-6.7.1" + sources."graceful-fs-4.1.15" + sources."has-flag-3.0.0" + sources."hosted-git-info-2.7.1" + sources."ignore-3.3.10" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."indent-string-2.1.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."is-alphabetical-1.0.3" + sources."is-alphanumerical-1.0.3" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-ci-1.2.1" + sources."is-decimal-1.0.3" + sources."is-empty-1.2.0" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-2.0.0" + sources."is-hexadecimal-1.0.3" + sources."is-hidden-1.1.1" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" + sources."is-obj-1.0.1" + sources."is-object-1.0.1" + sources."is-path-inside-1.0.1" + sources."is-plain-obj-1.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-utf8-0.2.1" + sources."is-whitespace-character-1.0.3" + sources."is-word-character-1.0.3" + sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."js-yaml-3.13.1" + sources."latest-version-3.1.0" + sources."limit-spawn-0.0.3" + sources."load-json-file-1.1.0" + sources."load-plugin-2.3.0" + sources."lodash.difference-4.5.0" + sources."lodash.intersection-4.4.0" + sources."loud-rejection-1.6.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.5" + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."map-obj-1.0.1" + sources."map-stream-0.1.0" + sources."markdown-escapes-1.0.3" + sources."mdast-comment-marker-1.1.0" + sources."mdast-util-to-nlcst-3.2.2" + sources."meow-3.7.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."ms-2.0.0" + sources."nlcst-is-literal-1.1.2" + sources."nlcst-normalize-2.1.2" + sources."nlcst-search-1.5.0" + sources."nlcst-to-string-2.0.2" + sources."normalize-package-data-2.5.0" + sources."npm-prefix-1.2.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."object-keys-1.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" + sources."parse-english-4.1.1" + sources."parse-entities-1.2.1" + sources."parse-json-2.2.0" + sources."parse-latin-4.1.1" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."path-type-1.1.0" + sources."pause-stream-0.0.11" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pluralize-7.0.0" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."pump-1.0.3" + sources."pump-chain-1.0.0" + sources."quotation-1.1.1" + sources."rc-1.2.8" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-1.0.34" + sources."redent-1.0.0" + sources."registry-auth-token-3.4.0" + sources."registry-url-3.1.0" + sources."remark-frontmatter-1.3.1" + sources."remark-message-control-4.1.1" + sources."remark-parse-4.0.0" + sources."remark-retext-3.1.2" + sources."repeat-string-1.6.1" + sources."repeating-2.0.1" + sources."replace-ext-1.0.0" + sources."resolve-1.10.1" + sources."resolve-from-4.0.0" + sources."retext-english-3.0.2" + sources."retext-equality-3.2.0" + sources."retext-profanities-4.4.0" + sources."safe-buffer-5.1.2" + sources."semver-5.7.0" + sources."semver-diff-2.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shellsubstitute-1.2.0" + sources."signal-exit-3.0.2" + sources."sliced-1.0.1" + (sources."spawn-to-readstream-0.1.3" // { + dependencies = [ + sources."object-keys-0.4.0" + sources."through2-0.4.2" + sources."xtend-2.1.2" + ]; + }) + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.4" + sources."split-0.2.10" + (sources."split-transform-stream-0.1.1" // { + dependencies = [ + sources."bubble-stream-error-0.0.1" + sources."object-keys-0.4.0" + sources."through2-0.4.2" + sources."xtend-2.1.2" + ]; + }) + sources."sprintf-js-1.0.3" + sources."state-toggle-1.0.2" + sources."stream-combiner-0.0.4" + sources."string-width-2.1.1" + sources."string_decoder-0.10.31" + sources."strip-ansi-4.0.0" + sources."strip-bom-2.0.0" + sources."strip-eof-1.0.0" + sources."strip-indent-1.0.1" + sources."strip-json-comments-2.0.1" + sources."structured-source-3.0.2" + sources."supports-color-5.5.0" + sources."term-size-1.2.0" + sources."textlint-rule-helper-2.1.1" + sources."through-2.3.8" + (sources."through2-2.0.5" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."timed-out-4.0.1" + sources."to-vfile-2.2.0" + sources."trim-0.0.1" + sources."trim-newlines-1.0.0" + sources."trim-trailing-lines-1.1.1" + sources."trough-1.0.3" + sources."typedarray-0.0.6" + sources."unherit-1.1.1" + sources."unified-6.2.0" + sources."unified-diff-1.0.2" + (sources."unified-engine-4.0.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."unified-message-control-1.0.4" + sources."unique-string-1.0.0" + sources."unist-util-is-2.1.2" + sources."unist-util-modify-children-1.1.3" + sources."unist-util-position-3.0.2" + sources."unist-util-remove-position-1.1.2" + sources."unist-util-stringify-position-1.1.2" + sources."unist-util-visit-1.4.0" + sources."unist-util-visit-children-1.1.2" + sources."unist-util-visit-parents-2.0.1" + sources."untildify-2.1.0" + sources."unzip-response-2.0.1" + sources."update-notifier-2.5.0" + sources."url-parse-lax-1.0.0" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-license-3.0.4" + sources."vfile-2.3.0" + sources."vfile-find-up-2.0.2" + sources."vfile-location-2.0.4" + sources."vfile-message-1.1.1" + (sources."vfile-reporter-4.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."has-flag-2.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-4.5.0" + ]; + }) + sources."vfile-sort-2.2.0" + sources."vfile-statistics-1.1.2" + sources."which-1.3.1" + sources."widest-line-2.0.1" + sources."wrappy-1.0.2" + sources."write-file-atomic-2.4.2" + sources."x-is-function-1.0.4" + sources."x-is-string-0.1.0" + sources."xdg-basedir-3.0.0" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "textlint rule for alex"; + homepage = https://github.com/textlint-rule/textlint-rule-alex; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-common-misspellings = nodeEnv.buildNodePackage { + name = "textlint-rule-common-misspellings"; + packageName = "textlint-rule-common-misspellings"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-common-misspellings/-/textlint-rule-common-misspellings-1.0.1.tgz"; + sha1 = "8c4133cf3bb59aa159199d2c9bced12413365774"; + }; + dependencies = [ + sources."misspellings-1.1.0" + sources."textlint-rule-helper-1.2.0" + sources."unist-util-is-2.1.2" + sources."unist-util-visit-1.4.0" + sources."unist-util-visit-parents-2.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "textlint rule to check common misspellings"; + homepage = https://github.com/io-monad/textlint-rule-common-misspellings; + license = "GPL-3.0"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-diacritics = nodeEnv.buildNodePackage { + name = "textlint-rule-diacritics"; + packageName = "textlint-rule-diacritics"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-diacritics/-/textlint-rule-diacritics-0.0.2.tgz"; + sha1 = "9998d2bcd9218edfc8d783db5a49948ca077b612"; + }; + dependencies = [ + sources."match-casing-1.0.1" + sources."strip-json-comments-2.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Textlint rule to check correct usage of diacritics"; + homepage = https://github.com/sapegin/textlint-rule-diacritics; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-en-max-word-count = nodeEnv.buildNodePackage { + name = "textlint-rule-en-max-word-count"; + packageName = "textlint-rule-en-max-word-count"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-en-max-word-count/-/textlint-rule-en-max-word-count-1.0.1.tgz"; + sha1 = "23325aa4d1311c62586332f186e53040c6445d24"; + }; + dependencies = [ + sources."boundary-1.0.1" + sources."buffer-from-1.1.1" + sources."concat-stream-1.6.2" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."object-assign-4.1.1" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" + sources."sentence-splitter-2.3.2" + sources."split-string-words-1.0.0" + sources."string_decoder-1.1.1" + sources."structured-source-3.0.2" + sources."textlint-util-to-string-1.2.1" + sources."typedarray-0.0.6" + sources."unist-util-map-1.0.4" + sources."util-deprecate-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "textlint rule that specify the maximum word count of a sentence."; + homepage = https://github.com/azu/textlint-rule-en-max-word-count; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-max-comma = nodeEnv.buildNodePackage { + name = "textlint-rule-max-comma"; + packageName = "textlint-rule-max-comma"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-max-comma/-/textlint-rule-max-comma-1.0.4.tgz"; + sha1 = "f555c97e0d3039ca7da06cfd1afad0e5f5899a37"; + }; + dependencies = [ + sources."boundary-1.0.1" + sources."buffer-from-1.1.1" + sources."concat-stream-1.6.2" + sources."core-util-is-1.0.2" + sources."flatmap-0.0.3" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" + sources."sentence-splitter-2.3.2" + sources."string_decoder-1.1.1" + sources."structured-source-3.0.2" + sources."typedarray-0.0.6" + sources."unist-util-filter-0.2.1" + sources."unist-util-is-1.0.0" + sources."util-deprecate-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "textlint rule that limit maxinum comma(,) count of sentence."; + homepage = "https://github.com/azu/textlint-rule-max-comma#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-no-start-duplicated-conjunction = nodeEnv.buildNodePackage { + name = "textlint-rule-no-start-duplicated-conjunction"; + packageName = "textlint-rule-no-start-duplicated-conjunction"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-no-start-duplicated-conjunction/-/textlint-rule-no-start-duplicated-conjunction-2.0.2.tgz"; + sha512 = "HydBbkWjnMn4KrnlpnusY1BGjIG+64UySxRCvRphUAIiuJL2nbkdrIIiOjwfQhllKUa7Sf33bs6RAcbEWjZVfg=="; + }; + dependencies = [ + sources."@textlint/ast-node-types-4.2.2" + sources."@textlint/types-1.1.5" + sources."boundary-1.0.1" + sources."buffer-from-1.1.1" + sources."concat-stream-1.6.2" + sources."core-util-is-1.0.2" + sources."define-properties-1.1.3" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" + sources."function-bind-1.1.1" + sources."has-1.0.3" + sources."has-symbols-1.0.0" + sources."inherits-2.0.3" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" + sources."isarray-1.0.0" + sources."object-assign-4.1.1" + sources."object-keys-1.1.1" + sources."object.values-1.1.0" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" + sources."sentence-splitter-3.0.11" + sources."string_decoder-1.1.1" + sources."structured-source-3.0.2" + sources."textlint-rule-helper-2.1.1" + sources."typedarray-0.0.6" + sources."unist-util-is-2.1.2" + sources."unist-util-visit-1.4.0" + sources."unist-util-visit-parents-2.0.1" + sources."util-deprecate-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "textlint rule that check no start with duplicated conjunction."; + homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-period-in-list-item = nodeEnv.buildNodePackage { + name = "textlint-rule-period-in-list-item"; + packageName = "textlint-rule-period-in-list-item"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-period-in-list-item/-/textlint-rule-period-in-list-item-0.3.0.tgz"; + sha512 = "yHTu24dDU8XPxEpQ6NJc4i8OYKiqHmch4XHCvzfrz8nsWaaIa82h5fDiUsMrzEctlXiWcbmNk6Sxbhq+UnHOvg=="; + }; + dependencies = [ + sources."array.prototype.find-2.0.4" + sources."boolbase-1.0.0" + sources."check-ends-with-period-1.0.1" + sources."css-selector-parser-1.3.0" + sources."debug-2.6.9" + sources."define-properties-1.1.3" + sources."emoji-regex-6.5.1" + sources."end-with-1.0.2" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" + sources."function-bind-1.1.1" + sources."has-1.0.3" + sources."has-symbols-1.0.0" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" + sources."ms-2.0.0" + sources."nth-check-1.0.2" + sources."object-keys-1.1.1" + sources."unist-util-select-1.5.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "textlint rule that check with or without period in list item."; + homepage = https://github.com/azu/textlint-rule-period-in-list-item; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-stop-words = nodeEnv.buildNodePackage { + name = "textlint-rule-stop-words"; + packageName = "textlint-rule-stop-words"; + version = "1.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-1.0.13.tgz"; + sha512 = "LYCgL3OcaxFEDWwWo2I4hSg0CR/Ik3HOUjkSiSsVgx54Dnk3/78ajbcEgj+Q7spMmVw2jETqGObhZkMGbQBMYw=="; + }; + dependencies = [ + sources."@textlint/ast-node-types-4.2.2" + sources."@textlint/types-1.1.5" + sources."boundary-1.0.1" + sources."lodash-4.17.11" + sources."split-lines-2.0.0" + sources."structured-source-3.0.2" + sources."textlint-rule-helper-2.1.1" + sources."unist-util-is-2.1.2" + sources."unist-util-visit-1.4.0" + sources."unist-util-visit-parents-2.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Textlint rule to find filler words, buzzwords and chiches"; + homepage = https://github.com/sapegin/textlint-rule-stop-words; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-terminology = nodeEnv.buildNodePackage { + name = "textlint-rule-terminology"; + packageName = "textlint-rule-terminology"; + version = "1.1.30"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-1.1.30.tgz"; + sha512 = "PsLiridAdaLyho236adWnTEAbAcxxUsxVqaXWaJce+aRsjCOeyYPBLNRisFGz90KZ0S1NDYT/v5CvzBrgsiuzQ=="; + }; + dependencies = [ + sources."@textlint/ast-node-types-4.2.2" + sources."@textlint/types-1.1.5" + sources."boundary-1.0.1" + sources."lodash-4.17.11" + sources."strip-json-comments-2.0.1" + sources."structured-source-3.0.2" + sources."textlint-rule-helper-2.1.1" + sources."unist-util-is-2.1.2" + sources."unist-util-visit-1.4.0" + sources."unist-util-visit-parents-2.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "TextLint rule to check correct terms spelling"; + homepage = https://github.com/sapegin/textlint-rule-terminology; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-unexpanded-acronym = nodeEnv.buildNodePackage { + name = "textlint-rule-unexpanded-acronym"; + packageName = "textlint-rule-unexpanded-acronym"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-unexpanded-acronym/-/textlint-rule-unexpanded-acronym-1.2.3.tgz"; + sha512 = "kkbsbUlI3Gw4VTr79E825+2wuxPG8dM8T4VjEH25zlNhh3j8vpsVDjpbXRkVFl+EvDBCtDZEDaFPwhXy85toVQ=="; + }; + dependencies = [ + sources."array-includes-3.0.3" + sources."define-properties-1.1.3" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" + sources."function-bind-1.1.1" + sources."has-1.0.3" + sources."has-symbols-1.0.0" + sources."is-callable-1.1.4" + sources."is-capitalized-1.0.0" + sources."is-date-object-1.0.1" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" + sources."object-keys-1.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "textlint rule that check unexpanded acronym word."; + homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + textlint-rule-write-good = nodeEnv.buildNodePackage { + name = "textlint-rule-write-good"; + packageName = "textlint-rule-write-good"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-rule-write-good/-/textlint-rule-write-good-1.6.2.tgz"; + sha1 = "3c79b04091319d4e8be5fb442c596bf500e8493e"; + }; + dependencies = [ + sources."@textlint/ast-node-types-4.2.2" + sources."@textlint/types-1.1.5" + sources."adverb-where-0.0.9" + sources."boundary-1.0.1" + sources."define-properties-1.1.3" + sources."e-prime-0.10.2" + sources."function-bind-1.1.1" + sources."has-symbols-1.0.0" + sources."no-cliches-0.1.1" + sources."object-keys-1.1.1" + sources."object.assign-4.1.0" + sources."passive-voice-0.1.0" + sources."structured-source-3.0.2" + sources."textlint-rule-helper-2.1.1" + sources."too-wordy-0.1.6" + sources."unist-util-is-2.1.2" + sources."unist-util-visit-1.4.0" + sources."unist-util-visit-parents-2.0.1" + sources."weasel-words-0.1.1" + sources."write-good-0.11.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "textlint rule to check your English style with write good"; + homepage = https://github.com/textlint-rule/textlint-rule-write-good; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.103.0"; + version = "0.104.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.103.0.tgz"; - sha512 = "4WKRHTMt96sp+lX+Hx/eHtN9CWFyejDqr1ikgxZUJIkKEHVglSE7FY8n81NC6yWXqVSjUIQQppaxsoUe26Zi9g=="; + url = "https://registry.npmjs.org/three/-/three-0.104.0.tgz"; + sha512 = "q617IMBC5k40U2E9UC4/LtmhzTOOLB1jGMIooUL+QrhZ7abiGCSDrKrpCDt9V8RTl6xw+0FYfA1PYsIPKbQOgg=="; }; buildInputs = globalBuildInputs; meta = { @@ -60798,7 +63758,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.24.0" - sources."mooremachine-2.2.1" + sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" sources."nan-2.13.2" @@ -60914,7 +63874,7 @@ in sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ=="; }; dependencies = [ - sources."@types/node-6.14.5" + sources."@types/node-6.14.6" sources."ansi-0.3.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -60982,13 +63942,47 @@ in production = true; bypassCache = true; }; + typescript-language-server = nodeEnv.buildNodePackage { + name = "typescript-language-server"; + packageName = "typescript-language-server"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.3.7.tgz"; + sha512 = "26VcyfcMGjojsQv0/uDG8ZxUOhCbH6wNZR1buajQv5hZYxNSqiCm+9InMPjozatECpyfphqVc0rc58q3B+dMfw=="; + }; + dependencies = [ + sources."command-exists-1.2.6" + sources."commander-2.20.0" + sources."crypto-random-string-1.0.0" + sources."fs-extra-7.0.1" + sources."graceful-fs-4.1.15" + sources."jsonfile-4.0.0" + sources."p-debounce-1.0.0" + sources."temp-dir-1.0.0" + sources."tempy-0.2.1" + sources."unique-string-1.0.0" + sources."universalify-0.1.2" + sources."vscode-jsonrpc-4.0.0" + sources."vscode-languageserver-4.4.2" + sources."vscode-languageserver-protocol-3.14.1" + sources."vscode-languageserver-types-3.14.0" + sources."vscode-uri-1.0.6" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Language Server Protocol (LSP) implementation for TypeScript using tsserver"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + }; uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.5.6"; + version = "3.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.6.tgz"; - sha512 = "YDKRX8F0Y+Jr7LhoVk0n4G7ltR3Y7qFAj+DtVBthlOgCcIj1hyMigCfousVfn9HKmvJ+qiFlLDwaHx44/e5ZKw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.11.tgz"; + sha512 = "izPJg8RsSyqxbdnqX36ExpbH3K7tDBsAU/VfNv89VkMFy3z39zFjunQGsSHOlGlyIfGLGprGeosgQno3bo2/Kg=="; }; dependencies = [ sources."commander-2.20.0" @@ -61013,7 +64007,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."after-0.8.2" sources."ajv-6.10.0" sources."ansi-regex-2.1.1" @@ -61150,7 +64144,7 @@ in sources."get-stream-4.1.0" sources."getmac-1.4.6" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -61186,7 +64180,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."jquery-3.4.0" + sources."jquery-3.4.1" sources."jquery-ui-bundle-1.12.1" sources."jsbn-0.1.1" sources."json-schema-0.2.3" @@ -61220,7 +64214,7 @@ in sources."mkdirp-0.5.1" sources."moment-2.24.0" sources."ms-2.0.0" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."nice-try-1.0.5" sources."node-cache-4.2.0" sources."nopt-1.0.10" @@ -61287,7 +64281,7 @@ in sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" @@ -61357,7 +64351,7 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.16" + sources."type-is-1.6.18" sources."typechecker-4.7.0" sources."typedarray-0.0.6" sources."uid-safe-2.1.5" @@ -61389,7 +64383,7 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."yargs-parser-13.0.0" + sources."yargs-parser-13.1.0" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -61401,6 +64395,70 @@ in production = true; bypassCache = true; }; + vscode-css-languageserver-bin = nodeEnv.buildNodePackage { + name = "vscode-css-languageserver-bin"; + packageName = "vscode-css-languageserver-bin"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-css-languageserver-bin/-/vscode-css-languageserver-bin-1.4.0.tgz"; + sha512 = "KWrF5f4RYYe8RBDfqb1c0Sdf9xPS2Ly/Z/T18H+uUOMw2QyzIrkxv4bMKy5GFfPm4479k6Ln4ji4UHqSmhGf3g=="; + }; + dependencies = [ + sources."vscode-css-languageservice-3.0.13" + sources."vscode-jsonrpc-4.0.0" + sources."vscode-languageserver-4.4.2" + sources."vscode-languageserver-protocol-3.14.1" + sources."vscode-languageserver-protocol-foldingprovider-2.0.1" + sources."vscode-languageserver-types-3.14.0" + sources."vscode-nls-4.1.0" + sources."vscode-uri-1.0.6" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Binary version published on npm of vscode-css-languageserver extracted from VSCode tree"; + homepage = "https://github.com/vscode-langservers/vscode-css-languageserver-bin#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + vscode-html-languageserver-bin = nodeEnv.buildNodePackage { + name = "vscode-html-languageserver-bin"; + packageName = "vscode-html-languageserver-bin"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-html-languageserver-bin/-/vscode-html-languageserver-bin-1.4.0.tgz"; + sha512 = "rDnpvASQwf1dlRaGiu8edo5WlAr4dM3/r/dcPCH4O6UD4+eShhdC1E8IyiSisnJU6bRk+4mDTCgA6cyhGJY2xA=="; + }; + dependencies = [ + sources."typescript-2.9.2" + (sources."vscode-css-languageservice-3.0.13" // { + dependencies = [ + sources."vscode-nls-4.1.0" + ]; + }) + (sources."vscode-html-languageservice-2.1.12" // { + dependencies = [ + sources."vscode-nls-4.1.0" + ]; + }) + sources."vscode-jsonrpc-4.0.0" + sources."vscode-languageserver-4.4.2" + sources."vscode-languageserver-protocol-3.14.1" + sources."vscode-languageserver-protocol-foldingprovider-2.0.1" + sources."vscode-languageserver-types-3.14.0" + sources."vscode-nls-3.2.5" + sources."vscode-uri-1.0.6" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Binary version published on npm of vscode-html-languageserver extracted from VSCode tree"; + homepage = "https://github.com/vscode-langservers/vscode-html-languageserver-bin#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; vue-cli = nodeEnv.buildNodePackage { name = "vue-cli"; packageName = "vue-cli"; @@ -61507,7 +64565,7 @@ in sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."git-clone-0.1.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."got-6.7.1" sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" @@ -61611,7 +64669,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -61657,7 +64715,7 @@ in sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.5.6" + sources."uglify-js-3.5.11" sources."uid-0.0.2" sources."unbzip2-stream-1.3.3" sources."unyield-0.0.1" @@ -61691,14 +64749,14 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.6.3"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.6.3.tgz"; - sha512 = "NnSc/Bhu7E0dOoYuRqWul4BpsJQagI2jTcMfb694g8N7+ZYBOLjqg4MSs6G9Gin+Nx4MrSmmDHq7vGjaa0o1iw=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.7.0.tgz"; + sha512 = "X0utEWJTd4khEvAD9DbI1FG5D4hYCCnXFZ+U5uym4g7use2rE8OdmcUHT8pndlIfpBJILt6F1oej7Px99uo6qg=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollographql/apollo-tools-0.3.5" + sources."@apollographql/apollo-tools-0.3.6" sources."@apollographql/graphql-playground-html-1.6.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -61715,29 +64773,29 @@ in sources."@types/accepts-1.3.5" sources."@types/body-parser-1.17.0" sources."@types/connect-3.4.32" - sources."@types/cors-2.8.4" + sources."@types/cors-2.8.5" sources."@types/events-3.0.0" sources."@types/express-4.16.1" - sources."@types/express-serve-static-core-4.16.3" + sources."@types/express-serve-static-core-4.16.4" sources."@types/glob-7.1.1" sources."@types/long-4.0.0" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-11.13.7" + sources."@types/node-12.0.0" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" sources."@types/ws-6.0.1" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-3.6.0" - (sources."@vue/cli-ui-3.6.2" // { + sources."@vue/cli-shared-utils-3.7.0" + (sources."@vue/cli-ui-3.7.0" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.6.3" - sources."@vue/cli-ui-addon-widgets-3.6.0" + sources."@vue/cli-ui-addon-webpack-3.7.0" + sources."@vue/cli-ui-addon-widgets-3.7.0" sources."abbrev-1.1.1" - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."aggregate-error-2.2.0" sources."ajv-6.10.0" sources."ansi-align-2.0.0" @@ -61750,18 +64808,18 @@ in ]; }) sources."apollo-cache-1.2.1" - (sources."apollo-cache-control-0.5.2" // { - dependencies = [ - sources."graphql-extensions-0.5.4" - ]; - }) + sources."apollo-cache-control-0.6.0" sources."apollo-cache-inmemory-1.5.1" sources."apollo-client-2.5.1" - sources."apollo-datasource-0.3.1" - sources."apollo-engine-reporting-1.0.7" - sources."apollo-engine-reporting-protobuf-0.2.1" - sources."apollo-env-0.4.0" - sources."apollo-graphql-0.1.3" + sources."apollo-datasource-0.4.0" + sources."apollo-engine-reporting-1.1.0" + sources."apollo-engine-reporting-protobuf-0.3.0" + sources."apollo-env-0.5.0" + (sources."apollo-graphql-0.2.1-register.1" // { + dependencies = [ + sources."apollo-env-0.4.1-register.1" + ]; + }) (sources."apollo-link-1.2.11" // { dependencies = [ sources."ts-invariant-0.3.3" @@ -61777,18 +64835,14 @@ in sources."apollo-link-persisted-queries-0.2.2" sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.17" - sources."apollo-server-caching-0.3.1" - sources."apollo-server-core-2.4.8" - sources."apollo-server-env-2.2.0" - sources."apollo-server-errors-2.2.1" - sources."apollo-server-express-2.4.8" - sources."apollo-server-plugin-base-0.3.7" - (sources."apollo-tracing-0.5.2" // { - dependencies = [ - sources."graphql-extensions-0.5.4" - ]; - }) - sources."apollo-upload-client-10.0.0" + sources."apollo-server-caching-0.4.0" + sources."apollo-server-core-2.5.0" + sources."apollo-server-env-2.3.0" + sources."apollo-server-errors-2.3.0" + sources."apollo-server-express-2.5.0" + sources."apollo-server-plugin-base-0.4.0" + sources."apollo-tracing-0.6.0" + sources."apollo-upload-client-10.0.1" sources."apollo-utilities-1.2.1" sources."arg-4.1.0" sources."argparse-1.0.10" @@ -61806,7 +64860,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.12.3" + sources."ast-types-0.12.4" sources."async-1.5.2" sources."async-each-1.0.3" sources."async-limiter-1.0.0" @@ -61826,11 +64880,9 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."bl-1.2.2" - (sources."body-parser-1.18.3" // { + (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" - sources."http-errors-1.6.3" - sources."setprototypeof-1.1.0" ]; }) sources."boxen-1.3.0" @@ -61844,7 +64896,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."busboy-0.3.1" - sources."bytes-3.0.0" + sources."bytes-3.1.0" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" @@ -61966,7 +65018,7 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."entities-1.1.2" - sources."envinfo-7.2.0" + sources."envinfo-7.3.1" sources."es-abstract-1.13.0" sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" @@ -61975,7 +65027,7 @@ in sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-pubsub-4.3.0" - sources."eventemitter3-3.1.0" + sources."eventemitter3-3.1.2" sources."exec-sh-0.2.2" (sources."execa-1.0.0" // { dependencies = [ @@ -62005,7 +65057,13 @@ in sources."expand-tilde-2.0.2" (sources."express-4.16.4" // { dependencies = [ + sources."body-parser-1.18.3" + sources."bytes-3.0.0" sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."iconv-lite-0.4.23" + sources."qs-6.5.2" + sources."raw-body-2.3.3" sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; @@ -62013,11 +65071,7 @@ in sources."express-history-api-fallback-2.2.1" sources."extend-3.0.2" sources."extend-shallow-2.0.1" - (sources."external-editor-3.0.3" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) + sources."external-editor-3.0.3" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -62048,12 +65102,12 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" - sources."fs-capacitor-2.0.1" + sources."fs-capacitor-2.0.4" sources."fs-constants-1.0.0" sources."fs-exists-sync-0.1.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."fswin-2.17.1227" sources."function-bind-1.1.1" sources."generate-function-1.1.0" @@ -62064,7 +65118,7 @@ in sources."getpass-0.1.7" sources."git-clone-0.1.0" sources."git-config-path-1.0.1" - sources."glob-7.1.3" + sources."glob-7.1.4" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -62081,14 +65135,14 @@ in sources."got-6.7.1" sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" - sources."graphql-14.2.1" + sources."graphql-14.3.0" sources."graphql-anywhere-4.2.1" - sources."graphql-extensions-0.5.7" + sources."graphql-extensions-0.6.0" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.4" sources."graphql-type-json-0.2.4" - sources."graphql-upload-8.0.5" + sources."graphql-upload-8.0.6" sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -62108,7 +65162,7 @@ in sources."homedir-polyfill-1.0.3" sources."http-errors-1.7.2" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."ignore-4.0.6" sources."ignore-by-default-1.0.1" @@ -62237,16 +65291,16 @@ in sources."get-stream-2.3.1" ]; }) - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."nice-try-1.0.5" - sources."node-fetch-2.3.0" + sources."node-fetch-2.5.0" sources."node-ipc-9.1.1" (sources."node-notifier-5.4.0" // { dependencies = [ sources."semver-5.7.0" ]; }) - (sources."nodemon-1.18.11" // { + (sources."nodemon-1.19.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" @@ -62325,7 +65379,7 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.8.8" // { dependencies = [ - sources."@types/node-10.14.5" + sources."@types/node-10.14.6" ]; }) sources."proxy-addr-2.0.5" @@ -62335,18 +65389,13 @@ in sources."pstree.remy-1.1.6" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.5.2" + sources."qs-6.7.0" sources."range-parser-1.2.0" - (sources."raw-body-2.3.3" // { - dependencies = [ - sources."http-errors-1.6.3" - sources."setprototypeof-1.1.0" - ]; - }) + sources."raw-body-2.4.0" sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" - (sources."recast-0.17.5" // { + (sources."recast-0.17.6" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -62362,10 +65411,14 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."request-2.88.0" + (sources."request-2.88.0" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) sources."request-promise-core-1.1.2" sources."request-promise-native-1.0.7" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" @@ -62373,12 +65426,11 @@ in sources."rimraf-2.6.3" sources."rss-parser-3.7.0" sources."run-async-2.3.0" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."scrollparent-2.0.1" sources."sec-1.0.0" (sources."seek-bzip-1.0.5" // { dependencies = [ @@ -62545,7 +65597,7 @@ in sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-is-1.6.16" + sources."type-is-1.6.18" sources."unbzip2-stream-1.3.3" (sources."undefsafe-2.0.2" // { dependencies = [ @@ -62586,9 +65638,6 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."vue-cli-plugin-apollo-0.19.2" - sources."vue-observe-visibility-0.4.3" - sources."vue-resize-0.4.5" - sources."vue-virtual-scroller-1.0.0-rc.2" sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -62620,6 +65669,917 @@ in production = true; bypassCache = true; }; + vue-language-server = nodeEnv.buildNodePackage { + name = "vue-language-server"; + packageName = "vue-language-server"; + version = "0.0.55"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.55.tgz"; + sha512 = "Xo0eM+EKqwTsrZJ3dvKb5Y/fqnIYu4T4d5sROZ58z+vLjXaDeQYGPP0wpQoJsQZfx5Oj0N7Dpcuul0X3KgCGmg=="; + }; + dependencies = [ + sources."@babel/code-frame-7.0.0" + sources."@babel/highlight-7.0.0" + sources."@emmetio/extract-abbreviation-0.1.6" + sources."@starptech/expression-parser-0.8.17" + sources."@starptech/hast-util-from-webparser-0.8.17" + sources."@starptech/prettyhtml-0.8.17" + sources."@starptech/prettyhtml-formatter-0.8.17" + sources."@starptech/prettyhtml-hast-to-html-0.8.17" + sources."@starptech/prettyhtml-hastscript-0.8.17" + sources."@starptech/prettyhtml-sort-attributes-0.8.17" + sources."@starptech/rehype-minify-whitespace-0.8.17" + sources."@starptech/rehype-webparser-0.8.17" + sources."@starptech/webparser-0.8.17" + sources."@types/node-12.0.0" + sources."@types/unist-2.0.3" + sources."@types/vfile-3.0.2" + sources."@types/vfile-message-1.0.1" + sources."abbrev-1.1.1" + sources."acorn-6.1.1" + sources."acorn-jsx-5.0.1" + sources."ajv-6.10.0" + sources."ajv-keywords-2.1.1" + sources."amdefine-1.0.1" + sources."ansi-align-2.0.0" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-1.3.2" + sources."argparse-1.0.10" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-find-index-1.0.2" + sources."array-iterate-1.1.3" + sources."array-unique-0.2.1" + sources."arrify-1.0.1" + sources."assign-symbols-1.0.0" + sources."astral-regex-1.0.0" + sources."async-1.5.2" + sources."async-each-1.0.3" + sources."atob-2.1.2" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."js-tokens-3.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."babel-runtime-6.26.0" + sources."bail-1.0.4" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."binary-extensions-1.13.1" + sources."bootstrap-vue-helper-json-1.1.1" + sources."boxen-1.3.0" + sources."brace-expansion-1.1.11" + sources."braces-1.8.5" + sources."buefy-helper-json-1.0.3" + sources."buffer-from-1.1.1" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."caller-path-0.1.0" // { + dependencies = [ + sources."callsites-0.2.0" + ]; + }) + sources."callsites-3.1.0" + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" + sources."capture-stack-trace-1.0.1" + sources."ccount-1.0.4" + sources."chalk-2.4.2" + sources."character-entities-1.2.3" + sources."character-entities-html4-1.1.3" + sources."character-entities-legacy-1.1.3" + sources."character-reference-invalid-1.1.3" + sources."chardet-0.7.0" + sources."chokidar-1.5.2" + sources."ci-info-1.6.0" + 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-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."cli-boxes-1.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."clone-1.0.4" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."collapse-white-space-1.0.5" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + (sources."columnify-1.5.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."comma-separated-tokens-1.0.6" + sources."commander-2.20.0" + sources."common-tags-1.8.0" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."config-chain-1.1.12" + sources."configstore-3.1.2" + sources."copy-descriptor-0.1.1" + sources."core-js-2.6.5" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" + sources."css-parse-1.7.0" + sources."currently-unhandled-0.4.1" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."decode-uri-component-0.2.0" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."defaults-1.0.3" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."dlv-1.1.2" + sources."doctrine-3.0.0" + sources."dot-prop-4.2.0" + sources."duplexer3-0.1.4" + sources."editorconfig-0.15.3" + sources."element-helper-json-2.0.5" + sources."emoji-regex-7.0.3" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + (sources."eslint-5.16.0" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."debug-4.1.1" + sources."ignore-4.0.6" + ]; + }) + (sources."eslint-plugin-vue-5.2.2" // { + dependencies = [ + sources."debug-4.1.1" + sources."espree-4.1.0" + sources."vue-eslint-parser-5.0.0" + ]; + }) + sources."eslint-scope-4.0.3" + sources."eslint-utils-1.3.1" + sources."eslint-visitor-keys-1.0.0" + sources."espree-5.0.1" + sources."esprima-4.0.1" + sources."esquery-1.0.1" + sources."esrecurse-4.2.1" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."execa-0.7.0" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.0.3" + sources."extglob-0.3.2" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + sources."fault-1.0.3" + sources."figures-2.0.0" + sources."file-entry-cache-5.0.1" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.4" + sources."find-up-2.1.0" + sources."flat-cache-2.0.1" + sources."flatted-2.0.0" + sources."fn-name-2.0.1" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."format-0.2.2" + sources."fragment-cache-0.2.1" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.9" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."glob-7.1.4" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."global-dirs-0.1.1" + sources."globals-11.12.0" + sources."got-6.7.1" + sources."graceful-fs-4.1.15" + sources."gridsome-helper-json-1.0.3" + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-3.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."has-values-1.0.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."hast-util-embedded-1.0.2" + sources."hast-util-has-property-1.0.2" + sources."hast-util-is-body-ok-link-1.0.1" + sources."hast-util-is-element-1.0.2" + sources."hast-util-parse-selector-2.2.1" + sources."hast-util-to-string-1.0.1" + sources."hast-util-whitespace-1.0.2" + sources."hosted-git-info-2.7.1" + sources."html-void-elements-1.0.4" + sources."html-whitespace-sensitive-tag-names-1.0.0" + sources."iconv-lite-0.4.24" + sources."ignore-3.3.10" + sources."import-fresh-3.0.0" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."indent-string-3.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + (sources."inquirer-6.3.1" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."invert-kv-1.0.0" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-alphabetical-1.0.3" + sources."is-alphanumerical-1.0.3" + sources."is-arrayish-0.2.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-2.0.3" + sources."is-ci-1.2.1" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-decimal-1.0.3" + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-dotfile-1.0.3" + sources."is-empty-1.2.0" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-2.0.1" + sources."is-hexadecimal-1.0.3" + sources."is-hidden-1.1.1" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" + sources."is-number-2.1.0" + sources."is-obj-1.0.1" + sources."is-object-1.0.1" + sources."is-path-inside-1.0.1" + sources."is-plain-obj-1.1.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-resolvable-1.1.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-2.1.0" + sources."js-beautify-1.10.0" + sources."js-tokens-4.0.0" + sources."js-yaml-3.13.1" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json5-2.1.0" + sources."jsonc-parser-1.0.3" + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + sources."latest-version-3.1.0" + sources."lcid-1.0.0" + sources."levn-0.3.0" + sources."load-json-file-4.0.0" + sources."load-plugin-2.3.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.11" + sources."lodash.assign-4.2.0" + sources."lodash.assigninwith-4.2.0" + sources."lodash.defaults-4.0.1" + sources."lodash.iteratee-4.7.0" + sources."lodash.merge-4.6.1" + sources."lodash.rest-4.0.5" + sources."lodash.unescape-4.0.1" + sources."loglevel-1.6.1" + (sources."loglevel-colored-level-prefix-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."longest-streak-1.0.0" + sources."loud-rejection-1.6.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.5" + sources."make-dir-1.3.0" + sources."map-cache-0.2.2" + sources."map-obj-2.0.0" + sources."map-visit-1.0.0" + sources."markdown-table-0.4.0" + sources."math-random-1.0.4" + (sources."meow-5.0.0" // { + dependencies = [ + sources."read-pkg-up-3.0.0" + ]; + }) + sources."micromatch-2.3.11" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."minimist-options-3.0.2" + (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."mout-0.5.0" + sources."ms-2.1.1" + sources."mute-stream-0.0.7" + sources."nan-2.13.2" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) + sources."natural-compare-1.4.0" + sources."nice-try-1.0.5" + sources."nopt-4.0.1" + sources."normalize-package-data-2.5.0" + sources."normalize-path-2.1.1" + sources."npm-prefix-1.2.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."nuxt-helper-json-1.0.0" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optionator-0.8.2" + sources."os-homedir-1.0.2" + sources."os-locale-1.4.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."package-json-4.0.1" + sources."parent-module-1.0.1" + sources."parse-entities-1.2.1" + sources."parse-gitignore-1.0.1" + sources."parse-glob-3.0.4" + sources."parse-json-4.0.0" + sources."pascalcase-0.1.1" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + (sources."pkg-conf-1.1.3" // { + dependencies = [ + sources."find-up-1.1.2" + sources."load-json-file-1.1.0" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + ]; + }) + sources."pluralize-7.0.0" + sources."posix-character-classes-0.1.1" + sources."prelude-ls-1.1.2" + sources."prepend-http-1.0.4" + sources."preserve-0.2.0" + sources."prettier-1.17.0" + (sources."prettier-eslint-8.8.2" // { + dependencies = [ + sources."acorn-5.7.3" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) + sources."ajv-5.5.2" + sources."chardet-0.4.2" + sources."doctrine-2.1.0" + sources."eslint-4.19.1" + sources."eslint-scope-3.7.3" + sources."espree-3.5.4" + sources."external-editor-2.2.0" + sources."fast-deep-equal-1.1.0" + sources."file-entry-cache-2.0.0" + sources."flat-cache-1.3.4" + sources."inquirer-3.3.0" + sources."json-schema-traverse-0.3.1" + sources."regexpp-1.1.0" + sources."slice-ansi-1.0.0" + sources."table-4.0.2" + sources."typescript-2.9.2" + sources."vue-eslint-parser-2.0.3" + sources."write-0.2.1" + ]; + }) + sources."pretty-format-23.6.0" + sources."process-nextick-args-2.0.0" + sources."progress-2.0.3" + sources."property-information-5.0.1" + sources."proto-list-1.2.4" + sources."pseudomap-1.0.2" + sources."punycode-2.1.1" + sources."quick-lru-1.1.0" + (sources."randomatic-3.1.1" // { + dependencies = [ + sources."is-number-4.0.0" + sources."kind-of-6.0.2" + ]; + }) + sources."rc-1.2.8" + sources."read-pkg-3.0.0" + (sources."read-pkg-up-4.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.2.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + ]; + }) + sources."readable-stream-2.3.6" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."debug-2.6.9" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + sources."ms-2.0.0" + ]; + }) + sources."redent-2.0.0" + sources."regenerator-runtime-0.11.1" + sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" + sources."regexpp-2.0.1" + sources."registry-auth-token-3.4.0" + sources."registry-url-3.1.0" + sources."rehype-sort-attribute-values-1.0.1" + (sources."remark-5.1.0" // { + dependencies = [ + sources."unified-4.2.1" + sources."vfile-1.4.0" + ]; + }) + sources."remark-parse-1.1.0" + sources."remark-stringify-1.1.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."replace-ext-1.0.0" + sources."require-main-filename-1.0.1" + sources."require-relative-0.8.7" + (sources."require-uncached-1.0.3" // { + dependencies = [ + sources."resolve-from-1.0.1" + ]; + }) + sources."resolve-1.10.1" + sources."resolve-from-4.0.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."rimraf-2.6.3" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."rxjs-6.5.2" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sax-0.5.8" + sources."semver-5.7.0" + sources."semver-diff-2.1.0" + sources."set-blocking-1.0.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shellsubstitute-1.2.0" + sources."sigmund-1.0.1" + sources."signal-exit-3.0.2" + sources."slice-ansi-2.1.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + sources."source-map-0.5.7" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" + sources."source-map-0.1.43" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."space-separated-tokens-1.1.3" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.4" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."stampit-1.2.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-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."stringify-entities-1.3.2" + sources."strip-ansi-4.0.0" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."strip-indent-2.0.0" + sources."strip-json-comments-2.0.1" + (sources."stylint-1.5.9" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."glob-7.0.4" + sources."path-is-absolute-1.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + (sources."stylus-0.54.5" // { + dependencies = [ + sources."glob-7.0.6" + ]; + }) + sources."stylus-supremacy-2.12.7" + sources."supports-color-5.5.0" + sources."symbol-0.2.3" + (sources."table-5.3.2" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."term-size-1.2.0" + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) + sources."to-vfile-5.0.2" + sources."trim-0.0.1" + sources."trim-newlines-2.0.0" + sources."trim-trailing-lines-1.1.1" + sources."trough-1.0.3" + sources."tslib-1.9.3" + sources."type-check-0.3.2" + sources."typedarray-0.0.6" + sources."typescript-3.4.5" + (sources."typescript-eslint-parser-16.0.1" // { + dependencies = [ + sources."semver-5.5.0" + ]; + }) + sources."unherit-1.1.1" + sources."unified-7.1.0" + (sources."unified-engine-6.0.1" // { + dependencies = [ + sources."to-vfile-4.0.0" + ]; + }) + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + sources."unique-string-1.0.0" + sources."unist-util-find-1.0.1" + sources."unist-util-inspect-4.1.3" + sources."unist-util-is-2.1.2" + sources."unist-util-modify-children-1.1.3" + sources."unist-util-remove-position-1.1.2" + sources."unist-util-stringify-position-1.1.2" + sources."unist-util-visit-1.4.0" + sources."unist-util-visit-parents-2.0.1" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + sources."isobject-3.0.1" + ]; + }) + sources."untildify-2.1.0" + sources."unzip-response-2.0.1" + sources."update-notifier-2.5.0" + sources."uri-js-4.2.2" + sources."urix-0.1.0" + sources."url-parse-lax-1.0.0" + sources."use-3.1.1" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-license-3.0.4" + sources."vfile-3.0.1" + sources."vfile-location-2.0.4" + sources."vfile-message-1.1.1" + sources."vfile-reporter-5.1.1" + sources."vfile-sort-2.2.0" + sources."vfile-statistics-1.1.2" + (sources."vscode-css-languageservice-3.0.13" // { + dependencies = [ + sources."vscode-languageserver-types-3.14.0" + ]; + }) + (sources."vscode-emmet-helper-1.2.15" // { + dependencies = [ + sources."vscode-languageserver-types-3.14.0" + ]; + }) + sources."vscode-jsonrpc-4.1.0-next.2" + sources."vscode-languageserver-5.3.0-next.6" + sources."vscode-languageserver-protocol-3.15.0-next.5" + sources."vscode-languageserver-types-3.15.0-next.1" + sources."vscode-nls-4.1.0" + sources."vscode-uri-1.0.6" + (sources."vue-eslint-parser-6.0.4" // { + dependencies = [ + sources."debug-4.1.1" + ]; + }) + sources."vue-onsenui-helper-json-1.0.2" + sources."vuetify-helper-json-1.0.0" + sources."wcwidth-1.0.1" + sources."which-1.3.1" + sources."widest-line-2.0.1" + sources."window-size-0.2.0" + sources."wordwrap-1.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."wrappy-1.0.2" + sources."write-1.0.3" + sources."write-file-atomic-2.4.2" + sources."x-is-array-0.1.0" + sources."x-is-string-0.1.0" + sources."xdg-basedir-3.0.0" + sources."xtend-4.0.1" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + (sources."yargs-4.7.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."camelcase-3.0.0" + sources."find-up-1.1.2" + sources."is-fullwidth-code-point-1.0.0" + sources."load-json-file-1.1.0" + sources."parse-json-2.2.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-1.0.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."yargs-parser-2.4.1" + ]; + }) + sources."yargs-parser-10.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "vue-language-server"; + homepage = https://github.com/vuejs/vetur/tree/master/server; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; "@webassemblyjs/cli" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_cli"; packageName = "@webassemblyjs/cli"; @@ -62742,11 +66702,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/generator-7.4.0" + sources."@babel/generator-7.4.4" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.3" - sources."@babel/template-7.4.0" - sources."@babel/types-7.4.0" + sources."@babel/parser-7.4.4" + sources."@babel/template-7.4.4" + sources."@babel/types-7.4.4" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -62819,10 +66779,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.30.0"; + version = "4.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.30.0.tgz"; - sha512 = "4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.31.0.tgz"; + sha512 = "n6RVO3X0LbbipoE62akME9K/JI7qYrwwufs20VvgNNpqUoH4860KkaxJTbGq5bgkVZF9FqyyTG/0WPLH3PVNJA=="; }; dependencies = [ sources."@webassemblyjs/ast-1.8.5" @@ -62861,7 +66821,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.3.2" sources."asn1.js-4.10.1" - (sources."assert-1.4.1" // { + (sources."assert-1.5.0" // { dependencies = [ sources."inherits-2.0.1" sources."util-0.10.3" @@ -63000,9 +66960,9 @@ in sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."glob-7.1.4" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -63084,6 +67044,7 @@ in ]; }) sources."normalize-path-3.0.0" + sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -63276,7 +67237,7 @@ in sources."source-map-0.6.1" ]; }) - sources."worker-farm-1.6.0" + sources."worker-farm-1.7.0" sources."wrappy-1.0.2" sources."xtend-4.0.1" sources."y18n-4.0.0" @@ -63294,10 +67255,10 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.1.tgz"; - sha512 = "c2inFU7SM0IttEgF7fK6AaUsbBnORRzminvbyRKS+NlbQHVZdCtzKBlavRL5359bFsywXGRAItA5di/IruC8mg=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.2.tgz"; + sha512 = "FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA=="; }; dependencies = [ sources."ansi-regex-3.0.0" @@ -63599,7 +67560,7 @@ in sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."v8-compile-cache-2.0.2" + sources."v8-compile-cache-2.0.3" sources."which-1.3.1" sources."which-module-2.0.0" (sources."wrap-ansi-2.1.0" // { @@ -63735,13 +67696,13 @@ in sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.0.2" sources."get-stdin-6.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."he-1.2.0" sources."immediate-chunk-store-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ip-1.1.5" - sources."ip-set-1.0.1" + sources."ip-set-1.0.2" sources."ipaddr.js-1.9.0" sources."is-ascii-1.0.0" sources."is-file-1.0.0" @@ -63939,7 +67900,7 @@ in sources."@babel/runtime-7.3.1" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-11.13.7" + sources."@types/node-12.0.0" sources."JSONSelect-0.2.1" sources."acorn-5.7.3" (sources."acorn-jsx-3.0.1" // { @@ -63964,7 +67925,7 @@ in sources."string-width-3.1.0" sources."strip-ansi-5.2.0" sources."yargs-13.1.0" - sources."yargs-parser-13.0.0" + sources."yargs-parser-13.1.0" ]; }) sources."adm-zip-0.4.13" @@ -64079,7 +68040,7 @@ in sources."cheerio-1.0.0-rc.2" (sources."chokidar-2.1.5" // { dependencies = [ - sources."fsevents-1.2.8" + sources."fsevents-1.2.9" sources."normalize-path-3.0.0" sources."upath-1.1.2" ]; @@ -64190,7 +68151,7 @@ in sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es5-ext-0.10.49" + sources."es5-ext-0.10.50" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -64319,7 +68280,7 @@ in ]; }) sources."flat-cache-1.3.4" - sources."flatstr-1.0.9" + sources."flatstr-1.0.11" sources."fluent-syntax-0.10.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -64357,7 +68318,7 @@ in ]; }) sources."global-dirs-0.1.1" - sources."globals-11.11.0" + sources."globals-11.12.0" (sources."got-6.7.1" // { dependencies = [ sources."get-stream-3.0.0" @@ -64411,7 +68372,7 @@ in sources."is-installed-globally-0.1.0" sources."is-mergeable-object-1.1.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.19.0" + sources."is-my-json-valid-2.20.0" sources."is-npm-1.0.0" (sources."is-number-3.0.0" // { dependencies = [ @@ -64671,7 +68632,7 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -64679,7 +68640,7 @@ in sources."rimraf-2.6.3" sources."run-async-2.3.0" sources."rx-lite-3.1.2" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" @@ -64806,7 +68767,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."table-5.2.3" // { + (sources."table-5.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" sources."is-fullwidth-code-point-2.0.0" @@ -64971,13 +68932,39 @@ in production = true; bypassCache = true; }; + write-good = nodeEnv.buildNodePackage { + name = "write-good"; + packageName = "write-good"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/write-good/-/write-good-1.0.1.tgz"; + sha512 = "wSmjZBTHMOexWmK3AmSORGlWAICD98BF0LORYjkK58tChjjMr/BltpvohCThxmIE2vcHYccXHzSVBd/v8ew71g=="; + }; + dependencies = [ + sources."adverb-where-0.2.1" + sources."commander-2.20.0" + sources."e-prime-0.10.2" + sources."no-cliches-0.2.2" + sources."passive-voice-0.1.0" + sources."too-wordy-0.2.2" + sources."weasel-words-0.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Naive linter for English prose"; + homepage = "https://github.com/btford/write-good#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.15.2"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.15.2.tgz"; - sha512 = "DhqaGe2FcYKduO42d2hByXk7y8k2k42H3uzYdWBMTvcNcgWKx7xCkJWsVAQikXvaEQN2GyJNrz8CboqUmaBRrw=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.16.0.tgz"; + sha512 = "cfemyGlnWKA1zopUUgebTPf8C4WkPIZ+TJmklwcEAJ4u6oWPtJeAzrsamaGGh/+b1XWe8W51yzAImC4AWbWR1g=="; }; buildInputs = globalBuildInputs; meta = { @@ -65202,7 +69189,7 @@ in sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -65487,7 +69474,7 @@ in sources."tough-cookie-2.4.3" ]; }) - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -65495,7 +69482,7 @@ in sources."root-check-1.0.0" sources."run-async-2.3.0" sources."rx-4.1.0" - sources."rxjs-6.5.1" + sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -65650,7 +69637,7 @@ in sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."twig-1.13.2" + sources."twig-1.13.3" sources."typedarray-0.0.6" (sources."union-value-1.0.0" // { dependencies = [ diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 61bde8dcc7c..a593036ae2a 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -4,13 +4,13 @@ let sources = { - "@types/node-8.10.46" = { + "@types/node-8.10.48" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.46"; + version = "8.10.48"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.46.tgz"; - sha512 = "PfnRbk836fFs9T9QnZh0G1k9oC6YXCqIK3LX6vU/6oiXtEBSFCiJFj6UnLZtqIIHTsgMn8Dojq3yhmpwY7QWcw=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.48.tgz"; + sha512 = "c35YEBTkL4rzXY2ucpSKy+UYHjUBIIkuJbWYbsGIrKLEWU5dgJMmLkkIb3qeC3O3Tpb1ZQCwecscvJTDjDjkRw=="; }; }; "JSV-4.0.2" = { @@ -832,15 +832,6 @@ let sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; }; }; - "block-stream-0.0.9" = { - name = "block-stream"; - packageName = "block-stream"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; - sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; - }; - }; "boom-2.10.1" = { name = "boom"; packageName = "boom"; @@ -1687,15 +1678,6 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fstream-1.0.11" = { - name = "fstream"; - packageName = "fstream"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; - sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; - }; - }; "galaxy-0.1.12" = { name = "galaxy"; packageName = "galaxy"; @@ -1759,13 +1741,13 @@ let sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922"; }; }; - "glob-7.1.3" = { + "glob-7.1.4" = { name = "glob"; packageName = "glob"; - version = "7.1.3"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; - sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; "global-modules-0.2.3" = { @@ -2236,13 +2218,13 @@ let sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; - "is-my-json-valid-2.19.0" = { + "is-my-json-valid-2.20.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.19.0"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz"; - sha512 = "mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q=="; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz"; + sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; }; }; "is-number-3.0.0" = { @@ -2911,13 +2893,13 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "needle-2.3.0" = { + "needle-2.3.1" = { name = "needle"; packageName = "needle"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz"; - sha512 = "QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg=="; + url = "https://registry.npmjs.org/needle/-/needle-2.3.1.tgz"; + sha512 = "CaLXV3W8Vnbps8ZANqDGz7j4x7Yj1LW4TWF/TQuDfj7Cfx4nAPTvw98qgTevtto1oHDrh3pQkaODbqupXlsWTg=="; }; }; "node-appc-0.2.49" = { @@ -3496,13 +3478,13 @@ let sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; - "resolve-1.10.0" = { + "resolve-1.10.1" = { name = "resolve"; packageName = "resolve"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; - sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz"; + sha512 = "KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA=="; }; }; "resolve-dir-1.0.1" = { @@ -3973,15 +3955,6 @@ let sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c"; }; }; - "tar-2.2.1" = { - name = "tar"; - packageName = "tar"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"; - sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; - }; - }; "tar-4.4.8" = { name = "tar"; packageName = "tar"; @@ -4297,13 +4270,13 @@ let sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; - "v8flags-3.1.2" = { + "v8flags-3.1.3" = { name = "v8flags"; packageName = "v8flags"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.2.tgz"; - sha512 = "MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw=="; + url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz"; + sha512 = "amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w=="; }; }; "validator-5.2.0" = { @@ -4619,7 +4592,7 @@ in sources."private-0.1.8" sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."slash-1.0.0" @@ -4659,7 +4632,7 @@ in sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ=="; }; dependencies = [ - sources."@types/node-8.10.46" + sources."@types/node-8.10.48" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-6.10.0" @@ -4842,7 +4815,7 @@ in ]; }) sources."github-0.1.6" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."har-schema-2.0.0" (sources."har-validator-2.0.6" // { dependencies = [ @@ -4862,7 +4835,7 @@ in sources."inherits-2.0.3" sources."is-buffer-1.1.6" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.19.0" + sources."is-my-json-valid-2.20.0" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -5260,7 +5233,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.10.0" + sources."resolve-1.10.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -5345,7 +5318,7 @@ in }) sources."urix-0.1.0" sources."use-3.1.1" - sources."v8flags-3.1.2" + sources."v8flags-3.1.3" sources."which-1.3.1" ]; buildInputs = globalBuildInputs; @@ -5360,10 +5333,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "3.8.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz"; - sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz"; + sha512 = "2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -5378,9 +5351,9 @@ in sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."block-stream-0.0.9" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" + sources."chownr-1.1.1" sources."code-point-at-1.1.0" sources."combined-stream-1.0.7" sources."concat-map-0.0.1" @@ -5396,11 +5369,11 @@ in sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -5422,6 +5395,8 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.8" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-4.1.2" @@ -5450,7 +5425,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-2.2.1" + sources."tar-4.4.8" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -5465,6 +5440,7 @@ in sources."which-1.3.1" sources."wide-align-1.1.3" sources."wrappy-1.0.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -5478,15 +5454,15 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.8.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.8.0.tgz"; - sha512 = "bYbpIHyRqZ7sVWXxGpz8QIRug5JZc/hzZH4GbdT9HTZi6WmKCZ8GLvP8OZ9TTiIBvwPFKgtGrlWQSXDAvYdsPw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.0.tgz"; + sha512 = "rGLv++nK20BG8gc0MzzcYe1Nl3p3mtwJ74Q2QD0HTEDKZ6NvOFSelY6s2QBPWIHRR8h7hpad0LiwajfClBJfNg=="; }; buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = https://github.com/mafintosh/node-gyp-build; + homepage = https://github.com/prebuild/node-gyp-build; license = "MIT"; }; production = true; @@ -5495,10 +5471,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; - sha512 = "4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A=="; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz"; + sha512 = "Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -5519,7 +5495,7 @@ in sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."has-unicode-2.0.1" sources."iconv-lite-0.4.24" sources."ignore-walk-3.0.1" @@ -5534,7 +5510,7 @@ in sources."minizlib-1.2.1" sources."mkdirp-0.5.1" sources."ms-2.1.1" - sources."needle-2.3.0" + sources."needle-2.3.1" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" sources."npm-packlist-1.4.1" @@ -5582,10 +5558,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.1.1.tgz"; - sha512 = "MqSWfZXft1cQ6rFgpGpl8JIY3O8w8TnTplvjuCPMl4zRxAUAz0Gzr7ARYH6czoiTxBIbbhu41GfbsBfgMSGTwA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.2.0.tgz"; + sha512 = "bujIqiZBgpusV0N/m+PNQ/FAUKc7ue9WqK+FqfN89on44iLEkERYGBWQEZt2a4OMWH4RHzme7muKOQY8ZegD3Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -5643,7 +5619,7 @@ in sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" diff --git a/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch b/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch deleted file mode 100644 index 7b513f21a29..00000000000 --- a/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- File-Slurp-9999.19.orig/lib/File/Slurp.pm 2011-05-30 21:58:53.000000000 +0200 -+++ File-Slurp-9999.19/lib/File/Slurp.pm 2017-04-28 10:05:59.047681755 +0200 -@@ -4,6 +4,7 @@ - - use strict; - use warnings ; -+no warnings 'deprecated'; - - use Carp ; - use Exporter ; diff --git a/pkgs/development/perl-modules/dbiclassx-fix.patch b/pkgs/development/perl-modules/dbiclassx-fix.patch deleted file mode 100644 index a46ffaa7bd9..00000000000 --- a/pkgs/development/perl-modules/dbiclassx-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001 -From: Peter Rabbitson -Date: Tue, 13 Sep 2016 17:15:48 +0200 -Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite) - libsqlite version - ---- - Changes | 2 ++ - t/prefetch/grouped.t | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/t/prefetch/grouped.t b/t/prefetch/grouped.t -index 4aad6b1..c0d2224 100644 ---- a/t/prefetch/grouped.t -+++ b/t/prefetch/grouped.t -@@ -101,7 +101,7 @@ my @cdids = sort $cd_rs->get_column ('cdid')->all; - - # add an extra track to one of the cds, and then make sure we can get it on top - # (check if limit works) -- my $top_cd = $cd_rs->slice (1,1)->next; -+ my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next; - $top_cd->create_related ('tracks', { - title => 'over the top', - }); diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix index adf6da761cf..3a01c9ba983 100644 --- a/pkgs/development/python-modules/Flask-PyMongo/default.nix +++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix @@ -8,18 +8,19 @@ }: buildPythonPackage rec { - pname = "Flask-PyMongo"; - version = "2.2.0"; + pname = "flask-pymongo"; + version = "2.3.0"; src = fetchPypi { - inherit pname version; - sha256 = "112625c5d5b4e35aad301ef9e937b7275043d310d75bd76e2b2dd07147c8217a"; + pname = "Flask-PyMongo"; + inherit version; + sha256 = "051kwdk07y4xm4yawcjhn6bz8swxp9nanv7jj35mz2l0r0nv03k2"; }; checkInputs = [ pytest ]; checkPhase = '' - py.test + pytest ''; # Tests seem to hang diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 3fc4c3e84ed..28148450f07 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -1,8 +1,9 @@ { buildPythonPackage, lib, fetchPypi , pytest, filelock, mock, pep8 -, cython, isPy37, glibcLocales +, cython, isPy27, isPy37, glibcLocales , six, pyshp, shapely, geos, proj, numpy , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona +, xvfb_run }: buildPythonPackage rec { @@ -17,10 +18,14 @@ buildPythonPackage rec { checkInputs = [ filelock mock pytest pep8 ]; - # several tests require network connectivity: we disable them - checkPhase = '' + # several tests require network connectivity: we disable them. + # also py2.7's tk is over-eager in trying to open an x display, + # so give it xvfb + checkPhase = let + maybeXvfbRun = lib.optionalString isPy27 "${xvfb_run}/bin/xvfb-run"; + in '' export HOME=$(mktemp -d) - pytest --pyargs cartopy \ + ${maybeXvfbRun} pytest --pyargs cartopy \ -m "not network and not natural_earth" \ -k "not test_nightshade_image" ''; diff --git a/pkgs/development/python-modules/cgkit/scons-env.patch b/pkgs/development/python-modules/cgkit/scons-env.patch deleted file mode 100644 index 65e9d58a0ae..00000000000 --- a/pkgs/development/python-modules/cgkit/scons-env.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/supportlib/SConstruct b/supportlib/SConstruct -index 7f797b9..07907e9 100644 ---- a/supportlib/SConstruct -+++ b/supportlib/SConstruct -@@ -5,7 +5,7 @@ - # library. - ###################################################################### - --import sys, glob, os.path -+import sys, glob, os.path, os - - # Read the options - vars = Variables("cpp_config.cfg") -@@ -16,7 +16,7 @@ vars.Add("CPPPATH", "The include directories", []) - vars.Add("MSVS_VERSION", "The preferred version of MS Visual Studio") - - # Create the construction environment --env = Environment(variables = vars) -+env = Environment(variables = vars, ENV = os.environ) - - # Build the files in "obj" - env.VariantDir("obj", "src", duplicate=0) diff --git a/pkgs/development/python-modules/configparser/0001-namespace-fix.patch b/pkgs/development/python-modules/configparser/0001-namespace-fix.patch deleted file mode 100644 index 05dbf467718..00000000000 --- a/pkgs/development/python-modules/configparser/0001-namespace-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -From daae1ae35e13bc8107dc97d9219dfb8e172d5d2a Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk -Date: Tue, 14 Mar 2017 15:00:33 +0100 -Subject: [PATCH] namespace fix - -configparser broke other namespace packages -https://github.com/NixOS/nixpkgs/issues/23855#issuecomment-286427428 -This patch seems to solve that issue. ---- - setup.py | 1 - - src/backports/__init__.py | 6 ------ - 2 files changed, 7 deletions(-) - -diff --git a/setup.py b/setup.py -index 3b07823..63ed25d 100644 ---- a/setup.py -+++ b/setup.py -@@ -42,7 +42,6 @@ setup( - py_modules=modules, - package_dir={'': 'src'}, - packages=find_packages('src'), -- namespace_packages=['backports'], - include_package_data=True, - zip_safe=False, - install_requires=requirements, -diff --git a/src/backports/__init__.py b/src/backports/__init__.py -index f84d25c..febdb2f 100644 ---- a/src/backports/__init__.py -+++ b/src/backports/__init__.py -@@ -3,9 +3,3 @@ - - from pkgutil import extend_path - __path__ = extend_path(__path__, __name__) -- --try: -- import pkg_resources -- pkg_resources.declare_namespace(__name__) --except ImportError: -- pass --- -2.11.1 - diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/development/python-modules/csvs-to-sqlite/default.nix new file mode 100644 index 00000000000..ab9ca982718 --- /dev/null +++ b/pkgs/development/python-modules/csvs-to-sqlite/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestrunner +, click +, dateparser +, pandas +, py-lru-cache +, six +, pytest +}: + +buildPythonPackage rec { + pname = "csvs-to-sqlite"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "simonw"; + repo = pname; + rev = version; + sha256 = "0js86m4kj70g9n9gagr8l6kgswqllg6hn1xa3yvxwv95i59ihpz5"; + }; + + buildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ + click + dateparser + pandas + py-lru-cache + six + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Convert CSV files into a SQLite database"; + homepage = https://github.com/simonw/csvs-to-sqlite; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 1344ef4d6ae..18693a204c5 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, fetchPypi +{ buildPythonPackage, stdenv, fetchPypi, fetchpatch , numpy, pandas, plotly, six, colorlover , ipython, ipywidgets, nose }: @@ -17,6 +17,14 @@ buildPythonPackage rec { ipython ipywidgets ]; + patches = [ + # Plotly 3.8 compatibility. Remove with the next release. See https://github.com/santosjorge/cufflinks/pull/178 + (fetchpatch { + url = "https://github.com/santosjorge/cufflinks/commit/cc4c23c2b45b870f6801d1cb0312948e1f73f424.patch"; + sha256 = "1psl2h7vscpzvb4idr6s175v8znl2mfhkcyhb1926p4saswmghw1"; + }) + ]; + checkInputs = [ nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix new file mode 100644 index 00000000000..f8c66c429fe --- /dev/null +++ b/pkgs/development/python-modules/datasette/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, click-default-group +, sanic +, jinja2 +, hupper +, pint +, pluggy +, pytest +, pytestrunner +, pytest-asyncio +, aiohttp +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "datasette"; + version = "0.27"; + + src = fetchFromGitHub { + owner = "simonw"; + repo = "datasette"; + rev = version; + sha256 = "02k1kk6bw034rs74w0viwzapxz684lqgjvw5q5j5xgr0i4kynylp"; + }; + + buildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ + click + click-default-group + sanic + jinja2 + hupper + pint + pluggy + ]; + + checkInputs = [ + pytest + pytest-asyncio + aiohttp + beautifulsoup4 + ]; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "click==6.7" "click" \ + --replace "click-default-group==1.2" "click-default-group" \ + --replace "Sanic==0.7.0" "Sanic" \ + --replace "hupper==1.0" "hupper" \ + --replace "pint==0.8.1" "pint" \ + --replace "Jinja2==2.10" "Jinja2" + ''; + + # many tests require network access + checkPhase = '' + pytest --ignore tests/test_api.py \ + --ignore tests/test_csv.py \ + --ignore tests/test_html.py \ + --ignore tests/test_publish_heroku.py + ''; + + meta = with lib; { + description = "An instant JSON API for your SQLite databases"; + homepage = https://github.com/simonw/datasette; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 25beee94e10..ae309b49ccc 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "1.26.1"; + version = "1.27.1"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "768d9cbd91a7df4a2e391729ec00e387d98e8092d61d076b2272839eb12666f7"; + sha256 = "117q16ha03m8y9ydxg5svwx2cv1r2703hcy4a0zgjh5nhx4rfhiy"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 331aa46acd0..50922ccded2 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "0.38.0"; + version = "0.39.1"; # no tests on PyPI src = fetchFromGitHub { owner = "pennersr"; repo = pname; rev = version; - sha256 = "17ch8lvq47arkgvwz2fdc89lwvgphsnmjs6wwf5g1m50xclljwmq"; + sha256 = "1kplkanhj26z3i6p0l1r5lczha4pavcx96vj3kpcp1rvyk1v0f7r"; }; propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ]; diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix new file mode 100644 index 00000000000..98f9c04c09f --- /dev/null +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, python +, django, ply }: + +buildPythonPackage rec { + pname = "djangoql"; + version = "0.12.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mwv1ljznj9mn74ncvcyfmj6ygs8xm2rajpxm88gcac9hhdmk5gs"; + }; + + propagatedBuildInputs = [ ply ]; + + checkInputs = [ django ]; + + checkPhase = '' + export PYTHONPATH=test_project:$PYTHONPATH + ${python.executable} test_project/manage.py test core.tests + ''; + + meta = with lib; { + description = "Advanced search language for Django"; + homepage = https://github.com/ivelum/djangoql; + license = licenses.mit; + maintainers = with maintainers; [ earvstedt ]; + }; +} diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 1828fb49de2..b79999bba41 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,8 +1,16 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, # Build inputs - dateutil, six, text-unidecode, ipaddress ? null, + dateutil, six, text-unidecode, ipaddress ? null # Test inputs - email_validator, mock, ukpostcodeparser, pytestrunner, pytest}: + , email_validator + , freezegun + , mock + , more-itertools + , pytest + , pytestrunner + , random2 + , ukpostcodeparser +}: assert pythonOlder "3.3" -> ipaddress != null; @@ -18,9 +26,12 @@ buildPythonPackage rec { buildInputs = [ pytestrunner ]; checkInputs = [ email_validator + freezegun mock - ukpostcodeparser + more-itertools pytest + random2 + ukpostcodeparser ]; propagatedBuildInputs = [ @@ -30,8 +41,11 @@ buildPythonPackage rec { ] ++ lib.optional (pythonOlder "3.3") ipaddress; postPatch = '' - find tests -type d -name "__pycache__" | xargs rm -r substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest" + + # see https://github.com/joke2k/faker/pull/911, fine since we pin correct + # versions for python2 + substituteInPlace setup.py --replace "more-itertools<6.0.0" "more-itertools" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index f065bc6ac77..090f9dd8260 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest_3, scipy }: buildPythonPackage { pname = "fastpair"; @@ -11,16 +11,16 @@ buildPythonPackage { sha256 = "1pv9sxycxdk567s5gs947rhlqngrb9nn9yh4dhdvg1ix1i8dca71"; }; - buildInputs = [ pytestrunner ]; + nativeBuildInputs = [ (pytestrunner.override { pytest = pytest_3; }) ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; propagatedBuildInputs = [ scipy ]; checkPhase = '' - py.test fastpair + pytest fastpair ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix new file mode 100644 index 00000000000..731b83294a8 --- /dev/null +++ b/pkgs/development/python-modules/filemagic/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, file +, isPy3k, mock, unittest2 }: + +buildPythonPackage rec { + pname = "filemagic"; + version = "1.6"; + + # Don't use the PyPI source because it's missing files required for testing + src = fetchFromGitHub { + owner = "aliles"; + repo = "filemagic"; + rev = "138649062f769fb10c256e454a3e94ecfbf3017b"; + sha256 = "1jxf928jjl2v6zv8kdnfqvywdwql1zqkm1v5xn1d5w0qjcg38d4n"; + }; + + postPatch = '' + substituteInPlace magic/api.py --replace "ctypes.util.find_library('magic')" \ + "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + checkInputs = [ (if isPy3k then mock else unittest2) ]; + + meta = with lib; { + description = "File type identification using libmagic"; + homepage = https://github.com/aliles/filemagic; + license = licenses.asl20; + maintainers = with maintainers; [ earvstedt ]; + }; +} diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index eebf2794d4b..178aa75d604 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.6.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "0bzm9zgz2gfy6smlvdgxnf6y14rfhr4vj3mjfwlxdx2vcfc95hqa"; + sha256 = "1h04qqdzyflprgf93ihn707brx61f3my5bfdqkwllhwxvr935jyb"; }; propagatedBuildInputs = [ sqlalchemy shapely ]; diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix new file mode 100644 index 00000000000..fc83675fd65 --- /dev/null +++ b/pkgs/development/python-modules/httptools/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "httptools"; + version = "0.0.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "e00cbd7ba01ff748e494248183abc6e153f49181169d8a3d41bb49132ca01dfc"; + }; + + meta = with lib; { + description = "A collection of framework independent HTTP protocol utils"; + homepage = https://github.com/MagicStack/httptools; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index cf206472cd3..482a51a099e 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "i3ipc"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "acrisci"; repo = "i3ipc-python"; rev = "v${version}"; - sha256 = "06d7g4d7cnh0vp5diavy3x9wz1w5nwdrb7ipc4g1c3a2wc78862d"; + sha256 = "0sb525wvwcnikjaqzha94xr97r1gjys30csmaj17swlxgyczxvq5"; }; propagatedBuildInputs = [ enum-compat ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { checkPhase = ''${python.interpreter} run-tests.py''; meta = with stdenv.lib; { - description = "An improved Python library to control i3wm"; + description = "An improved Python library to control i3wm and sway"; homepage = https://github.com/acrisci/i3ipc-python; license = licenses.bsd3; maintainers = with maintainers; [ vanzef ]; diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix new file mode 100644 index 00000000000..2d5e9d78094 --- /dev/null +++ b/pkgs/development/python-modules/inotify-simple/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "inotify-simple"; + version = "1.1.8"; + + src = fetchPypi { + pname = "inotify_simple"; + inherit version; + sha256 = "1pfqvnynwh318cakldhg7535kbs02asjsgv6s0ki12i7fgfi0b7w"; + }; + + # The package has no tests + doCheck = false; + + meta = with lib; { + description = "A simple Python wrapper around inotify"; + homepage = https://github.com/chrisjbillington/inotify_simple; + license = licenses.bsd2; + maintainers = with maintainers; [ earvstedt ]; + }; +} diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 51e387270be..e154c5c9c0e 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "8.0.1"; + version = "9.0.0"; prePatch = '' sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0y0aygnd7kpflwdm3zxrmsgws0frk4qwq3lnq92zsiyxcxh8r4i5"; + sha256 = "1gz3sk4s0gx68xpxjwzp9n2shlxfa9d5j4h7cvmglim9bgasxc58"; }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; diff --git a/pkgs/development/python-modules/langdetect/default.nix b/pkgs/development/python-modules/langdetect/default.nix new file mode 100644 index 00000000000..dcd90dd89bd --- /dev/null +++ b/pkgs/development/python-modules/langdetect/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "langdetect"; + version = "1.0.7"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0c5zm6c7xzsigbb9c7v4r33fcpz911zscfwvh3dq1qxdy3ap18ci"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with lib; { + description = "Python port of Google's language-detection library"; + homepage = https://github.com/Mimino666/langdetect; + license = licenses.asl20; + maintainers = with maintainers; [ earvstedt ]; + }; +} diff --git a/pkgs/development/python-modules/leveldb/default.nix b/pkgs/development/python-modules/leveldb/default.nix new file mode 100644 index 00000000000..4d6336ce757 --- /dev/null +++ b/pkgs/development/python-modules/leveldb/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "leveldb"; + version = "0.194"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f6d1y65k6miimic82n8zsx50z9k982mvzp90crwcv1knjrphcww"; + }; + + meta = with lib; { + homepage = "https://code.google.com/archive/p/py-leveldb/"; + description = "Thread-safe Python bindings for LevelDB"; + platforms = [ "x86_64-linux" "i686-linux" ]; + license = licenses.bsd3; + maintainers = [ maintainers.aanderse ]; + }; +} diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix index d26459acf70..924a2d31b76 100644 --- a/pkgs/development/python-modules/ordered-set/default.nix +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "ordered-set"; - version = "3.1"; + version = "3.1.1"; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "0slg1ys58dzxl96mws3sydzavdzqdk0s2nrc852dphd9kbm07dzr"; + sha256 = "094pww79pawgmjgwi47r0fji9irb7sr4xc9xwjbb0wwcficaigx7"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 5a9934d6be6..32c945f332a 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -38,9 +38,11 @@ buildPythonPackage rec { ]; # most of the downloader tests and 4 other tests require a network connection + # test_export_yaml and test_citations check for the exact output produced by pyyaml 3.x and + # fail with 5.x checkPhase = '' HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders \ - -k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url" + -k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url and not test_export_yaml and not test_citations" ''; meta = { diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix new file mode 100644 index 00000000000..6c3b1c0cb92 --- /dev/null +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, poppler }: + +buildPythonPackage rec { + pname = "pdftotext"; + version = "2.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jwc2zpss0983wqqi0kpichasljsxar9c4ma8vycn8maw3pi3bg3"; + }; + + buildInputs = [ poppler ]; + + meta = with lib; { + description = "Simple PDF text extraction"; + homepage = https://github.com/jalan/pdftotext; + license = licenses.mit; + maintainers = with maintainers; [ earvstedt ]; + }; +} diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 253288088c4..55963299f9c 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.7.1"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1gad00c0p56zvmk2yzy03m0f3fcq67q9kdgdfxph2aw905mkwddc"; + sha256 = "498c35a2a482f7c7937fc2f3681fec653a0191dd21e40e754a6b774234cd167e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-lru-cache/default.nix b/pkgs/development/python-modules/py-lru-cache/default.nix new file mode 100644 index 00000000000..b1d8c4f2946 --- /dev/null +++ b/pkgs/development/python-modules/py-lru-cache/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "py-lru-cache"; + version = "0.1.4"; + + src = fetchPypi { + inherit version; + pname = "py_lru_cache"; + sha256 = "1w3a8l3ckl1zz0f2vlfrawl9a402r458p7xzhy4sgq8k9rl37pq2"; + }; + + meta = with lib; { + description = "An in-memory LRU cache for python"; + homepage = https://github.com/stucchio/Python-LRU-cache; + license = licenses.gpl3; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index 2a886c4cf91..d3ed2659f6a 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py3exiv2"; - version = "0.6.1"; + version = "0.7.0"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "1j2pkynqdqrxf86qyzrjj76i33ylxfsrqxv4j2x9bkd0hk6x0pa6"; + sha256 = "1gcvmglyl8ad2f336w88gwkd5djjsxdx1ind9wnlbqc3jn9i05cg"; }; buildInputs = [ exiv2 boost ]; diff --git a/pkgs/development/python-modules/pygame/pygame-v4l.patch b/pkgs/development/python-modules/pygame/pygame-v4l.patch deleted file mode 100644 index 3b5a2b9d2bf..00000000000 --- a/pkgs/development/python-modules/pygame/pygame-v4l.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in -*** pygame-1.9.1release/Setup.in Thu Jul 2 06:41:56 2009 ---- pygame-1.9.1release-v4lpatch//Setup.in Thu Mar 24 17:31:22 2011 -*************** -*** 34,40 **** - _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) - movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) - scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) -! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG) - pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) - - GFX = src/SDL_gfx/SDL_gfxPrimitives.c ---- 34,40 ---- - _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) - movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) - scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) -! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG) - pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) - - GFX = src/SDL_gfx/SDL_gfxPrimitives.c -diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c -*** pygame-1.9.1release/src/_camera.c Sun Mar 15 20:30:41 2009 ---- pygame-1.9.1release-v4lpatch//src/_camera.c Thu Mar 24 16:58:18 2011 -*************** -*** 160,179 **** - { - #if defined(__unix__) - if (v4l2_open_device(self) == 0) { -! if (v4l_open_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } else { -! self->camera_type = CAM_V4L; -! if (v4l_init_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } -! if (v4l_start_capturing(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } -! } - } else { - self->camera_type = CAM_V4L2; - if (v4l2_init_device(self) == 0) { ---- 160,167 ---- - { - #if defined(__unix__) - if (v4l2_open_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; - } else { - self->camera_type = CAM_V4L2; - if (v4l2_init_device(self) == 0) { -diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h -*** pygame-1.9.1release/src/camera.h Fri Oct 10 04:37:10 2008 ---- pygame-1.9.1release-v4lpatch//src/camera.h Thu Mar 24 16:44:32 2011 -*************** -*** 39,45 **** - - #include /* for videodev2.h */ - -- #include - #include - #endif - ---- 39,44 ---- -*************** -*** 51,57 **** - #define RGB_OUT 1 - #define YUV_OUT 2 - #define HSV_OUT 4 -- #define CAM_V4L 1 - #define CAM_V4L2 2 - - struct buffer ---- 50,55 ---- -*************** -*** 111,118 **** - int v4l2_close_device (PyCameraObject* self); - int v4l2_open_device (PyCameraObject* self); - -- /* internal functions specific to v4l */ -- int v4l_open_device (PyCameraObject* self); -- int v4l_init_device(PyCameraObject* self); -- int v4l_start_capturing(PyCameraObject* self); - #endif ---- 109,112 ---- diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix new file mode 100644 index 00000000000..909a193bd7b --- /dev/null +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "pytest-env"; + version = "0.6.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hl0ln0cicdid4qjk7mv90lw9xkb0v71dlj7q7rn89vzxxm9b53y"; + }; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "Pytest plugin used to set environment variables"; + homepage = https://github.com/MobileDynasty/pytest-env; + license = licenses.mit; + maintainers = with maintainers; [ earvstedt ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix new file mode 100644 index 00000000000..c760b6a5542 --- /dev/null +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, aiohttp +, async_generator +}: + +buildPythonPackage rec { + pname = "pytest-sanic"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vlaq6p9g2p1xj9wshmin58p1faf5h9rcxvmjapx26zv8n23rnm1"; + }; + + propagatedBuildInputs = [ + pytest + aiohttp + async_generator + ]; + + # circular dependency on sanic + doCheck = false; + + meta = with lib; { + description = "A pytest plugin for Sanic"; + homepage = https://github.com/yunstanford/pytest-sanic/; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index e8b58acd670..5ece578dc25 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -1,4 +1,10 @@ -{ stdenv, buildPythonPackage, fetchPypi, termcolor, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, termcolor +, pytest +, packaging +}: buildPythonPackage rec { pname = "pytest-sugar"; @@ -9,19 +15,16 @@ buildPythonPackage rec { sha256 = "fcd87a74b2bce5386d244b49ad60549bfbc4602527797fac167da147983f58ab"; }; - propagatedBuildInputs = [ termcolor pytest ]; + propagatedBuildInputs = [ + termcolor + pytest + packaging + ]; - checkPhase = '' - py.test - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "A plugin that changes the default look and feel of py.test"; homepage = https://github.com/Frozenball/pytest-sugar; license = licenses.bsd3; - - # incompatible with pytest 3.5 - # https://github.com/Frozenball/pytest-sugar/issues/134 - broken = true; # 2018-04-20 + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix new file mode 100644 index 00000000000..37c7d0dae68 --- /dev/null +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, click, ipython }: + +buildPythonPackage rec { + pname = "python-dotenv"; + version = "0.10.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q4sp6ppjiqlsz3h43q9iya4n3qkhx6ng16bcbacfxdyrp9xvcf9"; + }; + + checkInputs = [ click ipython ]; + + meta = with lib; { + description = "Add .env support to your django/flask apps in development and deployments"; + homepage = https://github.com/theskumar/python-dotenv; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ earvstedt ]; + }; +} diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index a24f3a9fedc..0f20a01e0b2 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -1,22 +1,24 @@ -{ buildPythonPackage, fetchPypi, lib, - pkgconfig, igraph }: +{ buildPythonPackage, fetchPypi, lib, isPy3k +, pkgconfig, igraph }: buildPythonPackage rec { pname = "python-igraph"; version = "0.7.1.post6"; - buildInputs = [ pkgconfig igraph ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ igraph ]; src = fetchPypi { inherit pname version; sha256 = "0xp61zz710qlzhmzbfr65d5flvsi8zf2xy78s6rsszh719wl5sm5"; }; + doCheck = !isPy3k; + meta = { description = "High performance graph data structures and algorithms"; + homepage = "https://igraph.org/python/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.MostAwesomeDude ]; }; } - - diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix index 99d9ba8cf8a..5f8c59584dc 100644 --- a/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/pkgs/development/python-modules/qdarkstyle/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "qdarkstyle"; - version = "2.6.5"; + version = "2.6.6"; src = fetchPypi { inherit version; pname = "QDarkStyle"; - sha256 = "96b14cd0440a0f73db4e14c5accdaa08072625d0395ae011d444508cbd73eb9e"; + sha256 = "1jbvvg36fnbvpzvg4ns7zx5jj8h1xsqdr05v5m98a0a9r8awdx3m"; }; # No tests available diff --git a/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch b/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch deleted file mode 100644 index c4d14319a8b..00000000000 --- a/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -18,7 +18,7 @@ from version import VERSION # NOQA - install_requires = [ - 'pandas >= 0.14', - 'numpy >= 1.8', -- 'requests >= 2.7.0, < 2.18', # Version 2.18 appears to break pulling data. -+ 'requests >= 2.7.0', # Works fine - 'inflection >= 0.3.1', - 'python-dateutil', - 'six', diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix new file mode 100644 index 00000000000..6aae4c11fdd --- /dev/null +++ b/pkgs/development/python-modules/sanic/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchPypi +, httptools +, aiofiles +, websockets +, multidict +, uvloop +, ujson +, pytest +, gunicorn +, pytestcov +, aiohttp +, beautifulsoup4 +, pytest-sanic +, pytest-sugar +, pytest-benchmark +}: + +buildPythonPackage rec { + pname = "sanic"; + version = "19.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce434eb154872ca64493a6c3a288f11fd10bca0de7be7bf9f1d0d063185e51ec"; + }; + + propagatedBuildInputs = [ + httptools + aiofiles + websockets + multidict + uvloop + ujson + ]; + + checkInputs = [ + pytest + gunicorn + pytestcov + aiohttp + beautifulsoup4 + pytest-sanic + pytest-sugar + pytest-benchmark + ]; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "websockets>=6.0,<7.0" "websockets" + ''; + + # 10/500 tests ignored due to missing directory and + # requiring network access + checkPhase = '' + pytest --ignore tests/test_blueprints.py \ + --ignore tests/test_routes.py \ + --ignore tests/test_worker.py + ''; + + meta = with lib; { + description = "A microframework based on uvloop, httptools, and learnings of flask"; + homepage = http://github.com/channelcat/sanic/; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix new file mode 100644 index 00000000000..8555c024c76 --- /dev/null +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, pyusb +, numpy +}: + +## Usage +# In NixOS, simply add the `udev` multiple output to services.udev.packages: +# services.udev.packages = [ pkgs.python3Packages.seabreeze.udev ]; + +buildPythonPackage rec { + pname = "seabreeze"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "ap--"; + repo = "python-seabreeze"; + rev = "python-seabreeze-v${version}"; + sha256 = "0bc2s9ic77gz9m40w89snixphxlzib60xa4f49n4zasjrddfz1l8"; + }; + + outputs = [ "out" "udev" ]; + + postInstall = '' + mkdir -p $udev/lib/udev/rules.d + cp misc/10-oceanoptics.rules $udev/lib/udev/rules.d/10-oceanoptics.rules + ''; + + # underlying c libraries are tested and fail + # (c libs are used with anaconda, which we don't care about as we use the alternative path, being that of pyusb). + doCheck = false; + + propagatedBuildInputs = [ pyusb numpy ]; + + setupPyBuildFlags = [ "--without-cseabreeze" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ap--/python-seabreeze"; + description = "A python library to access Ocean Optics spectrometers"; + maintainers = []; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index 93e172a4f60..f39dd48232b 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -1,10 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub -, characteristic +, pythonOlder +, cryptography +, ipaddress , pyasn1 , pyasn1-modules -, pyopenssl , idna , attrs , pytest @@ -12,18 +13,18 @@ buildPythonPackage rec { pname = "service_identity"; - version = "17.0.0"; + version = "18.1.0"; src = fetchFromGitHub { owner = "pyca"; repo = pname; rev = version; - sha256 = "1fn332fci776m5a7jx8c1jgbm27160ip5qvv8p01c242ag6by5g0"; + sha256 = "1aw475ksmd4vpl8cwfdcsw2v063nbhnnxpy633sb75iqp9aazhlx"; }; propagatedBuildInputs = [ - characteristic pyasn1 pyasn1-modules pyopenssl idna attrs - ]; + pyasn1 pyasn1-modules idna attrs cryptography + ] ++ lib.optionals (pythonOlder "3.3") [ ipaddress ]; checkInputs = [ pytest ]; checkPhase = "py.test"; diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 592ce28b7a5..f779862dc61 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -21,6 +21,12 @@ buildPythonPackage rec { sha256 = "cfdd42aa62df299f550768de5002ec83112136a34b44441db9d633b2df802fb4"; }; + # Pytest 4.x fails to collect streamz-dataframe tests. + # Removing them in v0.5.0. TODO: re-enable in a future release + postPatch = '' + rm -rf streamz/dataframe/tests/*.py + ''; + checkInputs = [ pytest networkx distributed confluent-kafka graphviz ]; propagatedBuildInputs = [ tornado diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 978592366cb..e6941473588 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.21.0"; + version = "2.27.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "170f76f2502888debf02da580138c840497b9359876ca3838f4692f2f02c9110"; + sha256 = "0pvypngbmiji92nfs28bmiyl7brsm6cj18d9vhnwyydnzn3nlkl1"; }; checkInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix new file mode 100644 index 00000000000..987fbf01019 --- /dev/null +++ b/pkgs/development/python-modules/tess/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, numpy +, scipy +}: + +buildPythonPackage rec { + pname = "tess"; + version = "unstable-2019-05-07"; + + src = fetchFromGitHub { + owner = "wackywendell"; + repo = "tess"; + rev = "22c19df952732f9749637d1bf6d7b676b6c7b26c"; + sha256 = "0pj18nrfx749fjc6bjdk5r3g1104c6jy6xg7jrpmssllhypbb1m4"; + }; + + buildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy scipy ]; + + meta = with lib; { + description = "A module for calculating and analyzing Voronoi tessellations"; + homepage = https://tess.readthedocs.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index c6f3a127ed5..bfc3ae475eb 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "traits"; - version = "5.0.0"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "8369117036fbbe00dbd40e1a01c8775b52bdbfa11db5788168e7c8c56663bac0"; + sha256 = "0lwmqgkjihqkf269xmdqsa302p378zjcpz01k9a98br7ngzrsj64"; }; # Use pytest because its easier to discover tests diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix new file mode 100644 index 00000000000..9c3dae74a79 --- /dev/null +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyopenssl +, libuv +, psutil +, isPy27 +}: + +buildPythonPackage rec { + pname = "uvloop"; + version = "0.12.2"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "c48692bf4587ce281d641087658eca275a5ad3b63c78297bbded96570ae9ce8f"; + }; + + buildInputs = [ libuv ]; + + checkInputs = [ pyopenssl psutil ]; + + meta = with lib; { + description = "Fast implementation of asyncio event loop on top of libuv"; + homepage = http://github.com/MagicStack/uvloop; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/r-modules/patches/RMySQL.patch b/pkgs/development/r-modules/patches/RMySQL.patch deleted file mode 100644 index dc93b902cd5..00000000000 --- a/pkgs/development/r-modules/patches/RMySQL.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru3 RMySQL_orig/configure RMySQL/configure ---- RMySQL_orig/configure 2015-02-19 22:49:15.812455730 +0300 -+++ RMySQL/configure 2015-02-19 22:49:42.066407256 +0300 -@@ -1,7 +1,7 @@ - # If $MYSQL_DIR is specified, use that - if [ "$MYSQL_DIR" ]; then -- echo "PKG_CPPFLAGS= -I$MYSQL_DIR/include" > src/Makevars -- echo "PKG_LIBS= -L$MYSQL_DIR/lib -lmysqlclient -lz" >> src/Makevars -+ echo "PKG_CPPFLAGS= -I$MYSQL_DIR/include/mysql" > src/Makevars -+ echo "PKG_LIBS= -L$MYSQL_DIR/lib/mysql -lmysqlclient -lz" >> src/Makevars - exit 0 - fi - diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 41fcc336c13..115739bd404 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -524,8 +524,11 @@ in ''; }; - zookeeper = attrs: { - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ]; - }; + zlib = attrs: { + buildInputs = [ zlib ]; + }; + zookeeper = attrs: { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ]; + }; } diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 07763e3fa68..4bc3f464c1b 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.1.0-M14-1"; + version = "1.1.0-M14-4"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0km9bxhch2bh7v6yi5jzyvq95fwdmccwqmbiznzhz4iqij8y066w"; + sha256 = "1rlfqqlinbf472j7ifb8k4zkk2cx543cgnr0hi32qmqmzi0f89r2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 34a7ee4b66c..9dd92317373 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "timescaledb-tune"; - version = "0.5.0"; + version = "0.6.0"; goPackagePath = "github.com/timescale/timescaledb-tune"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "timescale"; repo = name; rev = version; - sha256 = "1fs7ggpdik3qjvjmair1svni2sw9wz54716m2iwngv8x4s9b15nn"; + sha256 = "0hjxmjgkqm9sbjbyhs3pzkk1d9vvlcbzwl7ghsigh4h7rw3a0mpk"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix index a730cde042e..2417f4cbfd1 100644 --- a/pkgs/development/tools/jo/default.nix +++ b/pkgs/development/tools/jo/default.nix @@ -1,15 +1,14 @@ {stdenv, fetchFromGitHub, autoreconfHook}: stdenv.mkDerivation rec { - name = "jo-${version}"; - version = "1.1"; + pname = "jo"; + version = "1.2"; src = fetchFromGitHub { - owner = "jpmens"; + owner = "jpmens"; repo = "jo"; - - rev = "v${version}"; - sha256="1gn9fa37mfb85dfjznyfgciibf142kp0gisc2l2pnz0zrakbvvy3"; + rev = version; + sha256 ="03b22zb5034ccqyp4ynfzknxagb3jz2dppl0kqz2nv4a08aglpmy"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index ccfa62c0b0d..a819c157a57 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0l35pri5m5k5j12zd42kr5pdx97q1xq1r0shif7hs768if0n8ihm"; + sha256 = "0zlxnbifmw1l3j4qw4l8d1mxyj0a7qw2fq90ffghf79f9zgrl4g3"; }; - cargoSha256 = "0wqjk2zxkd6lwki7blsdsbdnr250zs4d0ivjxc2w3i3xivlsjbw8"; + cargoSha256 = "0i7qa6qwvql9nv88vg6d7b1bh50xx53phd341fxba4a27kbmalqg"; checkInputs = [ coreutils bash dash ]; diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 0529a276492..782bff68e34 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "1rg4j5jm8mkscrwlbx5qk3qjnblyr8z9x5npvyi73zm0ism0gv4j"; - "i686-linux" = "14swgx9sf23pns2pj30yyhd0p0rnykdimdrnj8rb0r1pqszw57qx"; - "x86_64-darwin" = "10l13r47nx74xicnjgb56nvgvx2al1zx1p8f09pjldaa2gjlll2k"; + "x86_64-linux" = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa"; + "i686-linux" = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn"; + "x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index b7e9dd0aaef..e11dd5040b0 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -19,12 +19,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "039ll00kvrp881cyybb04z90cw68j7p5cspgdxh0bky9lyi9qpwb"; - "x86_64-darwin" = "0qrakrihcjwn9dic77b0k9ja3zf6nbz534v76xid9gv20md5dds3"; + "x86_64-linux" = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn"; + "x86_64-darwin" = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c"; } else { - "x86_64-linux" = "1v1fbmfkbnlx043z3yx02gaqqy63bj2ymvcby66n4qq0vlpahvwx"; - "x86_64-darwin" = "1y4q7a2b9arln94d6sj547qkv3258jlgcz9b342fh6khlbpfjb8c"; + "x86_64-linux" = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk"; + "x86_64-darwin" = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index 19590239caf..0c3dd9f12c2 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -19,12 +19,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "0awkbnbrffv2m6n9zqv8k4m23g4mril69rmj84ndqpdnv7shrk4l"; - "x86_64-darwin" = "0mbaya0xq99vfl8bn1wgi4m43c8qjp910bxf26z436km64311pip"; + "x86_64-linux" = "1mzycd0ljnkslz9p9jhq279bkpk35r7svhngxjnmsh11ampsvxb8"; + "x86_64-darwin" = "1bz409njdpmsagh5dg062114wpa96w7pmxwfjsizwksqyyjdwdv7"; } else { - "x86_64-linux" = "0fy8vh0x2p8n2r3n5f67h1r5z75qfx5q4fghgqwnqymray5798v4"; - "x86_64-darwin" = "0zyhvbwvdj95v2nswx5b83n4cw3zy5a6bkrvypw6k1i833c6v5g7"; + "x86_64-linux" = "1x3gjc9xa03m4jfnl5vjxigzcnb8ysnhxgd8618v85x4l0010v38"; + "x86_64-darwin" = "1nsbmrswv2jv2z7686i2sf6rrmxysbqi5ih6jjrbrqnk64xi18j2"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 7dc0809c887..198da09e1d0 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -4,7 +4,7 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "teto"; repo = "luarocks"; - rev = "8fb03a9bc8f4fa079d26c0f02804139bb2578848"; - sha256 = "09iwjvs9sbk6vwhrh7sijmfpji6wvg5bbdraw7l5lpnr9jj5wy91"; + rev = "ca52159dcb544161e5bef1e4e366f3da31fa4555"; + sha256 = "13g7vpyirq51qmmnjsqhhiia9wdnq9aw4da0n3r7l1ar95q168sn"; }; }) diff --git a/pkgs/development/tools/misc/mdl/default.nix b/pkgs/development/tools/misc/mdl/default.nix index a3c361efc9d..f0aca5c36a1 100644 --- a/pkgs/development/tools/misc/mdl/default.nix +++ b/pkgs/development/tools/misc/mdl/default.nix @@ -1,15 +1,15 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv { - inherit ruby; +bundlerApp { pname = "mdl"; gemdir = ./.; + exes = [ "mdl" ]; meta = with lib; { description = "A tool to check markdown files and flag style issues"; homepage = https://github.com/markdownlint/markdownlint; license = licenses.mit; - maintainers = with maintainers; [ gerschtli ]; + maintainers = with maintainers; [ gerschtli manveru ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/pkgs/development/tools/misc/mdl/gemset.nix index 54994f3da6a..6d48be1cbcb 100644 --- a/pkgs/development/tools/misc/mdl/gemset.nix +++ b/pkgs/development/tools/misc/mdl/gemset.nix @@ -1,5 +1,7 @@ { kramdown = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; @@ -9,6 +11,8 @@ }; mdl = { dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; @@ -17,6 +21,8 @@ version = "0.5.0"; }; mixlib-cli = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; @@ -26,6 +32,8 @@ }; mixlib-config = { dependencies = ["tomlrb"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; @@ -34,6 +42,8 @@ version = "2.2.18"; }; tomlrb = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix new file mode 100644 index 00000000000..6f96b81e7a4 --- /dev/null +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -0,0 +1,28 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "parinfer-rust-${version}"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "eraserhd"; + repo = "parinfer-rust"; + rev = "v${version}"; + sha256 = "0w7fcg33k8k16q8wzax44ck8csa2dr7bmwcz1g57dz33vhxi8ajc"; + }; + + cargoSha256 = "17fkzpvfaxixllr9nxx7dnpqxkiighggryxf30j3lafghyrx987f"; + + postInstall = '' + mkdir -p $out/share/kak/autoload/plugins + cp rc/parinfer.kak $out/share/kak/autoload/plugins/ + ''; + + meta = with stdenv.lib; { + description = "Infer parentheses for Clojure, Lisp, and Scheme."; + homepage = "https://github.com/eraserhd/parinfer-rust"; + license = licenses.isc; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index ba1b8f27e7c..4e73c820912 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -12,8 +12,16 @@ stdenv.mkDerivation rec { sha256 = "173l9yai5yndbyn8nzdl6q11wv4x959bd0w392i82nfsqcz0pfsv"; }; + configureFlags = [ + "--program-transform-name='s,^,b,'" + ]; + doCheck = true; + postInstall = '' + ln -s $out/bin/byacc $out/bin/yacc + ''; + meta = with stdenv.lib; { description = "Berkeley YACC"; homepage = https://invisible-island.net/byacc/byacc.html; diff --git a/pkgs/development/tools/rubocop/Gemfile b/pkgs/development/tools/rubocop/Gemfile index f6ab81c8112..18a39cab1c3 100644 --- a/pkgs/development/tools/rubocop/Gemfile +++ b/pkgs/development/tools/rubocop/Gemfile @@ -1,3 +1,2 @@ source 'https://rubygems.org' -gem 'rake' gem 'rubocop' diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index beee9772beb..d477fff7177 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -3,29 +3,25 @@ GEM specs: ast (2.4.0) jaro_winkler (1.5.2) - parallel (1.12.1) - parser (2.5.3.0) + parallel (1.17.0) + parser (2.6.3.0) ast (~> 2.4.0) - powerpack (0.1.2) rainbow (3.0.0) - rake (12.3.2) - rubocop (0.62.0) + rubocop (0.68.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) + unicode-display_width (>= 1.4.0, < 1.6) ruby-progressbar (1.10.0) - unicode-display_width (1.4.1) + unicode-display_width (1.5.0) PLATFORMS ruby DEPENDENCIES - rake rubocop BUNDLED WITH - 1.16.4 + 1.17.2 diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix index 2b9792e4df2..288ccfa1524 100644 --- a/pkgs/development/tools/rubocop/default.nix +++ b/pkgs/development/tools/rubocop/default.nix @@ -9,7 +9,7 @@ bundlerEnv rec { meta = with lib; { description = "Automatic Ruby code style checking tool"; - homepage = http://rubocop.readthedocs.io/en/latest/; + homepage = "https://docs.rubocop.org/"; license = licenses.mit; maintainers = with maintainers; [ leemachin ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index 57146a9a15e..0d8e58fea72 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -1,5 +1,7 @@ { ast = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; @@ -18,12 +20,14 @@ version = "1.5.2"; }; parallel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; + sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; type = "gem"; }; - version = "1.12.1"; + version = "1.17.0"; }; parser = { dependencies = ["ast"]; @@ -31,20 +35,14 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f"; + sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn"; type = "gem"; }; - version = "2.5.3.0"; - }; - powerpack = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv"; - type = "gem"; - }; - version = "0.1.2"; + version = "2.6.3.0"; }; rainbow = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; @@ -52,28 +50,20 @@ }; version = "3.0.0"; }; - rake = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; - type = "gem"; - }; - version = "12.3.2"; - }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03narxzrpbilwbhr19qklvxhg22i8jkfar4igb1l8m73jydpxfvk"; + sha256 = "1m1r78w1a4fs73j0x93cv7sms098x24vfp926l5p0nb4vxyhp0xg"; type = "gem"; }; - version = "0.62.0"; + version = "0.68.1"; }; ruby-progressbar = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; @@ -86,9 +76,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bq528fibi8s0jmxz0xzlgzggdq0x4fx46wfqz49478pv8gb2diq"; + sha256 = "1ssnc6rja9ii97z7m35y4zd0rd7cpv3bija20l7cpd7y4jyyx44q"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.0"; }; } \ No newline at end of file diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 3a81dcc9c93..828ff77dfad 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -15,6 +15,7 @@ , enableIntro ? true , enableTruetype ? true , enableFPS ? false +, enableTextMode ? false }: with lib; @@ -31,7 +32,7 @@ buildEnv { paths = [ (dwarf-fortress.override { inherit enableDFHack enableTWBT enableSoundSense enableStoneSense theme - enableIntro enableTruetype enableFPS; + enableIntro enableTruetype enableFPS enableTextMode; })] ++ lib.optional enableDwarfTherapist dwarf-therapist ++ lib.optional enableLegendsBrowser legends-browser; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 8672de3af84..713f38f8a61 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -11,6 +11,7 @@ , enableIntro ? true , enableTruetype ? true , enableFPS ? false +, enableTextMode ? false }: let @@ -58,6 +59,10 @@ let '' + lib.optionalString enableTWBT '' substituteInPlace $out/data/init/init.txt \ --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' + '' + + lib.optionalString enableTextMode '' + substituteInPlace $out/data/init/init.txt \ + --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TEXT]' '' + '' substituteInPlace $out/data/init/init.txt \ --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 56904ae2dfe..5e476cdc7e9 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison , less, makeWrapper , buildPackages -, x11Mode ? false, qtMode ? false, libXaw, libXext, bdftopcf, mkfontdir, pkgconfig, qt5 +, x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkgconfig, qt5 }: let @@ -19,18 +19,18 @@ let binPath = lib.makeBinPath [ coreutils less ]; in stdenv.mkDerivation rec { - version = "3.6.1"; + version = "3.6.2"; name = if x11Mode then "nethack-x11-${version}" else if qtMode then "nethack-qt-${version}" else "nethack-${version}"; src = fetchurl { - url = "https://nethack.org/download/3.6.1/nethack-361-src.tgz"; - sha256 = "1dha0ijvxhx7c9hr0452h93x81iiqsll8bc9msdnp7xdqcfbz32b"; + url = "https://nethack.org/download/3.6.2/nethack-362-src.tgz"; + sha256 = "07fvkm3v11a4pjrq2f66vjslljsvk6raal53skn4gqsfdbd0ml7v"; }; buildInputs = [ ncurses ] - ++ lib.optionals x11Mode [ libXaw libXext ] + ++ lib.optionals x11Mode [ libXaw libXext libXpm ] ++ lib.optionals qtMode [ gzip qt5.qtbase.bin qt5.qtmultimedia.bin ]; nativeBuildInputs = [ flex bison ] @@ -72,6 +72,7 @@ in stdenv.mkDerivation rec { -e 's,CFLAGS.*QtGui.*,CFLAGS += `pkg-config Qt5Gui --cflags`,' \ -e 's,CFLAGS+=-DCOMPRESS.*,CFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\ -DCOMPRESS_EXTENSION=\\".gz\\",' \ + -e 's,moc-qt4,moc,' \ -i sys/unix/hints/linux-qt4 ''} ${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) diff --git a/pkgs/games/the-powder-toy/fix-env.patch b/pkgs/games/the-powder-toy/fix-env.patch deleted file mode 100644 index b09fd4dcbe9..00000000000 --- a/pkgs/games/the-powder-toy/fix-env.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/SConscript -+++ b/SConscript -@@ -99,7 +99,7 @@ - elif platform == "Windows" and not GetOption('msvc'): - env = Environment(tools=['mingw'], ENV={'PATH' : os.environ['PATH']}) - else: -- env = Environment(tools=['default'], ENV={'PATH' : os.environ['PATH']}) -+ env = Environment(tools=['default'], ENV = os.environ) - - #attempt to automatically find cross compiler - if not tool and compilePlatform == "Linux" and compilePlatform != platform: diff --git a/pkgs/games/trigger/search.patch b/pkgs/games/trigger/search.patch deleted file mode 100644 index 60a69b159b5..00000000000 --- a/pkgs/games/trigger/search.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/Trigger/main.cpp b/src/Trigger/main.cpp -index 39539e1..680c12c 100644 ---- a/src/Trigger/main.cpp -+++ b/src/Trigger/main.cpp -@@ -890,7 +890,8 @@ bool MainApp::loadAll() - std::smatch mr; // Match Results - std::regex pat(R"(^(\w+)(\..+)$)"); // Pattern - -- if (!std::regex_search(std::string(*fname), mr, pat)) -+ std::string search(*fname); -+ if (!std::regex_search(search, mr, pat)) - continue; - - std::string basefname = mr[1]; diff --git a/pkgs/misc/doge/default.nix b/pkgs/misc/doge/default.nix new file mode 100644 index 00000000000..37acfbf4a8a --- /dev/null +++ b/pkgs/misc/doge/default.nix @@ -0,0 +1,18 @@ +{ stdenv , python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "doge"; + version = "3.5.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0lwdl06lbpnaqqjk8ap9dsags3bzma30z17v0zc7spng1gz8m6xj"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/thiderman/doge; + description = "wow very terminal doge"; + license = licenses.mit; + maintainers = with maintainers; [ Gonzih ]; + }; +} diff --git a/pkgs/misc/drivers/sc-controller/fix-udev.patch b/pkgs/misc/drivers/sc-controller/fix-udev.patch deleted file mode 100644 index 2416ac216d7..00000000000 --- a/pkgs/misc/drivers/sc-controller/fix-udev.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/scc/lib/eudevmonitor.py b/scc/lib/eudevmonitor.py -index 6c1bd18..182eff2 100644 ---- a/scc/lib/eudevmonitor.py -+++ b/scc/lib/eudevmonitor.py -@@ -28,12 +28,11 @@ class Eudev: - - def __init__(self): - self._ctx = None -- self._lib = ctypes.CDLL(find_library(self.LIB_NAME)) -- if self._lib is None: -- # Alternative approach for NixOS -- try: -- self._lib = ctypes.cdll.LoadLibrary("libudev.so") -- except OSError: -+ try: -+ self._lib = ctypes.cdll.LoadLibrary("libudev.so") -+ except OSError: -+ self._lib = ctypes.CDLL(find_library(self.LIB_NAME)) -+ if self._lib is None: - raise ImportError("No library named udev") - Eudev._setup_lib(self._lib) - self._ctx = self._lib.udev_new() diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix index e92613025ff..fb8bb5a85c8 100644 --- a/pkgs/misc/logging/beats/5.x.nix +++ b/pkgs/misc/logging/beats/5.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "00g90i58c6gnyzszsx7y75vn1350hrkzrsb50xx700jqg9ii8yin"; + sha256 = "0sslcwjdf7zb9xj2c98jid3rb09l96m22k3af48gppimxg1lkh9b"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 2cfae05c924..2f7e38692eb 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0n1sjngc82b7wysw5aaiqvllq4c8rx2jj7khw4vrypc40f8ahjs5"; + sha256 = "0if08dxibdnqpsxs8f6hvw147j0j8bavhcm11scn28j9id65absq"; }; goPackagePath = "github.com/elastic/beats"; @@ -45,5 +45,8 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; + postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + ''; }; } diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 6d00b02d80e..12e08dfeec6 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0n1sjngc82b7wysw5aaiqvllq4c8rx2jj7khw4vrypc40f8ahjs5"; + sha256 = "1ca6a4zm062jpqwhmd8ivvzha1cvrw7mg5342vnmn99xdlr1pk9j"; }; goPackagePath = "github.com/elastic/beats"; @@ -45,5 +45,8 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; + postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + ''; }; } diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 257b943c9e7..8edb618b389 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,31 +1,34 @@ -{ stdenv, fetchurl, xlibsWrapper -, imake, gccmakedep, libXScrnSaver, xorgproto }: +{ stdenv, fetchFromGitHub, xlibsWrapper +, imake, gccmakedep, libXScrnSaver, xorgproto +}: stdenv.mkDerivation rec { - name = "xautolock-2.2"; - src = fetchurl { - url = "https://www.ibiblio.org/pub/Linux/X11/screensavers/${name}.tgz"; - sha256 = "11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2"; + name = "xautolock-${version}"; + version = "2.2-6-ge68d0ed"; + + # This repository contains xautolock-2.2 plus various useful patches that + # were collected from Debian, etc. + src = fetchFromGitHub { + owner = "peti"; + repo = "xautolock"; + rev = "v${version}"; + sha256 = "1131ki6zwk94s8j6zqywf8r5kanx3nrjm692rxh8pcz4hv9qp1mz"; }; - patches = [ - # https://gist.github.com/miekg/9430422 - (fetchurl { - url = "https://gist.githubusercontent.com/miekg/9430422/raw/f00965cd63c497d320f028a9972d1185b0dae039/14-add-lockaftersleep-patch"; - sha256 = "042lc5yyyl3zszll2l930apysd0lip26w0d0f0gjkl7sbhshgk8v"; - }) - ]; - NIX_CFLAGS_COMPILE = "-DSYSV"; + + nativeBuildInputs = [ imake gccmakedep ]; + buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ]; + makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; + installTargets = "install install.man"; - nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ]; + meta = with stdenv.lib; { - description = "A program that launches a given program when your X session has been idle for a given time."; - homepage = http://www.ibiblio.org/pub/linux/X11/screensavers; - maintainers = with maintainers; [ garbas ]; + description = "Launch a given program when your X session has been idle for a given time."; + homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers"; + maintainers = with maintainers; [ garbas peti ]; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d327b7e16fa..97121e2d6ce 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-05-02"; + version = "2019-05-09"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "7f0954b89ef7c43e5fb7b6490665e9814c8205b2"; - sha256 = "0pgqgswggf037y49a2yr1p5k3fbw6lq4v9v7ipj6h9y9iklbqzhr"; + rev = "f444abdfe66696505cb891889b18c4144d12d4ea"; + sha256 = "1id66swgzkgal2hxppm3ls0asffvmsbz81sl1qvci053jr9mr5d0"; }; }; @@ -204,12 +204,12 @@ let CheckAttach = buildVimPluginFrom2Nix { pname = "CheckAttach"; - version = "2018-09-02"; + version = "2019-05-08"; src = fetchFromGitHub { owner = "chrisbra"; repo = "CheckAttach"; - rev = "e9167ad91e85d401441b8ac64b8dcbe3d0cf4df7"; - sha256 = "1xif7lplm35scb36pzh2mq24j2khyzriiaqa2lzhwfilb7nq9c91"; + rev = "8f0b1350431d1d34655a147e6f1cfe6cb5dda5f7"; + sha256 = "1z9a40nbdjd3pnp28nfsi2bijsbaiphc0ia816f5flkchn07gmmj"; }; }; @@ -403,12 +403,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-04-25"; + version = "2019-05-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "ae432f278ab78a28452f23cc7d5d516f6271ca2a"; - sha256 = "0mv8xh2hzvsj4znfnaiwrh9gfijrrnrjcnd4r84lx75jx5bc9zns"; + rev = "f16b581357a575f37f4c51f6c809e8f2fd98b5bf"; + sha256 = "17fsngxpfy1m0r76c99xphwlcip85s4fyf9zj3vcdvb69hdgva2s"; }; }; @@ -606,12 +606,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-05-02"; + version = "2019-05-08"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "2920687e537c6aa771a3d24986f7a09359558dbe"; - sha256 = "0x5kslnv82v5hczaywjpbigyqf4n6g2kbr8k9m76c3ajb9p5k13r"; + rev = "94c7e4c5cac3ce7064fe0fa0737f1893d5b9beb1"; + sha256 = "1q2v9vnhimrp09s39inx1cvdyaj05vjyyypiyi1fkl82jfcqzfpj"; }; }; @@ -1037,12 +1037,12 @@ let ncm2-jedi = buildVimPluginFrom2Nix { pname = "ncm2-jedi"; - version = "2019-03-01"; + version = "2019-05-09"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-jedi"; - rev = "ea0ee18f3b2c3f40c8264fe3c8ab2af7bba9ee53"; - sha256 = "1c802l3cr6wgidhxfajikzhpq18y5fi2ms3csy7hww87gs7y7qcj"; + rev = "485520af57aee528a3448d1f26bb7761dd915b0e"; + sha256 = "1qq5mydg99y2865gx3i3kzk0vl6agx26l8if4nq47wlxnfcbgslv"; }; }; @@ -1147,12 +1147,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-04-21"; + version = "2019-05-03"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "924dee18e7ca547e105ab8d800069fc5829b019b"; - sha256 = "0n9lr63a7dhg3ghi705jshxnq6yx0w145jx2n3zr9435qf31z4xx"; + rev = "7fe72c5d84765e0af19718a57e24659f81471393"; + sha256 = "1kpb6ycsnf0sncpixf3016i2aq82wxvm9q9hjcg9bb7d9706s15d"; }; }; @@ -1169,12 +1169,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-04-21"; + version = "2019-05-09"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "2e5755aa7829c429b3d858036621b6807754a6ba"; - sha256 = "1lrn9bwghm7y03lshfyfxqac5gkh6gl4klw4kccb0grnm2yx5a08"; + rev = "9575d0f72b82c453281eac697630d85cb097550f"; + sha256 = "12mbgglszgqrbpwwfxhmiq77h6ml4hd0z4ambrdzzl8hidp73d55"; }; }; @@ -1268,12 +1268,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-04-23"; + version = "2019-05-09"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "3c0633578281463638235597d8208612544606ae"; - sha256 = "0y82gj9rkqglhx6q9ksxpvpmax0rsxfggad85f6xvmx6iwxv8k1h"; + rev = "67fa9b3116948466234978aa6287649f98e666bd"; + sha256 = "0pzkcpqaalx3jncxfd3yf1ml7q5kkw4z1wqshilkr55nrb26chdg"; }; }; @@ -1477,12 +1477,12 @@ let rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2019-04-17"; + version = "2019-05-08"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "78afcbe5395fac8fab2d4bb122ae638c4485bf69"; - sha256 = "1j7ymlvlgvwklvxjjm2ab86d1frlss560ms4gs9dh73qyjfjr3p2"; + rev = "04b7723b810f24152865af656c46e8513489b77a"; + sha256 = "08qzcy06kr96dj91cdqzp5yn3zjpfcv9miywa6zxvir8vbfkv21d"; }; }; @@ -1708,12 +1708,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-04-07"; + version = "2019-05-05"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "9f43dcb5a244faba6aedb6879b75a56c7de4b8ff"; - sha256 = "1cv643znw51hkgzm0w3sbimasf91v59lrf6vdfqvbcym39705wyv"; + rev = "29e15407b2b372bf1bad95bf0c5264dc7fdc1882"; + sha256 = "1vnxm49zjsk0w7n9arpl9pgy5lh7hrqa2392yl68rhk0vvh5fn46"; }; }; @@ -1873,12 +1873,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2018-04-30"; + version = "2019-05-05"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba"; - sha256 = "1zp3xcmxk6cn38zmxxy5s2wnw9djskwkmspq2s9vqliyhprf9sy3"; + rev = "1a99766b73783bafb08cfa07d7e29e5387c55189"; + sha256 = "08vxvx6fabqg725jv7cbdickrxlcw45885jai0hhgclm4hfqvawx"; }; }; @@ -2170,23 +2170,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-05-02"; + version = "2019-05-08"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "a26a46069825ec391b342481b2d45be66887b8a2"; - sha256 = "14g72yg38vb027xw3bsyzrvq16hbapgqqvhls7p4pf3880v9ngff"; + rev = "9a1acf144fd63cae6f48a3b445958d737c0b167e"; + sha256 = "14n3fcmiv733si64226vm72f7gicffrkcq3xadpzzy0n22dnb1hz"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2019-04-11"; + version = "2019-05-06"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "01b3098642df1bced40473c924c0b6aa37427fe2"; - sha256 = "14iqcmrsmkf0iv31g5yf3x829bich868qy841xy1812yz9mslrn7"; + rev = "e6f233231b232b6027cde6aebeeb18d9138e5324"; + sha256 = "1sb7nb7j7bz0pv1c9bgdy0smhr0jk2b1vbdv9yzghg5lrknpsbr6"; }; }; @@ -2390,12 +2390,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2018-11-20"; + version = "2019-05-03"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "8d640e4c5d89dde55ef79d43fee1c8ecd12495b9"; - sha256 = "17lmdvxnp1y6wvzfzv9yk962ixc549jc80g0zc820734dp27x0l3"; + rev = "10eae530889331457b738b28eafcfa3789481fcd"; + sha256 = "0y9m2jnzz58y5h7r8xgfimha8fz0if2pc760g4qbm922afm3a00a"; }; }; @@ -2445,12 +2445,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-04-27"; + version = "2019-05-05"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "ea338f099183c95ecbc2ea7ebde370206573fe94"; - sha256 = "0az1qpzbv662a12paasx9ci246jy0z5b72chn294254pla595w2b"; + rev = "5a51bf3d52054990beef3221ec3a03d4ea9188e3"; + sha256 = "02sfi5138km2gnmv6vx5gff9xkd9bl0wz6n9dx6478syc49a2sai"; }; }; @@ -2566,23 +2566,23 @@ let vim-extradite = buildVimPluginFrom2Nix { pname = "vim-extradite"; - version = "2015-09-22"; + version = "2019-05-08"; src = fetchFromGitHub { owner = "int3"; repo = "vim-extradite"; - rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; - sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i"; + rev = "58c77fffbb5d61eb0b87c8b4ef0ad78e9659d621"; + sha256 = "1mm2icx50q5iyhaz1dypnbqh14s1wsnw8skpxcm1klhqn02zk46f"; }; }; vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-05-01"; + version = "2019-05-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "8ccbaf0cfde235126af3346705a4c2945b32cd77"; - sha256 = "0xzxx9i4c82zrfyak1a3c0sqdjzh2gzw6vyyjpbcwq58dm6hzz16"; + rev = "f327d6e523975e1544b2effd426b99df25b01d18"; + sha256 = "0abh80w4xyg1wpc1fra9m68f882x430ky0vjfbp9xsnz3i5xd44c"; }; }; @@ -2632,12 +2632,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-05-03"; + version = "2019-05-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2bde1d9de608f7086c8b2eaeb3e295107bce9d92"; - sha256 = "0mb7k1kxkvgyfvfi6x37jsxbbq4f9cm0r5nwvb4c5czi915nahnh"; + rev = "5d99841b22928f1597d447c68de844989bf9a804"; + sha256 = "1af7hz2jqkh4lbfkvpyb1hfgxlfk2f2z9idp5f0f8zz8mmbdf6yr"; }; }; @@ -2698,12 +2698,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-05-03"; + version = "2019-05-07"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "2c1a85bbd04f40503bb7d1488d5d8eeb14836efb"; - sha256 = "0x09prxw5ixprjldkw76b4xxqvl6mgqg5j48xl3ldpndg3v92nqg"; + rev = "c4b419db6c57125e91d6f292daa664b73b155b7b"; + sha256 = "1whcmgr0isa7np6xmc66jrc68an58677bnpzyrd1y817np5f2336"; }; }; @@ -2720,23 +2720,23 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-04-25"; + version = "2019-05-08"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "9348496c9fe017e5f8f89a71a2772704e3720415"; - sha256 = "1dl54hmp4jzv3qmdvcdbaq4qm4hnfrrvz55p0zjs808n1fz3jw8w"; + rev = "e0d101bd8c5be429bebcf8c3f59d01d56389ed9a"; + sha256 = "10dqkl9n602mfdyzxn9gca5wk6m0ndz1jsmyh2llwpy9mnljgca2"; }; }; vim-gutentags = buildVimPluginFrom2Nix { pname = "vim-gutentags"; - version = "2019-03-13"; + version = "2019-05-06"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-gutentags"; - rev = "4814b6763b3052d5a81652cc8b230eff8c56492b"; - sha256 = "0jnmn89xvxscnn9lj1vrrhrf2ib9ddbbl36jfpsd3gkmddv8s58a"; + rev = "eecb136fae97e30d5f01e71f0d3b775c8b017385"; + sha256 = "0i8hq0qxjrsavs3a7saz5wqibib5qd3lgfbygpclvp24ylisa8vq"; }; }; @@ -2896,12 +2896,12 @@ let vim-jade = buildVimPluginFrom2Nix { pname = "vim-jade"; - version = "2019-03-05"; + version = "2019-05-07"; src = fetchFromGitHub { owner = "digitaltoad"; repo = "vim-jade"; - rev = "e83c81f31a8518deda7edf6dcdd8db82580c21f6"; - sha256 = "1vnwmg14bdwdp3blsdsy3y4jlbm8p56zyj0ws9flcq4wn1827j46"; + rev = "efed0c8680d22bd16b9dc7e08f5373269b67c45f"; + sha256 = "0dq0mmx2bg304b24cp337lr29r0f1wkvhq9i3z54bw3x3pbw5hal"; }; }; @@ -3260,12 +3260,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-04-29"; + version = "2019-05-05"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "ecf6339e8fc31abd17fff7895ca8218540c52598"; - sha256 = "03zdjbndrzq4gnlsx5ykagw53112b338sj66lpqip2x1kvlw66gk"; + rev = "2e342ac8b841934c66a1c9afade42e709a068095"; + sha256 = "1hzjp9s490k8rcvv74zhjn8k17xn9igxbzxxkxy3n3zxhfd3jw8j"; }; }; @@ -3282,12 +3282,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2019-04-29"; + version = "2019-05-05"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "22b67a7c67665b97402809195e0ec1d3e8661635"; - sha256 = "1kxfncw783kw374kn53rq25hw59q6pvx3ypk7s6wxv6cfh2c59kc"; + rev = "e557ade9aceb4925cd919c412fe9660b8c4f4cba"; + sha256 = "1msryzjzlv4mil05h17jjy09839dzqp9r11g1f369zxi5hini8g2"; }; }; @@ -3359,12 +3359,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-05-01"; + version = "2019-05-07"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "e8245dbf1746aa59774124de1c77ffc4d8b5b52f"; - sha256 = "1b9ndv9lm9p39c56ikj0mj6xs857464vicw3bif9k78j4mf2q12y"; + rev = "aebef2c2e76b88384b1121c237c965e8cf8b3bcb"; + sha256 = "1nb4i76y6rkznabr9nnnhaibyaig81gjvvpjv2afygllxh3cpqyx"; }; }; @@ -3381,12 +3381,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-04-06"; + version = "2019-05-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "00fbe9b87414e13b11dafb0849b2fde9b9cc35f4"; - sha256 = "06ncrhd0g3q6ps0k0iiqkw7dv70q0rn9109wy1ywvjwpzdpdvvv5"; + rev = "917d2aef5bc789982ea52bb654ef5784a1ceae7e"; + sha256 = "1k0f931i1qgfak0qgk5i5gfq4ld49z0x2siahm1yq3wil7x54zrp"; }; }; @@ -3579,11 +3579,11 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2019-05-02"; + version = "2019-05-08"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "d9856e26a552b72238c4f3d65a520b4dcb250b82"; + rev = "92421f0da36193a2b4dda37b8e9efbf278e93bf5"; sha256 = "0pafvfhf3xbdqyy7v5y8h2j47k4y1zmscp7rans6vd5rq68k8fwf"; }; }; @@ -3766,12 +3766,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-04-16"; + version = "2019-05-09"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "f54101bb7e190186df39442f87ea66c08e73a1da"; - sha256 = "13x0jwk8hv6z52dhgh7w6ism2z0pydlhcxh9qpb3yk42mns57pyd"; + rev = "8e137f223df427e620496f02f0fda6363a76435f"; + sha256 = "0qj4f597mr20lglvyapviqzn390yiwbaksb2bz42v4s0zh33nahg"; }; }; @@ -3898,12 +3898,12 @@ let vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2019-04-30"; + version = "2019-05-08"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "da37439234c7bc10afdd23f10b115eade1e8fa30"; - sha256 = "1vw14naa535nv8bh1dmv8ji5a2qlrlcqi1szljss2kv9p9z5gl4j"; + rev = "40dbc1643088c0b677857cf7eae9354540b5e955"; + sha256 = "17df8h7jgkl1q6p2g3328mnd21gvfcjks7zpbr8r5qzbyrm1pl5v"; }; }; @@ -4019,12 +4019,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-04-26"; + version = "2019-05-03"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2e1687bd66c58fc37d47447c411f89895d8db4cd"; - sha256 = "0rvbp4g9r3jc8rch357arvcw93kribcd5mgn7cgwgmdj7aj4shjq"; + rev = "ee10671c2b25287196194426607c2684827126f7"; + sha256 = "04mxx4ww1qmr6918dryfh956lwmyz4nlq4dissms440p4kqf5giv"; }; }; @@ -4074,12 +4074,12 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2019-01-04"; + version = "2019-05-08"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "64ac52e606a17f7ccf0e185d8e39f78043b34be0"; - sha256 = "1ji7c61lbz9sv62kq9digb6v6nvmw53bl23gcwc5131nz7sf2gpv"; + rev = "81652d1384a8491fd0dea53f466d95fef7c9f46e"; + sha256 = "029nvdwn04hq46nh7q94fazsxf17vhjk07mxhbhdxx1syfw0fslg"; }; }; @@ -4151,24 +4151,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-04-13"; + version = "2019-05-05"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "597e718bd86949cb6ca638a6ae2d288569b1fa11"; - sha256 = "01apq588m66vxbq32d1bb3yx1gg8w55jznnq8jiz2jvy55csh1gs"; + rev = "80ae726dfdc87ef25df3225c35d8ba3fd10a36c0"; + sha256 = "0ds96zhiihkjhsfbxmrh149a656y5xw6fl7v5hih72lzvnplzi5z"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-04-27"; + version = "2019-05-08"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "d691404ae2f7c79ec5d053f2c22a4c775b4bf915"; - sha256 = "1ijs627q679241qjjajk5nwj664vk7vk1szipjm728m9hf9pk5sx"; + rev = "f7e0a6cb7580471d1fc1c68ab85467ff207b5dee"; + sha256 = "0cbv9ahnl70zh3abrr43ijyaqxnprp1kp6bgiwkpi7qzvcbvwzca"; fetchSubmodules = true; }; }; diff --git a/pkgs/os-specific/darwin/xcode/gcc-fix-enum-attributes.patch b/pkgs/os-specific/darwin/xcode/gcc-fix-enum-attributes.patch deleted file mode 100644 index 1e1895c2894..00000000000 --- a/pkgs/os-specific/darwin/xcode/gcc-fix-enum-attributes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h b/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h -index fa0c290..7da7e0c 100644 ---- a/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h -+++ b/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h -@@ -13,7 +13,7 @@ typedef NS_ENUM(NSInteger, NSUserNotificationActivationType) { - NSUserNotificationActivationTypeNone = 0, - NSUserNotificationActivationTypeContentsClicked = 1, - NSUserNotificationActivationTypeActionButtonClicked = 2, -- NSUserNotificationActivationTypeReplied NS_AVAILABLE(10_9, NA) = 3 -+ NSUserNotificationActivationTypeReplied = 3 - } NS_ENUM_AVAILABLE(10_8, NA); - - NS_CLASS_AVAILABLE(10_8, NA) diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/os-specific/linux/compsize/default.nix index a18011836f9..0f24b1a18e9 100644 --- a/pkgs/os-specific/linux/compsize/default.nix +++ b/pkgs/os-specific/linux/compsize/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, btrfs-progs }: stdenv.mkDerivation rec { - name = "compsize-${version}"; - version = "2018-04-07"; + pname = "compsize"; + version = "1.3"; src = fetchFromGitHub { owner = "kilobyte"; repo = "compsize"; - rev = "903f772e37fc0ac6d6cf94ddbc98c691763c1e62"; - sha256 = "0jps8n0xsdh4mcww5q29rzysbv50iq6rmihxrf99lzgrw0sw5m7k"; + rev = "v${version}"; + sha256 = "1c69whla844nwis30jxbj00zkpiw3ccndhkmzjii8av5358mjn43"; }; buildInputs = [ btrfs-progs ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 8965e5d60d7..eb218f36eb4 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "raspberrypi-firmware-${version}"; - version = "1.20181112"; + pname = "raspberrypi-firmware"; + version = "1.20190401"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0jjxr8k8vdziynj8101ikcc9hmm61r2la51nrx6zv8a7j9a4m5zg"; + sha256 = "13q04n1hf8a52avwfp9dhsn2jpp9ivs1mj37gp0h7a6k9044s2xw"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/pkgs/os-specific/linux/kbd/keymaps.nix index ecb7045ed27..32c9f690680 100644 --- a/pkgs/os-specific/linux/kbd/keymaps.nix +++ b/pkgs/os-specific/linux/kbd/keymaps.nix @@ -24,7 +24,8 @@ src = fetchurl { name = "neo.map"; - url = "https://svn.neo-layout.org/linux/console/neo.map?r=${version}"; + url = "https://raw.githubusercontent.com/neo-layout/neo-layout/" + + "a0dee06fed824abfad658b7f10e6d907b270be0a/linux/console/neo.map"; sha256 = "19mfrd31vzpsjiwc7pshxm0b0sz5dd17xrz6k079cy4im1vf0r4g"; }; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 94b8fb209bc..f984c791811 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.116"; + version = "4.14.117"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gcdisdbgrh4mh9d38jy7pv0xi58mra1zddbdp3lxary2sazlnm0"; + sha256 = "0gzjp731fgasi3nq39zz27h1x6mkvc0hbwjhmn9gyzd7wwsa2md8"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index a5113087220..826a0c09e2f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.40"; + version = "4.19.41"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1c1z0z5ac4zy8fp2lxbwapzwby4p9w8bx3wnlysbzmqmi96wvn3g"; + sha256 = "10j7f78220rswdvng2fpmsvri2pqx2hm7q3z2k2cnr2ca2b65plh"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 29ff6811aa4..77de1524435 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.173"; + version = "4.9.174"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0s0iypddxqkabjmd72frfk6dca8amk46vmiyy2nh8zbx9y89smxw"; + sha256 = "0n2qhvvphv45fckrhvcf58va8mv2j7pg7yvr2yxmbzvz0xlgv17w"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index 11172b9576f..48e72632498 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.13"; + version = "5.0.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0y9lsmmalixrh1z72rxdaqb007j6b4wqfshl2bvza95a3yzm5zdw"; + sha256 = "0qbcczrrg3v7gm5x534h8fzasp53kimca3x3dzwc084arxv60drf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/nvidia-x11/atomic64_t.patch b/pkgs/os-specific/linux/nvidia-x11/atomic64_t.patch deleted file mode 100644 index 18fcca314a8..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/atomic64_t.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/kernel/conftest.sh b/kernel/conftest.sh -index e8de161..6c284e9 100755 ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -1784,7 +1784,6 @@ compile_test() { - atomic64_t data; - atomic64_read(&data); - atomic64_set(&data, 0); -- atomic64_inc(&data); - }" - - compile_check_conftest "$CODE" "NV_ATOMIC64_PRESENT" "" "types" diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 9a4954dc348..ed71f27bdcc 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,10 +27,10 @@ rec { }; stable_418 = generic { - version = "418.56"; - sha256_64bit = "1cg7927g5ml1rwgpydlrjzr55gza5dfkqkch29bbarpzd7dh0mf4"; - settingsSha256 = "150c64wbijwyq032ircl1b78q0gwdvfq35gxaqw00d3ac2hjwpsg"; - persistencedSha256 = "07wh6v8c2si0zwy9j60yzrdn1b1pm0vr9kfvql3jkyjqfn4np44z"; + version = "418.74"; + sha256_64bit = "03qj42ppzkc9nphdr9zc12968bb8fc9cpcx5f66y29wnrgg3d1yw"; + settingsSha256 = "15mbqdx5wyk7iq13kl2vd99lykpil618izwpi1kfldlabxdxsi9d"; + persistencedSha256 = "0442qbby0r1b6l72wyw0b3iwvln6k20s6dn0zqlpxafnia9bvc8c"; }; # Last one supporting x86 diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index c167edff6e4..4bbb9d92930 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -41,10 +41,7 @@ let src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - urls = [ - "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run" - "https://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run" - ]; + url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; sha256 = sha256_64bit; } else if stdenv.hostPlatform.system == "i686-linux" then diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 272812ccb58..1ed85bc94cb 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://gitlab.com/procps-ng/procps; description = "Utilities that give information about processes using the /proc filesystem"; - priority = 10; # less than coreutils, which also provides "kill" and "uptime" + priority = 11; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.typetetris ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index bc071d21ce4..9d95269daa9 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -220,6 +220,7 @@ in stdenv.mkDerivation rec { description = "A system and service manager for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; + priority = 10; maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 0aaa31163ac..14458356a79 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,41 +1,64 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib -, intltool, libxslt, docbook_xsl, udev, libgudev, libusb1 -, useSystemd ? true, systemd, gobject-introspection +{ stdenv +, fetchurl +, pkgconfig +, dbus-glib +, intltool +, libxslt +, docbook_xsl +, udev +, libgudev +, libusb1 +, gobject-introspection +, useSystemd ? true, systemd }: stdenv.mkDerivation rec { - name = "upower-0.99.9"; + pname = "upower"; + version = "0.99.10"; src = fetchurl { - url = https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/upower-0.99.9.tar.xz; - sha256 = "046ix7j7hmb7ycv8v54668kjsrgjhzwxn299c1d87vdnkd38kfh1"; + url = https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz; + sha256 = "17d2bclv5fgma2y3g8bsn9pdvspn1zrzismzdnzfivc0f2wm28k4"; }; - buildInputs = - [ dbus-glib intltool libxslt docbook_xsl udev libgudev libusb1 gobject-introspection ] - ++ stdenv.lib.optional useSystemd systemd; + nativeBuildInputs = [ + pkgconfig + ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + dbus-glib + intltool + libxslt + docbook_xsl + udev + libgudev + libusb1 + gobject-introspection + ] + ++ stdenv.lib.optional useSystemd systemd + ; - configureFlags = - [ "--with-backend=linux" "--localstatedir=/var" - ] - ++ stdenv.lib.optional useSystemd - [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemdutildir=$(out)/lib/systemd" - "--with-udevrulesdir=$(out)/lib/udev/rules.d" - ]; - - NIX_CFLAGS_LINK = "-lgcc_s"; + configureFlags = [ + "--with-backend=linux" + "--localstatedir=/var" + ] + ++ stdenv.lib.optional useSystemd [ + "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" + "--with-systemdutildir=${placeholder ''out''}/lib/systemd" + "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d" + ] + ; doCheck = false; # fails with "env: './linux/integration-test': No such file or directory" - installFlags = "historydir=$(TMPDIR)/foo"; + installFlags = [ + "historydir=$(TMPDIR)/foo" + ]; - meta = { + meta = with stdenv.lib; { homepage = https://upower.freedesktop.org/; description = "A D-Bus service for power management"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.linux; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix index 9e2dee099ce..f2fd4d4a61a 100644 --- a/pkgs/os-specific/linux/virtualbox/default.nix +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -9,13 +9,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - patches = [ - ./fix_kerndir.patch - ./fix_kbuild.patch - ]; - KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INCLUDE_BASE = "${virtualbox.modsrc}"; makeFlags = [ "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/virtualbox/fix_kbuild.patch b/pkgs/os-specific/linux/virtualbox/fix_kbuild.patch deleted file mode 100644 index 242a905c1a0..00000000000 --- a/pkgs/os-specific/linux/virtualbox/fix_kbuild.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/vboxdrv/Makefile b/vboxdrv/Makefile -index e262c61..4af8dac 100644 ---- a/vboxdrv/Makefile -+++ b/vboxdrv/Makefile -@@ -131,7 +131,7 @@ ifdef VBOX_WITH_NATIVE_DTRACE - MOD_OBJS += SUPDrvDTrace.o - endif - --MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) -+MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) - ifdef VBOX_WITH_NATIVE_DTRACE - MOD_INCL += -I/usr/include/linux -I/usr/include - endif -@@ -157,7 +157,7 @@ ifdef VBOX_WITH_TEXT_MODMEM_HACK - endif - - # build defs --MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h \ -+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h \ - -fno-omit-frame-pointer -fno-pie - - include $(obj)/Makefile.include.footer -diff --git a/vboxnetadp/Makefile b/vboxnetadp/Makefile -index e262c61..4af8dac 100644 ---- a/vboxnetadp/Makefile -+++ b/vboxnetadp/Makefile -@@ -34,7 +34,7 @@ MOD_OBJS += math/gcc/divdi3.o \ - math/gcc/umoddi3.o - endif - --MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) -+MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) - MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \ - -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \ - -Wno-declaration-after-statement -@@ -59,6 +59,6 @@ ifdef VBOX_USE_INSERT_PAGE - endif - - # build defs --MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie - - include $(obj)/Makefile.include.footer -diff --git a/vboxnetflt/Makefile b/vboxnetflt/Makefile -index e262c61..4af8dac 100644 ---- a/vboxnetflt/Makefile -+++ b/vboxnetflt/Makefile -@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \ - math/gcc/umoddi3.o - endif - --MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) -+MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) - MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \ - -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \ - -Wno-declaration-after-statement -@@ -63,6 +63,6 @@ ifdef VBOX_USE_INSERT_PAGE - endif - - # build defs --MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie - - include $(obj)/Makefile.include.footer -diff --git a/vboxpci/Makefile b/vboxpci/Makefile -index e262c61..4af8dac 100644 ---- a/vboxpci/Makefile -+++ b/vboxpci/Makefile -@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \ - math/gcc/umoddi3.o - endif - --MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) -+MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) - MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \ - -DRT_WITH_VBOX -DVBOX_WITH_HARDENING - ifeq ($(BUILD_TARGET_ARCH),amd64) -@@ -60,6 +60,6 @@ ifdef VBOX_USE_INSERT_PAGE - endif - - # build defs --MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie - - include $(obj)/Makefile.include.footer diff --git a/pkgs/os-specific/linux/virtualbox/fix_kerndir.patch b/pkgs/os-specific/linux/virtualbox/fix_kerndir.patch deleted file mode 100644 index 70ddbbb2ebd..00000000000 --- a/pkgs/os-specific/linux/virtualbox/fix_kerndir.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/vboxdrv/Makefile.include.header b/vboxdrv/Makefile.include.header -index 8df1eb4d25..5a3e5604e7 100644 ---- a/vboxdrv/Makefile.include.header -+++ b/vboxdrv/Makefile.include.header -@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) - endif # neq($(KERNELRELEASE),) - - # Kernel build folder --KERN_DIR := /lib/modules/$(KERN_VER)/build - ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) - $(error Error: unable to find the headers of the Linux kernel to build against. \ - Specify KERN_VER= and run Make again) -diff --git a/vboxnetadp/Makefile.include.header b/vboxnetadp/Makefile.include.header -index 8df1eb4d25..5a3e5604e7 100644 ---- a/vboxnetadp/Makefile.include.header -+++ b/vboxnetadp/Makefile.include.header -@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) - endif # neq($(KERNELRELEASE),) - - # Kernel build folder --KERN_DIR := /lib/modules/$(KERN_VER)/build - ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) - $(error Error: unable to find the headers of the Linux kernel to build against. \ - Specify KERN_VER= and run Make again) -diff --git a/vboxnetflt/Makefile.include.header b/vboxnetflt/Makefile.include.header -index 8df1eb4d25..5a3e5604e7 100644 ---- a/vboxnetflt/Makefile.include.header -+++ b/vboxnetflt/Makefile.include.header -@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) - endif # neq($(KERNELRELEASE),) - - # Kernel build folder --KERN_DIR := /lib/modules/$(KERN_VER)/build - ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) - $(error Error: unable to find the headers of the Linux kernel to build against. \ - Specify KERN_VER= and run Make again) -diff --git a/vboxpci/Makefile.include.header b/vboxpci/Makefile.include.header -index 8df1eb4d25..5a3e5604e7 100644 ---- a/vboxpci/Makefile.include.header -+++ b/vboxpci/Makefile.include.header -@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) - endif # neq($(KERNELRELEASE),) - - # Kernel build folder --KERN_DIR := /lib/modules/$(KERN_VER)/build - ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) - $(error Error: unable to find the headers of the Linux kernel to build against. \ - Specify KERN_VER= and run Make again) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 2993809c556..318f291689f 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file +{ stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file , openssl, enableMagnet ? false, lua5_1 ? null , enableMysql ? false, mysql ? null , enableLdap ? false, openldap ? null @@ -28,8 +28,10 @@ stdenv.mkDerivation rec { sed -ire '/[$]self->{HOSTNAME} *=/i if(length($name)==0) { $name = "127.0.0.1" }' tests/LightyTest.pm ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcre libxml2 zlib bzip2 which file openssl ] + buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 ++ stdenv.lib.optional enableMysql mysql.connector-c ++ stdenv.lib.optional enableLdap openldap @@ -45,6 +47,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableExtendedAttrs "--with-attr"; preConfigure = '' + export PATH=$PATH:${pcre.dev}/bin sed -i "s:/usr/bin/file:${file}/bin/file:g" configure ''; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index de81235c26f..821bbc578dc 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,14 +8,14 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.15.3.876-ad6e39743"; + version = "1.15.4.994-107756f7e"; pname = "plexmediaserver"; name = "${pname}-${version}"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "01g7wccm01kg3nhf3qrmwcn20nkpv0bqz6zqv2gq5v03ps58h6g5"; + sha256 = "0jm1zzlazy41wnmyda8il03vmn9a5vvsfpxn3valkwiggsnvb2p8"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 07ebf97ab2b..0d67988e820 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "0sm99m4m4mmigj6ll22kyaw7zkp1s2i0mhzx15fzidnybdnlifb4"; + sha256 = "0zy7awb2cm2fk3c7zc7v8b8pl0jw49awqwpa1jvilmvx6dcml0vb"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index df7324a73f4..73bee6c47f3 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation (rec { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; sha256 = if enableUnfree - then "1qh6iz3qhw8zcvxfss5w3h89zarwvk6dp5bbbag7c30kh94gkqvv" - else "13v8qpslanfn5w81qvbg0aqh510yfbl3x59kisvdkz9ifhjbcavi"; + then "1a88yyl0x4bsx92m3wjsz1fgm76gbfdzcd4bzp2x652rha667vfh" + else "04fa0fk25d5yxcjdj0bwqvdrswgwj31fwjvbq4gpg66c6bqwzcn6"; }; patches = [ ./es-home-6.x.patch ]; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 7ea33935faa..a55a43baa0b 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -17,12 +17,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "1fi57xqwgxx0ivjyfvaybzz2k457qw59fn9qr26d86lnkigfxpk8"; - "x86_64-darwin" = "06hj96d4vl9q24dfx8ffydfs7qd440ys29654jgqp8sp7js7hjxp"; + "x86_64-linux" = "1jkfllafcjqhfydsy90jx2ghpv5cmm6gabv206niwg9qc6y6r1ik"; + "x86_64-darwin" = "1lgyxq3yahdww0wpqmpc1mz57kmk5hy2drb1dha69k9l0ibmjf18"; } else { - "x86_64-linux" = "1jrcdxm1swf8ahkv3h7kyzzhdq9nwwfhimpflzdq2d831fx525y8"; - "x86_64-darwin" = "119ym2d5fqwba3aq2izh5qj8vxawb7hf183cgg00s1sm1mm8lviv"; + "x86_64-linux" = "0pg22wi2xcjla44azfvn9c58r4xq3x9jiwh7qb0d8f3nv30vfd10"; + "x86_64-darwin" = "0d9xg3bf06mr7mw2bd16gb2xrfjncrhj19846rrj4j5gb2qjz0x2"; }; in stdenv.mkDerivation (rec { diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 0cb1dd5bfc1..2b4c64365ca 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -24,7 +24,7 @@ in { elasticsearch_analysis_lemmagen = esPlugin rec { name = "elasticsearch-analysis-lemmagen-${version}"; pluginName = "elasticsearch-analysis-lemmagen"; - version = "${elk6Version}"; + version = "6.7.1"; # elk6Version; src = fetchurl { url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip"; sha256 = "0mf8lpf40bjpzfj9lkhrg7c3xinzvg7aby3vd6h92g9i676xs8ri"; @@ -33,6 +33,9 @@ in { homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen; description = "LemmaGen Analysis plugin provides jLemmaGen lemmatizer as Elasticsearch token filter"; license = licenses.asl20; + # TODO: remove the following when there's a release compatible with elasticsearch-6.7.2. + # See: https://github.com/vhyza/elasticsearch-analysis-lemmagen/issues/14 + broken = true; }; }; @@ -42,7 +45,7 @@ in { version = "${elk6Version}"; src = pkgs.fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/discovery-ec2/discovery-ec2-${elk6Version}.zip"; - sha256 = "05z4vmi29fzfqzid7fdh6h6pjwgd1dz1mhhjgjz9plpvpzymjiln"; + sha256 = "1p0cdz3lfksfd2kvlcj0syxhbx27mimsaw8q4kgjpjjjwqayg523"; }; meta = with stdenv.lib; { homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2; @@ -54,10 +57,10 @@ in { search_guard = esPlugin rec { name = "elastic-search-guard-${version}"; pluginName = "search-guard"; - version = "${elk6Version}-24.3"; + version = "${elk6Version}-25.1"; src = fetchurl rec { url = "mirror://maven/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip"; - sha256 = "17gif45fbi4vj9qrzv075fkr7d2sp0naa5bjjj9gvfgqyl2flj7g"; + sha256 = "119r1zibi0z40mfxrpkx0zzay0yz6c7syqmmw8i2681wmz4nksda"; }; meta = with stdenv.lib; { homepage = https://github.com/floragunncom/search-guard; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 3e76cd163c8..95551edb138 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.1.1"; + version = "9.0.2"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "0laijnx05xc90jjmza4kq2h8pxn3lgsmn2fgn3zl66fy4fxm1fy4"; + sha256 = "0ya7jig5lcpsfjmqpprgazhdna9nx2c3w4bw6az1ijg1qyz6h69x"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/sql/mysql/abi_check.patch b/pkgs/servers/sql/mysql/abi_check.patch deleted file mode 100644 index e9f9cfdc9d9..00000000000 --- a/pkgs/servers/sql/mysql/abi_check.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc mysql-5.1.40/Makefile.in mysql-5.1.40-new/Makefile.in -*** mysql-5.1.40/Makefile.in 2009-10-06 19:57:22.000000000 +0200 ---- mysql-5.1.40-new/Makefile.in 2009-12-16 13:07:16.060108763 +0100 -*************** -*** 891,897 **** - --srcdir=$(top_srcdir) - storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI - -! all-local: @ABI_CHECK@ - - tags: - support-files/build-tags ---- 891,897 ---- - --srcdir=$(top_srcdir) - storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI - -! all-local: - - tags: - support-files/build-tags diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 2fc190d8e00..114c16d297b 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }: stdenv.mkDerivation rec { - name = "pgroonga-${version}"; - version = "2.1.8"; + pname = "pgroonga"; + version = "2.1.9"; src = fetchurl { - url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "0k3cxl58rdbs19sv27sk8yhk8ai8r046hyg9araxqiplrxx9y01s"; + url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; + sha256 = "15bix7gqi45nf1ah0sxmlg3aqqrkacn19slp43jiirfnpp74dbnw"; }; nativeBuildInputs = [ pkgconfig ]; @@ -22,8 +22,13 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A PostgreSQL extension to use Groonga as the index"; - longDescription = "PGroonga is a PostgreSQL extension to use Groonga as the index. PostgreSQL supports full text search against languages that use only alphabet and digit. It means that PostgreSQL doesn't support full text search against Japanese, Chinese and so on. You can use super fast full text search feature against all languages by installing PGroonga into your PostgreSQL."; - homepage = https://pgroonga.github.io/; + longDescription = '' + PGroonga is a PostgreSQL extension to use Groonga as the index. + PostgreSQL supports full text search against languages that use only alphabet and digit. + It means that PostgreSQL doesn't support full text search against Japanese, Chinese and so on. + You can use super fast full text search feature against all languages by installing PGroonga into your PostgreSQL. + ''; + homepage = "https://pgroonga.github.io/"; license = licenses.postgresql; maintainers = with maintainers; [ DerTim1 ]; }; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index c58539bd788..d3fdda82f13 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-06"; + version = "2019-05-09"; name = "oh-my-zsh-${version}"; - rev = "6da59ff046d7a81483345d0e16333a69eb96ccc6"; + rev = "f5f630ff342571097fd92f069ea5fe006599703d"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "032smh1sahsr62wr0n4s9jmmyjq1iybdgvl388kh8d2hdkaj94r3"; + sha256 = "1ndrampjzkrd4myc1gv733zvgag25zgby9mxny9jzj99mlqajzac"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 201c9378682..3bc4cd9a8fa 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -64,7 +64,7 @@ in lib.init bootStages ++ [ (hostPlatform.isLinux && !buildPlatform.isLinux) [ buildPackages.patchelf ] ++ lib.optional - (let f = p: !p.isx86 || p.libc == "musl" || p.libc == "wasilibc"; in f hostPlatform && !(f buildPlatform)) + (let f = p: !p.isx86 || p.libc == "musl" || p.libc == "wasilibc" || p.isiOS; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 76e1c351ff4..8cb0ad79587 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -165,6 +165,7 @@ let branch = str; homepage = either (listOf str) str; downloadPage = str; + changelog = either (listOf str) str; license = either (listOf lib.types.attrs) (either lib.types.attrs str); maintainers = listOf (attrsOf str); priority = int; diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 9b434da7a84..793229f8bbb 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -7,6 +7,7 @@ with pkgs; cc-wrapper-gcc = callPackage ./cc-wrapper { stdenv = gccStdenv; }; cc-wrapper-gcc7 = callPackage ./cc-wrapper { stdenv = gcc7Stdenv; }; cc-wrapper-gcc8 = callPackage ./cc-wrapper { stdenv = gcc8Stdenv; }; + cc-wrapper-gcc9 = callPackage ./cc-wrapper { stdenv = gcc9Stdenv; }; cc-wrapper-clang = callPackage ./cc-wrapper { stdenv = llvmPackages.stdenv; }; cc-wrapper-libcxx = callPackage ./cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; cc-wrapper-clang-39 = callPackage ./cc-wrapper { stdenv = llvmPackages_39.stdenv; }; diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index f33d03b6d15..5baba117157 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, xrandr, python2Packages }: +{ stdenv, fetchurl, gobject-introspection, gtk3, xrandr, python3Packages }: let - inherit (python2Packages) buildPythonApplication docutils pygtk; + inherit (python3Packages) buildPythonApplication docutils pygobject3; in buildPythonApplication rec { - name = "arandr-0.1.9"; + name = "arandr-0.1.10"; src = fetchurl { url = "https://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; - sha256 = "1i3f1agixxbfy4kxikb2b241p7c2lg73cl9wqfvlwz3q6zf5faxv"; + sha256 = "135q0llvm077jil2fr92ssw3p095m4r8jfj0lc5rr3m71n4srj6v"; }; patchPhase = '' @@ -18,7 +18,12 @@ in buildPythonApplication rec { doCheck = false; buildInputs = [ docutils ]; - propagatedBuildInputs = [ xrandr pygtk ]; + nativeBuildInputs = [ gobject-introspection gtk3 ]; + propagatedBuildInputs = [ xrandr pygobject3 ]; + + makeWrapperArgs = [ + "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH" + ]; meta = { homepage = http://christian.amsuess.com/tools/arandr/; diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix new file mode 100644 index 00000000000..7c1e743a06e --- /dev/null +++ b/pkgs/tools/admin/procs/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "procs"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = pname; + rev = "v${version}"; + sha256 = "0ihww2sm9hnh748723lr1cxw9zyi9nfxbbiij5a465mypa2p7w0v"; + }; + + cargoSha256 = "1aq2nhspb9kp9mzj5550xph09qvd0ahlw246hcx2mqkr4frh64x0"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { + description = "A modern replacement for ps written in Rust"; + homepage = "https://github.com/dalance/procs"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.dalance ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch b/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch deleted file mode 100644 index cb2de6ad4f5..00000000000 --- a/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 34c27f66210570adf5aba624d7da3c0382d5493f Mon Sep 17 00:00:00 2001 -From: "William A. Kennington III" -Date: Sun, 21 Sep 2014 12:19:30 -0700 -Subject: [PATCH] Makefile-env: Don't force /sbin - ---- - src/Makefile-env.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile-env.am b/src/Makefile-env.am -index f2ab655..bf8876e 100644 ---- a/src/Makefile-env.am -+++ b/src/Makefile-env.am -@@ -27,7 +27,7 @@ bin_DEBUGPROGRAMS = - ceph_sbindir = $(sbindir) - - # certain things go straight into /sbin, though! --su_sbindir = /sbin -+su_sbindir = $(sbindir) - - # C/C++ tests to build will be appended to this - check_PROGRAMS = --- -2.1.0 - diff --git a/pkgs/tools/filesystems/ceph/fix-pythonpath.patch b/pkgs/tools/filesystems/ceph/fix-pythonpath.patch deleted file mode 100644 index 7458a46aca1..00000000000 --- a/pkgs/tools/filesystems/ceph/fix-pythonpath.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/Makefile-env.am b/src/Makefile-env.am -index e176596..384e230 100644 ---- a/src/Makefile-env.am -+++ b/src/Makefile-env.am -@@ -40,7 +40,7 @@ check_SCRIPTS = - export VERBOSE = true - - # python unit tests need to know where the scripts are located --export PYTHONPATH=$(top_srcdir)/src/pybind -+export PYTHONPATH+=:$(top_srcdir)/src/pybind - - # when doing a debug build, make sure to make the targets - if WITH_DEBUG -diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am -index 3e5ad03..66d6683 100644 ---- a/src/ceph-detect-init/Makefile.am -+++ b/src/ceph-detect-init/Makefile.am -@@ -64,9 +64,10 @@ install-data-local:: - if test "$(DESTDIR)" ; then \ - if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ -- else \ -- options=--prefix=/usr ; \ - fi ; \ - root="--root=$(DESTDIR)" ; \ - fi ; \ -- python setup.py install $$root $$options -+ if test "$(prefix)"; then \ -+ prefix="--prefix=$(prefix)" ; \ -+ fi ; \ -+ python setup.py install $$prefix $$root $$options diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index 1d554b1faf6..5de5b7e5be5 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "0.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "1j2sr8mhnbyzm168spzr4mk8gkjlfqh993b80sf2zv2sy83p8gfv"; + sha256 = "0p4ibvv0qrflqdc2bi9rjn7yhn01ncxrpqpxmh8cbq67rbvm7jnx"; }; - cargoSha256 = "14pf2xvkk9qqq9qj5agxmfl3npgy6my961yfzv7p977712kdakh3"; + cargoSha256 = "1h9dm2hhld2079dnx4x5nzkn3ivk6g5ijhv49jxnc200mx4mr1s5"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix index 359b450b5fe..f6bc091c14a 100644 --- a/pkgs/tools/misc/docker-ls/default.nix +++ b/pkgs/tools/misc/docker-ls/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "docker-ls-${version}"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mayflower"; repo = "docker-ls"; rev = "v${version}"; - sha256 = "1dhadi1s3nm3r8q5a0m59fy4jdya8p7zvm22ci7ifm3mmw960xly"; + sha256 = "1hb9b0jhaf01zlmkm353mz608kwb79dzic3gvb2fhyrh8d17w2iv"; }; goPackagePath = "github.com/mayflower/docker-ls"; diff --git a/pkgs/tools/misc/ffsend/Cargo.lock.patch b/pkgs/tools/misc/ffsend/Cargo.lock.patch new file mode 100644 index 00000000000..4d95a43cfb0 --- /dev/null +++ b/pkgs/tools/misc/ffsend/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 2344bfd..08413d8 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -614,7 +614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "ffsend" +-version = "0.2.45" ++version = "0.2.46" + dependencies = [ + "chbs 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 9eaba1e8d3f..2eca6de7b61 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -1,34 +1,41 @@ { stdenv, fetchFromGitLab, rustPlatform, cmake, pkgconfig, openssl , darwin -, x11Support ? stdenv.isLinux +, x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD , xclip ? null, xsel ? null , preferXsel ? false # if true and xsel is non-null, use it instead of xclip }: -assert (x11Support && stdenv.isLinux) -> xclip != null || xsel != null; +let + usesX11 = stdenv.isLinux || stdenv.hostPlatform.isBSD; +in + +assert (x11Support && usesX11) -> xclip != null || xsel != null; with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.45"; + version = "0.2.46"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "1rhbpkalbbklbg0bq3xzbqw918ymqjnwhib3agzqd7477hrh1bkr"; + sha256 = "048kmhy8l2dy7v1b3vzlhcw5qhnz82y1wki6wpd2nz8siyd7dnpi"; }; - cargoSha256 = "1218v6rm1j545764g8rkpanwafjzk1c7f5x22v9ivzm0b6lmnm56"; + cargoSha256 = "09i44vpxbww972zyv393xxwk7wz26cnqzq4gi1mg4703h02jkpjk"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) ; - preBuild = stdenv.lib.optionalString (x11Support && stdenv.isLinux) ( + # Patch for v0.2.45 only + patches = [ ./Cargo.lock.patch ]; + + preBuild = stdenv.lib.optionalString (x11Support && usesX11) ( if preferXsel && xsel != null then '' export XSEL_PATH="${xsel}/bin/xsel" '' else '' @@ -54,6 +61,6 @@ buildRustPackage rec { homepage = https://gitlab.com/timvisee/ffsend; license = licenses.gpl3; maintainers = [ maintainers.lilyball ]; - platforms = platforms.darwin ++ platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index 058a8472bf2..7834bc96bef 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "0qcq4c4nysdscbjrikhw653xwbi4dwscynjzyndsp8l21vl81x7p"; + sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0"; }; dontBuild = true; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 359c714228e..be26aee03b9 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; sha256 = if enableUnfree - then "18j2n6gnhfjmb6skhhrzs0d1zwa1aj9jv37rqvg4w3fimnm8p0sh" - else "181x8y6izrh587a6d1qipgj8wk71v4fggypkzjkns4my00nki42y"; + then "178shgxwc9kw9w9vwsvwxp8m8r6lssaw1i32vvmx9na01b4w5m4p" + else "0gyq97qsg7fys9cc5yj4kpcf3xxvdd5qgzal368yg9swps37g5yj"; }; dontBuild = true; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index bb4a6b1436b..aa768e532b8 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; sha256 = if enableUnfree - then "1dzk9amg23vbkj92wx529i1m2rrfjc0gzkbg6w3f6xaix5zch0vp" - else "07q2gbd3xidcklid5ny22zpb3q5v0z3k2kva6g214k7rnkr9bhyy"; + then "0ls7ia4ldyb7kslmjqhszb30bkammdm5nydc5y7r41zl1zjlhfgc" + else "1mpmfnc57vpjk8x3vibamz8lgq163msf20m1bail4hbwhwsmms9i"; }; dontBuild = true; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index bd7b036a65a..9b45680ffca 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.gz"; - sha256 = "08zpjq1g27n6wmmqwxws95w045warhg9bxcv1phvkdcrddf15q3y"; + sha256 = "1pihjwajmahldxi3isnq6wcsbwj0hsnq8z5kp3w4j615ygrn0cgl"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index d7f7c9f1669..ab2edf7be4e 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "0.13.0"; - source.sha256 = "0jyyih8w8b30czfv0dc642vj8yp8iqyci89hjb2279xmmigjzmwc"; + version = "1.1.0"; + source.sha256 = "9f4a4fd0242c82844f9af109d2c03b6870060d7e30603e6d9bd017aee5380ec0"; erubis = buildRubyGem rec { inherit ruby; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index ac8747e60fa..724979439d4 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -42,6 +42,10 @@ buildPythonPackage rec { ++ lib.optional phantomjsSupport phantomjs2; in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; + setupPyBuildFlags = [ + "build_lazy_extractors" + ]; + postInstall = '' mkdir -p $out/share/zsh/site-functions cp youtube-dl.zsh $out/share/zsh/site-functions/_youtube-dl diff --git a/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch b/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch deleted file mode 100644 index 03277838e88..00000000000 --- a/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b34a33255f56bbd2317c26da12d702796d67ed50 Mon Sep 17 00:00:00 2001 -From: Geo Van Osterom -Date: Thu, 22 Oct 2015 00:12:42 -0400 -Subject: [PATCH] Fix gcc 5 compile errors - ---- - src/net.c | 2 +- - src/tclhash.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/net.c b/src/net.c -index a1937de..c369fda 100644 ---- a/src/net.c -+++ b/src/net.c -@@ -560,7 +560,7 @@ int open_address_listen(sockname_t *addr) - /* Returns a socket number for a listening socket that will accept any - * connection -- port # is returned in port - */ --inline int open_listen(int *port) -+extern inline int open_listen(int *port) - { - int sock; - sockname_t name; -diff --git a/src/tclhash.c b/src/tclhash.c -index 9729acb..22c3d05 100644 ---- a/src/tclhash.c -+++ b/src/tclhash.c -@@ -113,7 +113,7 @@ static inline void tcl_bind_list_delete(tcl_bind_list_t *tl) - nfree(tl); - } - --inline void garbage_collect_tclhash(void) -+extern inline void garbage_collect_tclhash(void) - { - tcl_bind_list_t *tl, *tl_next, *tl_prev; - tcl_bind_mask_t *tm, *tm_next, *tm_prev; diff --git a/pkgs/tools/networking/inadyn/remove-unused-macro.patch b/pkgs/tools/networking/inadyn/remove-unused-macro.patch deleted file mode 100644 index 0ee6a5d7757..00000000000 --- a/pkgs/tools/networking/inadyn/remove-unused-macro.patch +++ /dev/null @@ -1,242 +0,0 @@ -From b5c70461822003238784ff56f4c8eead10cfc2c1 Mon Sep 17 00:00:00 2001 -From: Joachim Nilsson -Date: Sun, 2 Jul 2017 21:01:33 +0200 -Subject: [PATCH] Remove UNUSED() macro and disable the compiler warning - instead - -Signed-off-by: Joachim Nilsson - -diff --git a/plugins/common.c b/plugins/common.c -index 55c1ac3..9e7ba7b 100644 ---- a/plugins/common.c -+++ b/plugins/common.c -@@ -64,7 +64,7 @@ int common_request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - * DynDNS response validator -- common to many other DDNS providers as well - * 'good' or 'nochg' are the good answers, - */ --int common_response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+int common_response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *body = trans->rsp_body; - -diff --git a/plugins/ddnss.c b/plugins/ddnss.c -index fea41e9..5184db0 100644 ---- a/plugins/ddnss.c -+++ b/plugins/ddnss.c -@@ -60,7 +60,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - info->user_agent); - } - --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - -diff --git a/plugins/dhis.c b/plugins/dhis.c -index 11edd2c..b6e8e0b 100644 ---- a/plugins/dhis.c -+++ b/plugins/dhis.c -@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - info->user_agent); - } - --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *rsp = trans->rsp_body; - -diff --git a/plugins/dnsexit.c b/plugins/dnsexit.c -index c456f38..4bf0a08 100644 ---- a/plugins/dnsexit.c -+++ b/plugins/dnsexit.c -@@ -62,7 +62,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - info->user_agent); - } - --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - int code = -1; - char *tmp; -diff --git a/plugins/dtdns.c b/plugins/dtdns.c -index e7996fe..38f0977 100644 ---- a/plugins/dtdns.c -+++ b/plugins/dtdns.c -@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - info->user_agent); - } - --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - -diff --git a/plugins/duckdns.c b/plugins/duckdns.c -index 9ca46ae..66d9c25 100755 ---- a/plugins/duckdns.c -+++ b/plugins/duckdns.c -@@ -78,7 +78,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - info->user_agent); - } - --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - -diff --git a/plugins/duiadns.c b/plugins/duiadns.c -index 7c4ced3..7dc09c9 100644 ---- a/plugins/duiadns.c -+++ b/plugins/duiadns.c -@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - info->user_agent); - } - --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - -diff --git a/plugins/dynv6-ipv4.c b/plugins/dynv6-ipv4.c -index 5dab9f1..f37215a 100644 ---- a/plugins/dynv6-ipv4.c -+++ b/plugins/dynv6-ipv4.c -@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - info->user_agent); - } - --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - -diff --git a/plugins/dynv6.c b/plugins/dynv6.c -index 84b7c40..03b1b4c 100644 ---- a/plugins/dynv6.c -+++ b/plugins/dynv6.c -@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - info->user_agent); - } - --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - -diff --git a/plugins/easydns.c b/plugins/easydns.c -index c9d8059..7718c56 100644 ---- a/plugins/easydns.c -+++ b/plugins/easydns.c -@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - /* - * NOERROR is the OK code here - */ --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - -diff --git a/plugins/freedns.c b/plugins/freedns.c -index 2c56ca4..2a2991f 100644 ---- a/plugins/freedns.c -+++ b/plugins/freedns.c -@@ -134,7 +134,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - fail blabla and n.n.n.n - are the good answers. We search our own IP address in response and that's enough. - */ --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - -diff --git a/plugins/generic.c b/plugins/generic.c -index 8f23de4..3cee1f2 100644 ---- a/plugins/generic.c -+++ b/plugins/generic.c -@@ -238,7 +238,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - return ret; - } - --static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - size_t i; -diff --git a/plugins/giradns.c b/plugins/giradns.c -index 2d6043e..ea19f77 100644 ---- a/plugins/giradns.c -+++ b/plugins/giradns.c -@@ -57,7 +57,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - info->server_name.name, info->user_agent); - } - --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - -diff --git a/plugins/sitelutions.c b/plugins/sitelutions.c -index c484a62..611c865 100644 ---- a/plugins/sitelutions.c -+++ b/plugins/sitelutions.c -@@ -64,7 +64,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - info->user_agent); - } - --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - -diff --git a/plugins/tunnelbroker.c b/plugins/tunnelbroker.c -index 1f58990..17eb2b9 100644 ---- a/plugins/tunnelbroker.c -+++ b/plugins/tunnelbroker.c -@@ -77,7 +77,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - * Hurricate Electric IPv6 tunnelbroker specific response validator - * Own IP address and 'already in use' are the good answers. - */ --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *resp = trans->rsp_body; - -diff --git a/plugins/tzo.c b/plugins/tzo.c -index 0a36e87..eba3da4 100644 ---- a/plugins/tzo.c -+++ b/plugins/tzo.c -@@ -66,7 +66,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - } - - /* TZO specific response validator. */ --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - int code = -1; - -diff --git a/plugins/zerigo.c b/plugins/zerigo.c -index 4fb29ab..cc71348 100644 ---- a/plugins/zerigo.c -+++ b/plugins/zerigo.c -@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - * Server error - * Status: 5xx - */ --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - char *ptr, *rsp = trans->rsp_body; - -diff --git a/plugins/zoneedit.c b/plugins/zoneedit.c -index 7178b9c..464ed66 100644 ---- a/plugins/zoneedit.c -+++ b/plugins/zoneedit.c -@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) - * CODE=200, 201 - * CODE=707, for duplicated updates - */ --static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) -+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) - { - int code = -1; - diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix index 91ab22a3c5a..715a480e28d 100644 --- a/pkgs/tools/networking/ubridge/default.nix +++ b/pkgs/tools/networking/ubridge/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ubridge-${version}"; - version = "0.9.14"; + version = "0.9.15"; src = fetchFromGitHub { owner = "GNS3"; repo = "ubridge"; rev = "v${version}"; - sha256 = "1m3j9jfj8fm0532jhaagqgsyr241j6z9wn8lgrl7q3973rhiahfs"; + sha256 = "0fl07zyall04map6v2l1bclqh8y3rrhsx61s2v0sr8b00j201jg4"; }; postPatch = '' diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 1f7f23049d0..f5ddfe9ea58 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "0kh7nqd688ilw73n4pw3s6fahghwbhiql548js6cdwsp4car3vbb"; + sha256 = "0i0hdh8sxqfyhdv4h696cf595bmkg47bww4ixlvy51h6i14v5pn7"; }; buildCommand = '' diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 3144665e4ec..5170805e3f6 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl , libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 -, Carbon +, Carbon, PCSC +, withApplePCSC ? stdenv.isDarwin }: stdenv.mkDerivation rec { @@ -17,9 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoreconfHook zlib readline openssl pcsclite libassuan + autoreconfHook zlib readline openssl libassuan libXt libxslt libiconv docbook_xml_dtd_412 - ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; + ] + ++ stdenv.lib.optional stdenv.isDarwin Carbon + ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -34,9 +37,17 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" - "--with-pcsc-provider=${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so" + "--with-pcsc-provider=${ + if withApplePCSC then + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + else + "${stdenv.lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + }" ]; + PCSC_CFLAGS = stdenv.lib.optionalString withApplePCSC + "-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; + installFlags = [ "sysconfdir=$(out)/etc" "completiondir=$(out)/etc" diff --git a/pkgs/tools/security/qdigidoc/qt511.patch b/pkgs/tools/security/qdigidoc/qt511.patch deleted file mode 100644 index 1300422d353..00000000000 --- a/pkgs/tools/security/qdigidoc/qt511.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/client/Application.cpp b/client/Application.cpp -index fce9eee..cec84ae 100644 ---- a/client/Application.cpp -+++ b/client/Application.cpp -@@ -54,6 +54,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp -index 06d561e..b4aa0d5 100644 ---- a/client/MainWindow.cpp -+++ b/client/MainWindow.cpp -@@ -44,6 +44,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - -diff --git a/client/MainWindow.h b/client/MainWindow.h -index b9515dd..661418a 100644 ---- a/client/MainWindow.h -+++ b/client/MainWindow.h -@@ -24,6 +24,7 @@ - #include - - class DigiDoc; -+class QActionGroup; - class QPrinter; - - class MainWindow: public QWidget, private Ui::MainWindow -diff --git a/crypto/MainWindow.cpp b/crypto/MainWindow.cpp -index c3d3115..f12d984 100644 ---- a/crypto/MainWindow.cpp -+++ b/crypto/MainWindow.cpp -@@ -35,6 +35,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include -diff --git a/crypto/MainWindow.h b/crypto/MainWindow.h -index 16dbec4..01ec99f 100644 ---- a/crypto/MainWindow.h -+++ b/crypto/MainWindow.h -@@ -21,6 +21,7 @@ - - #include "ui_MainWindow.h" - -+class QActionGroup; - class CKey; - class CryptoDoc; - diff --git a/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch b/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch deleted file mode 100644 index f1233a04b7a..00000000000 --- a/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 11f0d238d3149c31c4440b8f6a58fe6a00b82d3a Mon Sep 17 00:00:00 2001 -From: Daniel Aleksandersen -Date: Mon, 13 Mar 2017 16:29:33 +0100 -Subject: [PATCH 1/3] Remove the unnecessary = from ipset cmds - ---- - src/fw/sshg-fw-ipset.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/fw/sshg-fw-ipset.sh b/src/fw/sshg-fw-ipset.sh -index 510bc2c..dc7f86b 100644 ---- a/src/fw/sshg-fw-ipset.sh -+++ b/src/fw/sshg-fw-ipset.sh -@@ -3,8 +3,8 @@ - # This file is part of SSHGuard. - - fw_init() { -- ipset -quiet create -exist sshguard4 hash:ip family=inet -- ipset -quiet create -exist sshguard6 hash:ip family=inet6 -+ ipset -quiet create -exist sshguard4 hash:ip family inet -+ ipset -quiet create -exist sshguard6 hash:ip family inet6 - } - - fw_block() { --- -2.10.0 - diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/tools/security/zmap/default.nix new file mode 100644 index 00000000000..f98b4295e9e --- /dev/null +++ b/pkgs/tools/security/zmap/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libjson, json_c, gengetopt, flex, byacc, gmp +, libpcap +}: + +stdenv.mkDerivation rec { + pname = "zmap"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "zmap"; + repo = pname; + rev = "v${version}"; + sha256 = "0yaahaiawkjk020hvsb8pndbrk8k10wxkfba1irp12a4sj6rywcs"; + }; + + cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ]; + dontUseCmakeBuildDir = true; + + nativeBuildInputs = [ cmake pkgconfig gengetopt flex byacc ]; + buildInputs = [ libjson json_c gmp libpcap ]; + + outputs = [ "out" "man" ]; + + meta = with stdenv.lib; { + homepage = https://zmap.io/; + license = licenses.asl20; + description = "Fast single packet network scanner designed for Internet-wide network surveys"; + maintainers = with maintainers; [ ma27 ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix index 20951fe5240..0f13d2d3da1 100644 --- a/pkgs/tools/system/journalbeat/default.nix +++ b/pkgs/tools/system/journalbeat/default.nix @@ -1,24 +1,9 @@ -{ lib, pkgs, buildGoPackage, fetchFromGitHub, makeWrapper }: - -let - - libPath = lib.makeLibraryPath [ pkgs.systemd.lib ]; - -in buildGoPackage rec { +{ lib, systemd, buildGoPackage, fetchFromGitHub, makeWrapper }: +buildGoPackage rec { name = "journalbeat-${version}"; version = "5.6.8"; - goPackagePath = "github.com/mheese/journalbeat"; - - buildInputs = [ makeWrapper pkgs.systemd ]; - - postInstall = '' - wrapProgram $bin/bin/journalbeat \ - --argv0 journalbeat \ - --prefix LD_LIBRARY_PATH : ${libPath} - ''; - src = fetchFromGitHub { owner = "mheese"; repo = "journalbeat"; @@ -26,6 +11,14 @@ in buildGoPackage rec { sha256 = "1vgpwnwqjc93nvdpcd52748bwl3r371jb55l17bsgdzrmlcyfm8a"; }; + goPackagePath = "github.com/mheese/journalbeat"; + + buildInputs = [ systemd.dev ]; + + postFixup = let libPath = lib.makeLibraryPath [ systemd.lib ]; in '' + patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + ''; + meta = with lib; { homepage = https://github.com/mheese/journalbeat; description = "Journalbeat is a log shipper from systemd/journald to Logstash/Elasticsearch"; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 1a0a9b877bf..69fde7784f5 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -126,8 +126,6 @@ in buildEnv { patchCnfLua "./texmfcnf.lua" mkdir $out/share/texmf-local - - rm updmap.cfg ) '' + # updmap.cfg seems like not needing changes @@ -216,7 +214,7 @@ in buildEnv { texlinks.sh "$out/bin" && wrapBin (perl `type -P fmtutil.pl` --sys --all || true) | grep '^fmtutil' # too verbose #texlinks.sh "$out/bin" && wrapBin # do we need to regenerate format links? - perl `type -P updmap.pl` --sys --syncwithtrees --force + echo y | perl `type -P updmap.pl` --sys --syncwithtrees --force perl `type -P mktexlsr.pl` ./share/texmf-* # to make sure '' + # install (wrappers for) scripts, based on a list from upstream texlive diff --git a/pkgs/tools/typesetting/tex/texlive/texlinks.patch b/pkgs/tools/typesetting/tex/texlive/texlinks.patch deleted file mode 100644 index 613fa819e12..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/texlinks.patch +++ /dev/null @@ -1,15 +0,0 @@ -Don't overwrite already existing files! - -diff --git a/texmf-dist/scripts/texlive/texlinks.sh b/texmf-dist/scripts/texlive/texlinks.sh -index 91540ea..9b1d7ed 100755 ---- a/texmf-dist/scripts/texlive/texlinks.sh -+++ b/texmf-dist/scripts/texlive/texlinks.sh -@@ -157,7 +157,7 @@ install_link() - verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)" - ;; - *) -- test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" && -+ test ! -f "$src" && - rm -f "$src" - - if test -f "$src"; then diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d0e826704ae..a4bea8b8033 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -255,6 +255,7 @@ mapAliases ({ # end ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; procps-ng = procps; # added 2018-06-08 + pstree = psmisc; # added 2019-05-05 pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qt_gstreamer = qt-gstreamer; # added 2017-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85234a8350e..a05aa2a2f86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -976,6 +976,8 @@ in metricbeat5 packetbeat5; + journalbeat5 = callPackage ../tools/system/journalbeat { }; + inherit (callPackages ../misc/logging/beats/6.x.nix { # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. @@ -1002,6 +1004,7 @@ in heartbeat = heartbeat6; metricbeat = metricbeat6; packetbeat = packetbeat6; + journalbeat = journalbeat6; bfr = callPackage ../tools/misc/bfr { }; @@ -1325,6 +1328,8 @@ in csvkit = callPackage ../tools/text/csvkit { }; + csvs-to-sqlite = with python3Packages; toPythonApplication csvs-to-sqlite; + cucumber = callPackage ../development/tools/cucumber {}; daemontools = callPackage ../tools/admin/daemontools { }; @@ -1335,6 +1340,8 @@ in datamash = callPackage ../tools/misc/datamash { }; + datasette = with python3Packages; toPythonApplication datasette; + datefudge = callPackage ../tools/system/datefudge { }; dateutils = callPackage ../tools/misc/dateutils { }; @@ -1739,6 +1746,10 @@ in pyznap = python3Packages.callPackage ../tools/backup/pyznap {}; + procs = callPackage ../tools/admin/procs { + inherit (darwin.apple_sdk.frameworks) Security; + }; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; @@ -2637,9 +2648,9 @@ in evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.6.9"; - elk6Version = "6.7.1"; - elk7Version = "7.0.0"; + elk5Version = "5.6.16"; + elk6Version = "6.7.2"; + elk7Version = "7.0.1"; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; @@ -3008,6 +3019,8 @@ in galen = callPackage ../development/tools/galen {}; + gallery-dl = callPackage ../applications/misc/gallery-dl { }; + gandi-cli = callPackage ../tools/networking/gandi-cli { }; gandom-fonts = callPackage ../data/fonts/gandom-fonts { }; @@ -3777,8 +3790,6 @@ in joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; - journalbeat = callPackage ../tools/system/journalbeat { }; - journaldriver = callPackage ../tools/misc/journaldriver { }; jp = callPackage ../development/tools/jp { }; @@ -4839,6 +4850,10 @@ in ola = callPackage ../applications/misc/ola { }; + olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { + inherit (darwin.apple_sdk.frameworks) CoreFoundation; + }; + omping = callPackage ../applications/networking/omping { }; onioncircuits = callPackage ../tools/security/onioncircuits { }; @@ -4883,7 +4898,7 @@ in openresolv = callPackage ../tools/networking/openresolv { }; opensc = callPackage ../tools/security/opensc { - inherit (darwin.apple_sdk.frameworks) Carbon; + inherit (darwin.apple_sdk.frameworks) Carbon PCSC; }; opensm = callPackage ../tools/networking/opensm { }; @@ -4982,6 +4997,8 @@ in paper-gtk-theme = callPackage ../misc/themes/paper { }; + paperless = callPackage ../applications/office/paperless { }; + paperwork = callPackage ../applications/office/paperwork { }; papertrail = callPackage ../tools/text/papertrail { }; @@ -6828,6 +6845,8 @@ in zxing = callPackage ../tools/graphics/zxing {}; + zmap = callPackage ../tools/security/zmap { }; + ### SHELLS @@ -7086,6 +7105,7 @@ in gcc7Stdenv = overrideCC gccStdenv gcc7; gcc8Stdenv = overrideCC gccStdenv gcc8; + gcc9Stdenv = overrideCC gccStdenv gcc9; wrapCCMulti = cc: if stdenv.targetPlatform.system == "x86_64-linux" then let @@ -7240,6 +7260,17 @@ in isl = if !stdenv.isDarwin then isl_0_17 else null; })); + gcc9 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/9 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + + isl = if !stdenv.isDarwin then isl_0_17 else null; + })); + gcc-snapshot = lowPrio (wrapCC (callPackage ../development/compilers/gcc/snapshot { inherit noSysDirs; @@ -9345,6 +9376,8 @@ in pants = callPackage ../development/tools/build-managers/pants {}; + parinfer-rust = callPackage ../development/tools/parinfer-rust {}; + parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; patchelf = callPackage ../development/tools/misc/patchelf { }; @@ -12276,7 +12309,10 @@ in opencore-amr = callPackage ../development/libraries/opencore-amr { }; - opencsg = callPackage ../development/libraries/opencsg { }; + opencsg = callPackage ../development/libraries/opencsg { + inherit (qt5) qmake; + inherit (darwin.apple_sdk.frameworks) GLUT; + }; openct = callPackage ../development/libraries/openct { }; @@ -15112,6 +15148,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.export_kernel_fpu_functions ]; }; @@ -15119,6 +15156,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.export_kernel_fpu_functions ]; }; @@ -16005,6 +16043,8 @@ in documize-community = callPackage ../servers/documize-community { }; + doge = callPackage ../misc/doge { }; + doulos-sil = callPackage ../data/fonts/doulos-sil { }; cabin = callPackage ../data/fonts/cabin { }; @@ -16321,6 +16361,8 @@ in proggyfonts = callPackage ../data/fonts/proggyfonts { }; + public-sans = callPackage ../data/fonts/public-sans { }; + qogir-theme = callPackage ../data/themes/qogir { }; route159 = callPackage ../data/fonts/route159 { }; @@ -16710,7 +16752,7 @@ in awesome-4-0 = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; - luaPackages = luaPackages.override { inherit lua; }; + inherit (texFunctions) fontsConf; }; awesome = awesome-4-0; @@ -18028,7 +18070,7 @@ in gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = libsForQt56.callPackage ../applications/misc/gpsbabel { + gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { inherit (darwin) IOKit; }; @@ -19459,8 +19501,6 @@ in psol = callPackage ../development/libraries/psol { }; - pstree = callPackage ../applications/misc/pstree { }; - ptask = callPackage ../applications/misc/ptask { }; pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { }; @@ -20030,9 +20070,7 @@ in sublime-merge-dev; inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) - subversion18 subversion19 subversion_1_10 subversion_1_11; - - subversion = subversion_1_11; + subversion19 subversion_1_10 subversion; subversionClient = appendToName "client" (pkgs.subversion.override { bdbSupport = false; @@ -20548,6 +20586,8 @@ in xwayland = null; }; + chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; + weston = callPackage ../applications/window-managers/weston { freerdp = freerdp_legacy; }; @@ -21141,7 +21181,8 @@ in digikam = libsForQt5.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; - inherit (kdeApplications) kcalcore; + inherit (kdeApplications) akonadi-contacts kcalcore; + ffmpeg = ffmpeg_4; opencv3 = opencv3WithoutCuda; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8d3e01c8e9c..f2726810819 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9015,6 +9015,7 @@ let postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile.PL --replace 'if has_module' 'if 0; #' ''; + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { description = "The World-Wide Web library for Perl"; license = with licenses; [ artistic1 gpl1Plus ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d20ac3015d0..4c8026ced43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -130,6 +130,9 @@ in { wrapPython = callPackage ../development/interpreters/python/wrap-python.nix {inherit python; inherit (pkgs) makeSetupHook makeWrapper; }; + # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions + pythonPackages = self; + # specials recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { }; @@ -336,6 +339,8 @@ in { datamodeldict = callPackage ../development/python-modules/datamodeldict { }; + datasette = callPackage ../development/python-modules/datasette { }; + dbf = callPackage ../development/python-modules/dbf { }; dbfread = callPackage ../development/python-modules/dbfread { }; @@ -408,6 +413,8 @@ in { fdint = callPackage ../development/python-modules/fdint { }; + filemagic = callPackage ../development/python-modules/filemagic { }; + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; @@ -466,10 +473,14 @@ in { httpsig = callPackage ../development/python-modules/httpsig { }; + httptools = callPackage ../development/python-modules/httptools { }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; imutils = callPackage ../development/python-modules/imutils { }; + inotify-simple = callPackage ../development/python-modules/inotify-simple { }; + intake = callPackage ../development/python-modules/intake { }; intelhex = callPackage ../development/python-modules/intelhex { }; @@ -482,6 +493,8 @@ in { mpi = pkgs.openmpi; }; + langdetect = callPackage ../development/python-modules/langdetect { }; + libmr = callPackage ../development/python-modules/libmr { }; limitlessled = callPackage ../development/python-modules/limitlessled { }; @@ -578,6 +591,8 @@ in { pdfminer = callPackage ../development/python-modules/pdfminer_six { }; + pdftotext = callPackage ../development/python-modules/pdftotext { }; + pdfx = callPackage ../development/python-modules/pdfx { }; perf = callPackage ../development/python-modules/perf { }; @@ -648,6 +663,8 @@ in { py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; + py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; + pydbus = callPackage ../development/python-modules/pydbus { }; pydocstyle = callPackage ../development/python-modules/pydocstyle { }; @@ -761,6 +778,8 @@ in { pytest-click = callPackage ../development/python-modules/pytest-click { }; + pytest-env = callPackage ../development/python-modules/pytest-env { }; + pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; @@ -771,6 +790,8 @@ in { python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; + python-dotenv = callPackage ../development/python-modules/python-dotenv { }; + python-engineio = callPackage ../development/python-modules/python-engineio { }; python-hosts = callPackage ../development/python-modules/python-hosts { }; @@ -907,6 +928,8 @@ in { unifi = callPackage ../development/python-modules/unifi { }; + uvloop = callPackage ../development/python-modules/uvloop { }; + pyunifi = callPackage ../development/python-modules/pyunifi { }; vidstab = callPackage ../development/python-modules/vidstab { }; @@ -1230,6 +1253,8 @@ in { csscompressor = callPackage ../development/python-modules/csscompressor {}; + csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { }; + cufflinks = callPackage ../development/python-modules/cufflinks { }; cupy = callPackage ../development/python-modules/cupy { @@ -1644,6 +1669,8 @@ in { pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; + pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; + pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; pytest-flakes = callPackage ../development/python-modules/pytest-flakes { }; @@ -2491,6 +2518,8 @@ in { django_pipeline = callPackage ../development/python-modules/django-pipeline { }; + djangoql = callPackage ../development/python-modules/djangoql { }; + dj-database-url = callPackage ../development/python-modules/dj-database-url { }; dj-email-url = callPackage ../development/python-modules/dj-email-url { }; @@ -3068,6 +3097,8 @@ in { lektor = callPackage ../development/python-modules/lektor { }; + leveldb = callPackage ../development/python-modules/leveldb { }; + python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; python_openzwave = callPackage ../development/python-modules/python_openzwave { @@ -4244,6 +4275,8 @@ in { seaborn = callPackage ../development/python-modules/seaborn { }; + seabreeze = callPackage ../development/python-modules/seabreeze { }; + selenium = callPackage ../development/python-modules/selenium { }; serpy = callPackage ../development/python-modules/serpy { }; @@ -4346,6 +4379,8 @@ in { terminado = callPackage ../development/python-modules/terminado { }; + tess = callPackage ../development/python-modules/tess { }; + testresources = callPackage ../development/python-modules/testresources { }; testtools = callPackage ../development/python-modules/testtools { }; @@ -4627,6 +4662,8 @@ in { sandboxlib = callPackage ../development/python-modules/sandboxlib { }; + sanic = callPackage ../development/python-modules/sanic { }; + scales = callPackage ../development/python-modules/scales { }; secp256k1 = callPackage ../development/python-modules/secp256k1 {