diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5d686a109a4..c70cfe007d5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2228,6 +2228,15 @@ email = "tkatchev@gmail.com"; name = "Ivan Tkatchev"; }; + ivanbrennan = { + email = "ivan.brennan@gmail.com"; + github = "ivanbrennan"; + name = "Ivan Brennan"; + keys = [{ + longkeyid = "rsa4096/0x79C3C47DC652EA54"; + fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54"; + }]; + }; ivegotasthma = { email = "ivegotasthma@protonmail.com"; github = "ivegotasthma"; @@ -2505,6 +2514,11 @@ github = "jonringer"; name = "Jonathan Ringer"; }; + jorise = { + email = "info@jorisengbers.nl"; + github = "JorisE"; + name = "Joris Engbers"; + }; jorsn = { name = "Johannes Rosenberger"; email = "johannes@jorsn.eu"; @@ -5531,6 +5545,11 @@ github = "vskilet"; name = "Victor SENE"; }; + vyorkin = { + email = "vasiliy.yorkin@gmail.com"; + github = "vyorkin"; + name = "Vasiliy Yorkin"; + }; vyp = { email = "elisp.vim@gmail.com"; github = "vyp"; @@ -5817,4 +5836,9 @@ github = "turboMaCk"; name = "Marek Fajkus"; }; + melling = { + email = "mattmelling@fastmail.com"; + github = "mattmelling"; + name = "Matt Melling"; + }; } diff --git a/nixos/doc/manual/configuration/matrix.xml b/nixos/doc/manual/configuration/matrix.xml index 4c559a71e81..40dd1406bb6 100644 --- a/nixos/doc/manual/configuration/matrix.xml +++ b/nixos/doc/manual/configuration/matrix.xml @@ -95,7 +95,7 @@ in { # forward all Matrix API calls to the synapse Matrix homeserver locations."/_matrix" = { - proxyPass = "http://[::1]:8008"; + proxyPass = "http://[::1]:8008/_matrix"; }; }; }; diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index e8e8ed8eae2..30570a279ec 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -122,6 +122,19 @@ + + + IPv6 Privacy Extensions are now enabled by default for undeclared + interfaces. The previous behaviour was quite misleading — even though + the default value for + was + true, undeclared interfaces would not prefer temporary + addresses. Now, interfaces not mentioned in the config will prefer + temporary addresses. EUI64 addresses can still be set as preferred by + explicitly setting the option to false for the + interface in question. + + Since Bittorrent Sync was superseded by Resilio Sync in 2016, the diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 006da889671..5e4c14e749f 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -31,9 +31,12 @@ sub new { if (!$startCommand) { # !!! merge with qemu-vm.nix. + my $netArgs = ""; + $netArgs .= ",romfile=$args->{netRomFile}" + if defined $args->{netRomFile}; $startCommand = "qemu-kvm -m 384 " . - "-net nic,model=virtio \$QEMU_OPTS "; + "-device virtio-net-pci,netdev=net0${netArgs} \$QEMU_OPTS "; if (defined $args->{hda}) { if ($args->{hdaInterface} eq "scsi") { diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index eab4e73e19a..4b9086022ed 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -7,16 +7,6 @@ with lib; let cfg = config.networking; - dnsmasqResolve = config.services.dnsmasq.enable && - config.services.dnsmasq.resolveLocalQueries; - hasLocalResolver = config.services.bind.enable || - config.services.unbound.enable || - dnsmasqResolve; - - resolvconfOptions = cfg.resolvconfOptions - ++ optional cfg.dnsSingleRequest "single-request" - ++ optional cfg.dnsExtensionMechanism "edns0"; - localhostMapped4 = cfg.hosts ? "127.0.0.1" && elem "localhost" cfg.hosts."127.0.0.1"; localhostMapped6 = cfg.hosts ? "::1" && elem "localhost" cfg.hosts."::1"; @@ -64,48 +54,6 @@ in ''; }; - networking.dnsSingleRequest = lib.mkOption { - type = types.bool; - default = false; - description = '' - Recent versions of glibc will issue both ipv4 (A) and ipv6 (AAAA) - address queries at the same time, from the same port. Sometimes upstream - routers will systemically drop the ipv4 queries. The symptom of this problem is - that 'getent hosts example.com' only returns ipv6 (or perhaps only ipv4) addresses. The - workaround for this is to specify the option 'single-request' in - /etc/resolv.conf. This option enables that. - ''; - }; - - networking.dnsExtensionMechanism = lib.mkOption { - type = types.bool; - default = true; - description = '' - Enable the edns0 option in resolv.conf. With - that option set, glibc supports use of the extension mechanisms for - DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC, - which does not work without it. - ''; - }; - - networking.extraResolvconfConf = lib.mkOption { - type = types.lines; - default = ""; - example = "libc=NO"; - description = '' - Extra configuration to append to resolvconf.conf. - ''; - }; - - networking.resolvconfOptions = lib.mkOption { - type = types.listOf types.str; - default = []; - example = [ "ndots:1" "rotate" ]; - description = '' - Set the options in /etc/resolv.conf. - ''; - }; - networking.timeServers = mkOption { default = [ "0.nixos.pool.ntp.org" @@ -240,35 +188,6 @@ in # /etc/host.conf: resolver configuration file "host.conf".text = cfg.hostConf; - # /etc/resolvconf.conf: Configuration for openresolv. - "resolvconf.conf".text = - '' - # This is the default, but we must set it here to prevent - # a collision with an apparently unrelated environment - # variable with the same name exported by dhcpcd. - interface_order='lo lo[0-9]*' - '' + optionalString config.services.nscd.enable '' - # Invalidate the nscd cache whenever resolv.conf is - # regenerated. - libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' - '' + optionalString (length resolvconfOptions > 0) '' - # Options as described in resolv.conf(5) - resolv_conf_options='${concatStringsSep " " resolvconfOptions}' - '' + optionalString hasLocalResolver '' - # This hosts runs a full-blown DNS resolver. - name_servers='127.0.0.1' - '' + optionalString dnsmasqResolve '' - dnsmasq_conf=/etc/dnsmasq-conf.conf - dnsmasq_resolv=/etc/dnsmasq-resolv.conf - '' + cfg.extraResolvconfConf + '' - ''; - - } // optionalAttrs config.services.resolved.enable { - # symlink the dynamic stub resolver of resolv.conf as recommended by upstream: - # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf - "resolv.conf".source = "/run/systemd/resolve/stub-resolv.conf"; - } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) { - "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf"; } // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") { # /etc/rpc: RPC program numbers. "rpc".source = pkgs.glibc.out + "/etc/rpc"; @@ -295,29 +214,6 @@ in # Install the proxy environment variables environment.sessionVariables = cfg.proxy.envVars; - # This is needed when /etc/resolv.conf is being overriden by networkd - # and other configurations. If the file is destroyed by an environment - # activation then it must be rebuilt so that applications which interface - # with /etc/resolv.conf directly don't break. - system.activationScripts.resolvconf = stringAfter [ "etc" "specialfs" "var" ] - '' - # Systemd resolved controls its own resolv.conf - rm -f /run/resolvconf/interfaces/systemd - ${optionalString config.services.resolved.enable '' - rm -rf /run/resolvconf/interfaces - mkdir -p /run/resolvconf/interfaces - ln -s /run/systemd/resolve/resolv.conf /run/resolvconf/interfaces/systemd - ''} - - # Make sure resolv.conf is up to date if not managed manually, by systemd or - # by NetworkManager - ${optionalString (!config.environment.etc?"resolv.conf" && - (cfg.networkmanager.enable -> - cfg.networkmanager.rc-manager == "resolvconf")) '' - ${pkgs.openresolv}/bin/resolvconf -u - ''} - ''; - }; } diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix new file mode 100644 index 00000000000..406c6a7ac32 --- /dev/null +++ b/nixos/modules/config/resolvconf.nix @@ -0,0 +1,149 @@ +# /etc files related to networking, such as /etc/services. + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.networking.resolvconf; + + resolvconfOptions = cfg.extraOptions + ++ optional cfg.dnsSingleRequest "single-request" + ++ optional cfg.dnsExtensionMechanism "edns0"; + + configText = + '' + # This is the default, but we must set it here to prevent + # a collision with an apparently unrelated environment + # variable with the same name exported by dhcpcd. + interface_order='lo lo[0-9]*' + '' + optionalString config.services.nscd.enable '' + # Invalidate the nscd cache whenever resolv.conf is + # regenerated. + libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' + '' + optionalString (length resolvconfOptions > 0) '' + # Options as described in resolv.conf(5) + resolv_conf_options='${concatStringsSep " " resolvconfOptions}' + '' + optionalString cfg.useLocalResolver '' + # This hosts runs a full-blown DNS resolver. + name_servers='127.0.0.1' + '' + cfg.extraConfig; + +in + +{ + + options = { + + networking.resolvconf = { + + enable = mkOption { + type = types.bool; + default = false; + internal = true; + description = '' + DNS configuration is managed by resolvconf. + ''; + }; + + useHostResolvConf = mkOption { + type = types.bool; + default = false; + description = '' + In containers, whether to use the + resolv.conf supplied by the host. + ''; + }; + + dnsSingleRequest = lib.mkOption { + type = types.bool; + default = false; + description = '' + Recent versions of glibc will issue both ipv4 (A) and ipv6 (AAAA) + address queries at the same time, from the same port. Sometimes upstream + routers will systemically drop the ipv4 queries. The symptom of this problem is + that 'getent hosts example.com' only returns ipv6 (or perhaps only ipv4) addresses. The + workaround for this is to specify the option 'single-request' in + /etc/resolv.conf. This option enables that. + ''; + }; + + dnsExtensionMechanism = mkOption { + type = types.bool; + default = true; + description = '' + Enable the edns0 option in resolv.conf. With + that option set, glibc supports use of the extension mechanisms for + DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC, + which does not work without it. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = "libc=NO"; + description = '' + Extra configuration to append to resolvconf.conf. + ''; + }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = []; + example = [ "ndots:1" "rotate" ]; + description = '' + Set the options in /etc/resolv.conf. + ''; + }; + + useLocalResolver = mkOption { + type = types.bool; + default = false; + description = '' + Use local DNS server for resolving. + ''; + }; + + }; + + }; + + config = mkMerge [ + { + networking.resolvconf.enable = !(config.environment.etc ? "resolv.conf"); + + environment.etc."resolvconf.conf".text = + if !cfg.enable then + # Force-stop any attempts to use resolvconf + '' + echo "resolvconf is disabled on this system but was used anyway:" >&2 + echo "$0 $*" >&2 + exit 1 + '' + else configText; + } + + (mkIf cfg.enable { + environment.systemPackages = [ pkgs.openresolv ]; + + systemd.services.resolvconf = { + description = "resolvconf update"; + + before = [ "network-pre.target" ]; + wants = [ "network-pre.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."resolvconf.conf".source ]; + + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.openresolv}/bin/resolvconf -u"; + RemainAfterExit = true; + }; + }; + + }) + ]; + +} diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index cdfba5ab9e3..f9b8d95c684 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -84,7 +84,7 @@ with lib; system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" '' #!ipxe - kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams} initrd initrd boot ''; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index db47e69bd4a..d8e8dd37af7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -25,6 +25,7 @@ ./config/nsswitch.nix ./config/power-management.nix ./config/pulseaudio.nix + ./config/resolvconf.nix ./config/shells-environment.nix ./config/swap.nix ./config/sysctl.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index e127782e85f..59542e76890 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -248,6 +248,12 @@ with lib; # KSM (mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ]) + # resolvconf + (mkRenamedOptionModule [ "networking" "dnsSingleRequest" ] [ "networking" "resolvconf" "dnsSingleRequest" ]) + (mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ]) + (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) + (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) + ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter" "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter" "snmpExporter" "unifiExporter" "varnishExporter" ] diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index c2f458c0379..d8e2c715afb 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -237,8 +237,8 @@ in config = mkIf cfg.enable { assertions = [ { - assertion = cfg.rootpwFile != null || cfg.rootpw != null; - message = "Either services.openldap.rootpw or services.openldap.rootpwFile must be set"; + assertion = cfg.configDir != null || cfg.rootpwFile != null || cfg.rootpw != null; + message = "services.openldap: Unless configDir is set, either rootpw or rootpwFile must be set"; } ]; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 5661edbee2d..bc47e7e1e0d 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -12,10 +12,13 @@ let else pkgs.buildEnv { name = "postgresql-and-plugins-${(builtins.parseDrvName pg.name).version}"; paths = [ pg pg.lib ] ++ cfg.extraPlugins; + # We include /bin to ensure the $out/bin directory is created which is + # needed because we'll be removing files from that directory in postBuild + # below. See #22653 + pathsToLink = [ "/" "/bin" ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' - mkdir -p $out/bin rm $out/bin/{pg_config,postgres,pg_ctl} cp --target-directory=$out/bin ${pg}/bin/{postgres,pg_config,pg_ctl} wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix index ccbb6d1434d..d18088d4634 100644 --- a/nixos/modules/services/desktops/tumbler.nix +++ b/nixos/modules/services/desktops/tumbler.nix @@ -23,7 +23,7 @@ in package = mkOption { type = types.package; - default = pkgs.xfce4-13.tumbler; + default = pkgs.xfce4-14.tumbler; description = "Which tumbler package to use"; example = pkgs.xfce4-12.tumbler; }; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 88d7c4e1daf..a3041ae22e7 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -95,7 +95,8 @@ also available in Nixpkgs: Zile, mg, - Yi. + Yi, + jmacs. diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 91ddf2c3edf..24b9e27ac2d 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -1,8 +1,10 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkDefault mkEnableOption mkIf mkOption types; + inherit (lib) concatStringsSep literalExample mapAttrsToList; + inherit (lib) optional optionalAttrs optionalString singleton versionAtLeast; + cfg = config.services.redmine; bundle = "${cfg.package}/share/redmine/bin/bundle"; @@ -11,11 +13,11 @@ let production: adapter: ${cfg.database.type} database: ${cfg.database.name} - host: ${cfg.database.host} + host: ${if (cfg.database.type == "postgresql" && cfg.database.socket != null) then cfg.database.socket else cfg.database.host} port: ${toString cfg.database.port} username: ${cfg.database.user} password: #dbpass# - ${optionalString (cfg.database.socket != null) "socket: ${cfg.database.socket}"} + ${optionalString (cfg.database.type == "mysql2" && cfg.database.socket != null) "socket: ${cfg.database.socket}"} ''; configurationYml = pkgs.writeText "configuration.yml" '' @@ -50,16 +52,15 @@ let ''; }); + mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql2"; + pgsqlLocal = cfg.database.createLocally && cfg.database.type == "postgresql"; + in { options = { services.redmine = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the Redmine service."; - }; + enable = mkEnableOption "Redmine"; # default to the 4.x series not forcing major version upgrade of those on the 3.x series package = mkOption { @@ -107,7 +108,8 @@ in description = '' Extra configuration in configuration.yml. - See https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration + See + for details. ''; example = literalExample '' email_delivery: @@ -124,7 +126,8 @@ in description = '' Extra configuration in additional_environment.rb. - See https://svn.redmine.org/redmine/trunk/config/additional_environment.rb.example + See + for details. ''; example = literalExample '' config.logger.level = Logger::DEBUG @@ -169,13 +172,14 @@ in host = mkOption { type = types.str; - default = (if cfg.database.socket != null then "localhost" else "127.0.0.1"); + default = "localhost"; description = "Database host address."; }; port = mkOption { type = types.int; - default = 3306; + default = if cfg.database.type == "postgresql" then 5432 else 3306; + defaultText = "3306"; description = "Database host port."; }; @@ -213,10 +217,20 @@ in socket = mkOption { type = types.nullOr types.path; - default = null; + default = + if mysqlLocal then "/run/mysqld/mysqld.sock" + else if pgsqlLocal then "/run/postgresql" + else null; + defaultText = "/run/mysqld/mysqld.sock"; example = "/run/mysqld/mysqld.sock"; description = "Path to the unix socket file to use for authentication."; }; + + createLocally = mkOption { + type = types.bool; + default = true; + description = "Create the database and database user locally."; + }; }; }; }; @@ -227,12 +241,37 @@ in { assertion = cfg.database.passwordFile != null || cfg.database.password != "" || cfg.database.socket != null; message = "one of services.redmine.database.socket, services.redmine.database.passwordFile, or services.redmine.database.password must be set"; } - { assertion = cfg.database.socket != null -> (cfg.database.type == "mysql2"); - message = "Socket authentication is only available for the mysql2 database type"; + { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user; + message = "services.redmine.database.user must be set to ${cfg.user} if services.redmine.database.createLocally is set true"; + } + { assertion = cfg.database.createLocally -> cfg.database.socket != null; + message = "services.redmine.database.socket must be set if services.redmine.database.createLocally is set to true"; + } + { assertion = cfg.database.createLocally -> cfg.database.host == "localhost"; + message = "services.redmine.database.host must be set to localhost if services.redmine.database.createLocally is set to true"; } ]; - environment.systemPackages = [ cfg.package ]; + services.mysql = mkIf mysqlLocal { + enable = true; + package = mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { name = cfg.database.user; + ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; + } + ]; + }; + + services.postgresql = mkIf pgsqlLocal { + enable = true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { name = cfg.database.user; + ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + } + ]; + }; # create symlinks for the basic directory layout the redmine package expects systemd.tmpfiles.rules = [ @@ -259,7 +298,7 @@ in ]; systemd.services.redmine = { - after = [ "network.target" (if cfg.database.type == "mysql2" then "mysql.service" else "postgresql.service") ]; + after = [ "network.target" ] ++ optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; wantedBy = [ "multi-user.target" ]; environment.RAILS_ENV = "production"; environment.RAILS_CACHE = "${cfg.stateDir}/cache"; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 5d3f2e6ac28..c2f6b585d49 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -552,6 +552,8 @@ in { description = "Grafana user"; home = cfg.dataDir; createHome = true; + group = "grafana"; }; + users.groups.grafana = {}; }; } diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 7f89cff2232..2097b9a3163 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -168,7 +168,9 @@ in ###### implementation - config = mkIf config.services.bind.enable { + config = mkIf cfg.enable { + + networking.resolvconf.useLocalResolver = mkDefault true; users.users = singleton { name = bindUser; diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 24d16046c63..714a5903bff 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -79,7 +79,7 @@ in ###### implementation - config = mkIf config.services.dnsmasq.enable { + config = mkIf cfg.enable { networking.nameservers = optional cfg.resolveLocalQueries "127.0.0.1"; @@ -92,6 +92,15 @@ in description = "Dnsmasq daemon user"; }; + networking.resolvconf = mkIf cfg.resolveLocalQueries { + useLocalResolver = mkDefault true; + + extraConfig = '' + dnsmasq_conf=/etc/dnsmasq-conf.conf + dnsmasq_resolv=/etc/dnsmasq-resolv.conf + ''; + }; + systemd.services.dnsmasq = { description = "Dnsmasq Daemon"; after = [ "network.target" "systemd-resolved.service" ]; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f1f8c9722e0..ab6065b2008 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -1,6 +1,5 @@ { config, lib, pkgs, ... }: -with pkgs; with lib; let @@ -12,12 +11,13 @@ let # /var/lib/misc is for dnsmasq.leases. stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; - configFile = writeText "NetworkManager.conf" '' + configFile = pkgs.writeText "NetworkManager.conf" '' [main] plugins=keyfile dhcp=${cfg.dhcp} dns=${cfg.dns} - rc-manager=${cfg.rc-manager} + # If resolvconf is disabled that means that resolv.conf is managed by some other module. + rc-manager=${if config.networking.resolvconf.enable then "resolvconf" else "unmanaged"} [keyfile] ${optionalString (cfg.unmanaged != []) @@ -65,19 +65,19 @@ let }); ''; - ns = xs: writeText "nameservers" ( + ns = xs: pkgs.writeText "nameservers" ( concatStrings (map (s: "nameserver ${s}\n") xs) ); - overrideNameserversScript = writeScript "02overridedns" '' + overrideNameserversScript = pkgs.writeScript "02overridedns" '' #!/bin/sh - tmp=`${coreutils}/bin/mktemp` - ${gnused}/bin/sed '/nameserver /d' /etc/resolv.conf > $tmp - ${gnugrep}/bin/grep 'nameserver ' /etc/resolv.conf | \ - ${gnugrep}/bin/grep -vf ${ns (cfg.appendNameservers ++ cfg.insertNameservers)} > $tmp.ns - ${optionalString (cfg.appendNameservers != []) "${coreutils}/bin/cat $tmp $tmp.ns ${ns cfg.appendNameservers} > /etc/resolv.conf"} - ${optionalString (cfg.insertNameservers != []) "${coreutils}/bin/cat $tmp ${ns cfg.insertNameservers} $tmp.ns > /etc/resolv.conf"} - ${coreutils}/bin/rm -f $tmp $tmp.ns + PATH=${with pkgs; makeBinPath [ gnused gnugrep coreutils ]} + tmp=$(mktemp) + sed '/nameserver /d' /etc/resolv.conf > $tmp + grep 'nameserver ' /etc/resolv.conf | \ + grep -vf ${ns (cfg.appendNameservers ++ cfg.insertNameservers)} > $tmp.ns + cat $tmp ${ns cfg.insertNameservers} $tmp.ns ${ns cfg.appendNameservers} > /etc/resolv.conf + rm -f $tmp $tmp.ns ''; dispatcherTypesSubdirMap = { @@ -176,7 +176,8 @@ in { # Ugly hack for using the correct gnome3 packageSet basePackages = mkOption { type = types.attrsOf types.package; - default = { inherit networkmanager modemmanager wpa_supplicant + default = { inherit (pkgs) + networkmanager modemmanager wpa_supplicant networkmanager-openvpn networkmanager-vpnc networkmanager-openconnect networkmanager-fortisslvpn networkmanager-l2tp networkmanager-iodine; }; @@ -268,25 +269,6 @@ in { ''; }; - rc-manager = mkOption { - type = types.enum [ "symlink" "file" "resolvconf" "netconfig" "unmanaged" "none" ]; - default = "resolvconf"; - description = '' - Set the resolv.conf management mode. - - - A description of these modes can be found in the main section of - - https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html - - or in - - NetworkManager.conf - 5 - . - ''; - }; - dispatcherScripts = mkOption { type = types.listOf (types.submodule { options = { @@ -425,13 +407,10 @@ in { { source = "${networkmanager-l2tp}/lib/NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name"; } - { source = "${networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name"; - target = "NetworkManager/VPN/nm-strongswan-service.name"; - } { source = "${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name"; target = "NetworkManager/VPN/nm-iodine-service.name"; } - ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) + ] ++ optional (cfg.appendNameservers != [] || cfg.insertNameservers != []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; } @@ -440,11 +419,15 @@ in { target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; mode = "0544"; }) cfg.dispatcherScripts - ++ optional (dynamicHostsEnabled) + ++ optional dynamicHostsEnabled { target = "NetworkManager/dnsmasq.d/dyndns.conf"; text = concatMapStrings (n: '' hostsdir=/run/NetworkManager/hostsdirs/${n} '') (attrNames cfg.dynamicHosts.hostsDirs); + } + ++ optional cfg.enableStrongSwan + { source = "${pkgs.networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name"; + target = "NetworkManager/VPN/nm-strongswan-service.name"; }; environment.systemPackages = cfg.packages; @@ -512,7 +495,7 @@ in { networking = { useDHCP = false; # use mkDefault to trigger the assertion about the conflict above - wireless.enable = lib.mkDefault false; + wireless.enable = mkDefault false; }; security.polkit.extraConfig = polkitConf; diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index 887772f6e5f..bccab805bee 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -35,6 +35,11 @@ in config = mkIf config.services.rdnssd.enable { + assertions = [{ + assertion = config.networking.resolvconf.enable; + message = "rdnssd needs resolvconf to work (probably something sets up a static resolv.conf)"; + }]; + systemd.services.rdnssd = { description = "RDNSS daemon"; after = [ "network.target" ]; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 1a35979ad44..3cf82e8839b 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -101,6 +101,8 @@ in isSystemUser = true; }; + networking.resolvconf.useLocalResolver = mkDefault true; + systemd.services.unbound = { description = "Unbound recursive Domain Name Server"; after = [ "network.target" ]; diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 5c66cf4a6e6..3ea96f8e464 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -3,6 +3,10 @@ with lib; let cfg = config.services.resolved; + + dnsmasqResolve = config.services.dnsmasq.enable && + config.services.dnsmasq.resolveLocalQueries; + in { @@ -126,6 +130,12 @@ in config = mkIf cfg.enable { + assertions = [ + { assertion = !config.networking.useHostResolvConf; + message = "Using host resolv.conf is not supported with systemd-resolved"; + } + ]; + systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" ]; @@ -135,21 +145,30 @@ in restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ]; }; - environment.etc."systemd/resolved.conf".text = '' - [Resolve] - ${optionalString (config.networking.nameservers != []) - "DNS=${concatStringsSep " " config.networking.nameservers}"} - ${optionalString (cfg.fallbackDns != []) - "FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"} - ${optionalString (cfg.domains != []) - "Domains=${concatStringsSep " " cfg.domains}"} - LLMNR=${cfg.llmnr} - DNSSEC=${cfg.dnssec} - ${config.services.resolved.extraConfig} - ''; + environment.etc = { + "systemd/resolved.conf".text = '' + [Resolve] + ${optionalString (config.networking.nameservers != []) + "DNS=${concatStringsSep " " config.networking.nameservers}"} + ${optionalString (cfg.fallbackDns != []) + "FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"} + ${optionalString (cfg.domains != []) + "Domains=${concatStringsSep " " cfg.domains}"} + LLMNR=${cfg.llmnr} + DNSSEC=${cfg.dnssec} + ${config.services.resolved.extraConfig} + ''; + + # symlink the dynamic stub resolver of resolv.conf as recommended by upstream: + # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf + "resolv.conf".source = "/run/systemd/resolve/stub-resolv.conf"; + } // optionalAttrs dnsmasqResolve { + "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf"; + }; # If networkmanager is enabled, ask it to interface with resolved. networking.networkmanager.dns = "systemd-resolved"; + }; } diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index 55e6b19c67f..6b0b4722730 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -4,19 +4,20 @@ with lib; let + useHostResolvConf = config.networking.resolvconf.enable && config.networking.useHostResolvConf; + bootStage2 = pkgs.substituteAll { src = ./stage-2-init.sh; shellDebug = "${pkgs.bashInteractive}/bin/bash"; shell = "${pkgs.bash}/bin/bash"; isExecutable = true; inherit (config.nix) readOnlyStore; - inherit (config.networking) useHostResolvConf; + inherit useHostResolvConf; inherit (config.system.build) earlyMountScript; - path = lib.makeBinPath [ + path = lib.makeBinPath ([ pkgs.coreutils pkgs.utillinux - pkgs.openresolv - ]; + ] ++ lib.optional useHostResolvConf pkgs.openresolv); fsPackagesPath = lib.makeBinPath config.system.fsPackages; postBootCommands = pkgs.writeText "local-cmds" '' diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 63f974b704f..ee4ae845a7d 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -6,7 +6,7 @@ with import ./systemd-lib.nix { inherit config lib pkgs; }; let checkService = checkUnitConfig "Service" [ (assertValueOneOf "Type" [ - "simple" "forking" "oneshot" "dbus" "notify" "idle" + "exec" "simple" "forking" "oneshot" "dbus" "notify" "idle" ]) (assertValueOneOf "Restart" [ "no" "on-success" "on-failure" "on-abnormal" "on-abort" "always" diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index c12ada7a030..2b8a7944dc3 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -103,7 +103,7 @@ let script = '' - ${optionalString (!config.environment.etc?"resolv.conf") '' + ${optionalString config.networking.resolvconf.enable '' # Set the static DNS configuration, if given. ${pkgs.openresolv}/sbin/resolvconf -m 1 -a static < '-m 768' }); - $machine->start; - $machine->waitForUnit("multi-user.target"); - $machine->succeed("nix verify -r --no-trust /run/current-system"); + perlAttrs = params: "{ ${concatStringsSep "," (mapAttrsToList (name: param: "${name} => '${toString param}'") params)} }"; - # Test whether the channel got installed correctly. - $machine->succeed("nix-instantiate --dry-run '' -A hello"); - $machine->succeed("nix-env --dry-run -iA nixos.procps"); + makeBootTest = name: extraConfig: + let + machineConfig = perlAttrs ({ qemuFlags = "-m 768"; } // extraConfig); + in + makeTest { + inherit iso; + name = "boot-" + name; + nodes = { }; + testScript = + '' + my $machine = createMachine(${machineConfig}); + $machine->start; + $machine->waitForUnit("multi-user.target"); + $machine->succeed("nix verify -r --no-trust /run/current-system"); - $machine->shutdown; - ''; - }; -in { + # Test whether the channel got installed correctly. + $machine->succeed("nix-instantiate --dry-run '' -A hello"); + $machine->succeed("nix-env --dry-run -iA nixos.procps"); - biosCdrom = makeBootTest "bios-cdrom" '' - cdrom => glob("${iso}/iso/*.iso") - ''; + $machine->shutdown; + ''; + }; - biosUsb = makeBootTest "bios-usb" '' - usb => glob("${iso}/iso/*.iso") - ''; - - uefiCdrom = makeBootTest "uefi-cdrom" '' - cdrom => glob("${iso}/iso/*.iso"), - bios => '${pkgs.OVMF.fd}/FV/OVMF.fd' - ''; - - uefiUsb = makeBootTest "uefi-usb" '' - usb => glob("${iso}/iso/*.iso"), - bios => '${pkgs.OVMF.fd}/FV/OVMF.fd' - ''; - - netboot = let + makeNetbootTest = name: extraConfig: + let config = (import ../lib/eval-config.nix { inherit system; modules = @@ -65,35 +52,54 @@ in { { key = "serial"; } ]; }).config; - ipxeScriptDir = pkgs.writeTextFile { - name = "ipxeScriptDir"; - text = '' - #!ipxe - dhcp - kernel bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} console=ttyS0 - initrd initrd - boot - ''; - destination = "/boot.ipxe"; - }; ipxeBootDir = pkgs.symlinkJoin { name = "ipxeBootDir"; paths = [ config.system.build.netbootRamdisk config.system.build.kernel - ipxeScriptDir + config.system.build.netbootIpxeScript ]; }; + machineConfig = perlAttrs ({ + qemuFlags = "-boot order=n -netdev user,id=net0,tftp=${ipxeBootDir}/,bootfile=netboot.ipxe -m 2000"; + } // extraConfig); in makeTest { - name = "boot-netboot"; + name = "boot-netboot-" + name; nodes = { }; testScript = '' - my $machine = createMachine({ qemuFlags => '-boot order=n -net nic,model=e1000 -net user,tftp=${ipxeBootDir}/,bootfile=boot.ipxe -m 2000M' }); + my $machine = createMachine(${machineConfig}); $machine->start; $machine->waitForUnit("multi-user.target"); $machine->shutdown; ''; }; +in { + + biosCdrom = makeBootTest "bios-cdrom" { + cdrom = ''glob("${iso}/iso/*.iso")''; + }; + + biosUsb = makeBootTest "bios-usb" { + usb = ''glob("${iso}/iso/*.iso")''; + }; + + uefiCdrom = makeBootTest "uefi-cdrom" { + cdrom = ''glob("${iso}/iso/*.iso"''; + bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"''; + }; + + uefiUsb = makeBootTest "uefi-usb" { + usb = ''glob("${iso}/iso/*.iso")''; + bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"''; + }; + + biosNetboot = makeNetbootTest "bios" {}; + + uefiNetboot = makeNetbootTest "uefi" { + bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"''; + # Custom ROM is needed for EFI PXE boot. I failed to understand exactly why, because QEMU should still use iPXE for EFI. + netRomFile = ''"${pkgs.ipxe}/ipxe.efirom"''; + }; } diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix index 9dc765a879b..7a1b4c8ffbb 100644 --- a/nixos/tests/grafana.nix +++ b/nixos/tests/grafana.nix @@ -1,25 +1,91 @@ -import ./make-test.nix ({ lib, ... }: -{ - name = "grafana"; +import ./make-test.nix ({ lib, pkgs, ... }: - meta = with lib.maintainers; { - maintainers = [ willibutz ]; - }; +let + inherit (lib) mkMerge nameValuePair maintainers; - machine = { ... }: { + baseGrafanaConf = { services.grafana = { enable = true; addr = "localhost"; analytics.reporting.enable = false; domain = "localhost"; - security.adminUser = "testusername"; + security = { + adminUser = "testadmin"; + adminPassword = "snakeoilpwd"; + }; }; }; + extraNodeConfs = { + postgresql = { + services.grafana.database = { + host = "127.0.0.1:5432"; + user = "grafana"; + }; + services.postgresql = { + enable = true; + ensureDatabases = [ "grafana" ]; + ensureUsers = [{ + name = "grafana"; + ensurePermissions."DATABASE grafana" = "ALL PRIVILEGES"; + }]; + }; + systemd.services.grafana.after = [ "postgresql.service" ]; + }; + + mysql = { + services.grafana.database.user = "grafana"; + services.mysql = { + enable = true; + ensureDatabases = [ "grafana" ]; + ensureUsers = [{ + name = "grafana"; + ensurePermissions."grafana.*" = "ALL PRIVILEGES"; + }]; + package = pkgs.mariadb; + }; + systemd.services.grafana.after = [ "mysql.service" ]; + }; + }; + + nodes = builtins.listToAttrs (map (dbName: + nameValuePair dbName (mkMerge [ + baseGrafanaConf + (extraNodeConfs.${dbName} or {}) + ])) [ "sqlite" "postgresql" "mysql" ]); + +in { + name = "grafana"; + + meta = with maintainers; { + maintainers = [ willibutz ]; + }; + + inherit nodes; + testScript = '' - $machine->start; - $machine->waitForUnit("grafana.service"); - $machine->waitForOpenPort(3000); - $machine->succeed("curl -sSfL http://127.0.0.1:3000/"); + startAll(); + + subtest "Grafana sqlite", sub { + $sqlite->waitForUnit("grafana.service"); + $sqlite->waitForOpenPort(3000); + $sqlite->succeed("curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost"); + }; + + subtest "Grafana postgresql", sub { + $postgresql->waitForUnit("grafana.service"); + $postgresql->waitForUnit("postgresql.service"); + $postgresql->waitForOpenPort(3000); + $postgresql->waitForOpenPort(5432); + $postgresql->succeed("curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost"); + }; + + subtest "Grafana mysql", sub { + $mysql->waitForUnit("grafana.service"); + $mysql->waitForUnit("mysql.service"); + $mysql->waitForOpenPort(3000); + $mysql->waitForOpenPort(3306); + $mysql->succeed("curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost"); + }; ''; }) diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix index 14f24c29cfe..d11eba764da 100644 --- a/nixos/tests/ipv6.nix +++ b/nixos/tests/ipv6.nix @@ -1,14 +1,16 @@ # Test of IPv6 functionality in NixOS, including whether router # solicication/advertisement using radvd works. -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test.nix ({ pkgs, lib, ...} : { name = "ipv6"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eelco ]; }; nodes = - { client = { ... }: { }; + # Remove the interface configuration provided by makeTest so that the + # interfaces are all configured implicitly + { client = { ... }: { networking.interfaces = lib.mkForce {}; }; server = { ... }: @@ -73,6 +75,11 @@ import ./make-test.nix ({ pkgs, ...} : { $client->succeed("curl --fail -g http://[$serverIp]"); $client->fail("curl --fail -g http://[$clientIp]"); }; + subtest "privacy extensions", sub { + my $ip = waitForAddress $client, "eth1", "global temporary"; + # Default route should have "src " in it + $client->succeed("ip r g ::2 | grep $ip"); + }; # TODO: test reachability of a machine on another network. ''; diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index ed9f287d558..949d946bdc4 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -510,7 +510,7 @@ let ''; }; }; - nodes.client = { pkgs, ... }: with pkgs.lib; { + nodes.clientWithPrivacy = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -522,21 +522,39 @@ let }; }; }; + nodes.client = { pkgs, ... }: with pkgs.lib; { + virtualisation.vlans = [ 1 ]; + networking = { + useNetworkd = networkd; + useDHCP = true; + interfaces.eth1 = { + preferTempAddress = false; + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; + }; + }; + }; testScript = { ... }: '' startAll; $client->waitForUnit("network.target"); + $clientWithPrivacy->waitForUnit("network.target"); $router->waitForUnit("network-online.target"); # Wait until we have an ip address + $clientWithPrivacy->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'"); $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'"); # Test vlan 1 + $clientWithPrivacy->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1"); $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1"); # Test address used is temporary - $client->waitUntilSucceeds("! ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'"); + $clientWithPrivacy->waitUntilSucceeds("! ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'"); + + # Test address used is EUI-64 + $client->waitUntilSucceeds("ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'"); ''; }; routes = { diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index cbdb5c8d295..2d4df288b05 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -10,19 +10,9 @@ let mysqlTest = package: makeTest { machine = { config, pkgs, ... }: - { services.mysql.enable = true; - services.mysql.package = pkgs.mariadb; - services.mysql.ensureDatabases = [ "redmine" ]; - services.mysql.ensureUsers = [ - { name = "redmine"; - ensurePermissions = { "redmine.*" = "ALL PRIVILEGES"; }; - } - ]; - - services.redmine.enable = true; + { services.redmine.enable = true; services.redmine.package = package; services.redmine.database.type = "mysql2"; - services.redmine.database.socket = "/run/mysqld/mysqld.sock"; services.redmine.plugins = { redmine_env_auth = pkgs.fetchurl { url = https://github.com/Intera/redmine_env_auth/archive/0.7.zip; @@ -48,19 +38,9 @@ let pgsqlTest = package: makeTest { machine = { config, pkgs, ... }: - { services.postgresql.enable = true; - services.postgresql.ensureDatabases = [ "redmine" ]; - services.postgresql.ensureUsers = [ - { name = "redmine"; - ensurePermissions = { "DATABASE redmine" = "ALL PRIVILEGES"; }; - } - ]; - - services.redmine.enable = true; + { services.redmine.enable = true; services.redmine.package = package; services.redmine.database.type = "postgresql"; - services.redmine.database.host = ""; - services.redmine.database.port = 5432; services.redmine.plugins = { redmine_env_auth = pkgs.fetchurl { url = https://github.com/Intera/redmine_env_auth/archive/0.7.zip; diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 9a4aa2e0a28..f351c9fa504 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -2,6 +2,7 @@ , cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium, hidapi +, python3Packages , CoreData, IOKit, PCSC }: @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline libsodium hidapi + python3Packages.protobuf ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 53949da43e0..e5354b06094 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.16"; + version = "0.9.17"; name = "drumgizmo-${version}"; src = fetchurl { url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; - sha256 = "0ivr61n9gpigsfgn20rh3n09li8sxh1q095r6wiw0shqhn3vaxlg"; + sha256 = "177c27kz9srds7a659zz9yhp58z0zsk0ydwww7l3jkjlylm1p8x1"; }; configureFlags = [ "--enable-lv2" ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 9a406a994cc..464552584a4 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.1.3.1"; + version = "1.1.4.2"; format = "other"; doCheck = false; @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "1mini63ngmi62g3xq0bvq316k2vv3ck7q5qn3mfqph38na605waj"; + sha256 = "0rn3q7xslqq5hw4wb739ywg5dr99xpkbmyw80y84rsg0wfrwbjlc"; }; nativeBuildInputs = [ @@ -78,6 +78,15 @@ python3.pkgs.buildPythonApplication rec { patchPythonScript "$out/libexec/lollypop-sp" ''; + # Produce only one wrapper using wrap-python passing + # gappsWrapperArgs to wrap-python additional wrapper + # argument + dontWrapGApps = true; + + makeWrapperArgs = [ + "\${gappsWrapperArgs[@]}" + ]; + meta = with lib; { description = "A modern music player for GNOME"; homepage = https://wiki.gnome.org/Apps/Lollypop; diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index c00a79cb98b..1eb8b416a9a 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "parlatype"; - version = "1.6-beta"; + version = "1.6.1"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "0bi0djic9kf178s7vl3y83v4rzhvynlvyf64n94fy80n2f100dj9"; + sha256 = "0b811lwiylrjirx88gi9az1b1b71j2i5a4a6g56wp9qxln6lzjj2"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index b146513d735..82e003b2bea 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.5.6"; + version = "0.5.7"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "0h4hhja8qbyzd6v24flw9wr4mwl03nplryx1gyrppn7sg13l1sx6"; + sha256 = "18im4w8agj60nkppwbkxqnhpp13z5li3w30kklv4lgs20rvgbvl6"; }; nativeBuildInputs = [ autoconf pkgconfig ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index b8e3de792c4..eb6bbabdea4 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.3"; /* updated by script */ + version = "2019.1.4"; /* 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 = "0syp0y4j40j72gql67g6r02n6kndsrz4nmh55ac5g9xs7s4rd5vq"; /* updated by script */ + sha256 = "0zjcn71fgngkvsixgimzm5afwjbd8zf14zzm6barap4pwp5xx0hb"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.1.2"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1mc7xma1ybp0h1654p10vgp84fnsgvwsvprm86pnmfgks8307860"; /* updated by script */ + sha256 = "04nrdgnyxywy0yfari26ghc371yni1rx3h0pmc4fw02ibbqx1f1y"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* 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 = "0441y92b3xqf7xh8k4vc0m7dfm91psnrwlv3mjzbsv09jrk1kbq7"; /* updated by script */ + sha256 = "0b0p18pcq4ml8nds4460a1ml8qjsq38kxwdrsh2ca5s194cbaapq"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 0252c06b943..43ff16deb2d 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1sjk8n0y9039xs47zw9a4l4vd36vkm30gf6x3fzaib81hnh1fx7v"; + sha256 = "10r6d695avxj31yghb82ymgnd7f1dawwbqz3gfy0rycjza9dxvv8"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index b7cf84ff959..360d94d1b82 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw +{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS +, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS, proj-datumgrid }: -stdenv.mkDerivation { - name = "grass-7.2.2"; - src = fetchurl { - url = https://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz; - sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv"; +stdenv.mkDerivation rec { + name = "grass"; + version = "7.6.1"; + + src = with stdenv.lib; fetchFromGitHub { + owner = "OSGeo"; + repo = "grass"; + rev = "${name}_${replaceStrings ["."] ["_"] version}"; + sha256 = "1amjk9rz7vw5ha7nyl5j2bfwj5if9w62nlwx5qbp1x7spldimlll"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo + buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas - libLAS ] + libLAS proj-datumgrid ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); # On Darwin the installer tries to symlink the help files into a system @@ -22,6 +26,8 @@ stdenv.mkDerivation { configureFlags = [ "--with-proj-share=${proj}/share/proj" + "--with-proj-includes=${proj.dev}/include" + "--with-proj-lib=${proj}/lib" "--without-opengl" "--with-readline" "--with-wxwidgets" @@ -49,9 +55,11 @@ stdenv.mkDerivation { scripts/d.what.vect/d.what.vect.py \ scripts/g.extension/g.extension.py \ scripts/g.extension.all/g.extension.all.py \ + scripts/r.drain/r.drain.py \ scripts/r.pack/r.pack.py \ scripts/r.tileset/r.tileset.py \ scripts/r.unpack/r.unpack.py \ + scripts/v.clip/v.clip.py \ scripts/v.rast.stats/v.rast.stats.py \ scripts/v.to.lines/v.to.lines.py \ scripts/v.what.strds/v.what.strds.py \ @@ -72,13 +80,15 @@ stdenv.mkDerivation { done ''; + NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" ]; + postInstall = '' - wrapProgram $out/bin/grass72 \ + wrapProgram $out/bin/grass76 \ --set PYTHONPATH $PYTHONPATH \ --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' - ln -s $out/grass-*/lib $out/lib - ln -s $out/grass-*/include $out/include + ln -s $out/grass*/lib $out/lib + ln -s $out/grass*/include $out/include ''; enableParallelBuilding = true; diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 063e997fec1..38aeee6d13e 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -20,9 +20,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ - # Required by the build to be specified - "-DPROJ4_ROOT=${proj}" - # Building the manual and bundling licenses fails "-DLICENSING_PROVIDER:BOOL=OFF" "-DMapper_MANUAL_QTHELP:BOOL=OFF" @@ -43,6 +40,8 @@ stdenv.mkDerivation rec { "-DMapper_PACKAGE_GDAL=0" ]); + # Needs to be available when proj_api.h gets evaluted by CPP + NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 6e7fb375eab..a57b180d5b2 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +{ stdenv, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql -, txt2tags, openssl, libzip, hdf5, netcdf +, txt2tags, openssl, libzip, hdf5, netcdf, exiv2 , qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns , withGrass ? true, grass }: @@ -10,12 +10,15 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in stdenv.mkDerivation rec { - version = "3.4.8"; - name = "qgis-unwrapped-${version}"; + version = "3.8.0"; + pname = "qgis"; + name = "${pname}-unwrapped-${version}"; - src = fetchurl { - url = "http://qgis.org/downloads/qgis-${version}.tar.bz2"; - sha256 = "13dy9y7ipv25x3k31njhjljdav36xay6s82g6ywaqf1xxh3s567w"; + src = fetchFromGitHub { + owner = "qgis"; + repo = "QGIS"; + rev = "final-${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "11jqj6lavpw9piv0rm8vvbgd99zhcxl6yfjg699wlrjlyf71xac5"; }; passthru = { @@ -23,7 +26,7 @@ in stdenv.mkDerivation rec { inherit python3Packages; }; - buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt + buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2 fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++ (stdenv.lib.optional withGrass grass) ++ pythonBuildInputs; @@ -36,7 +39,7 @@ in stdenv.mkDerivation rec { # build to use PYQT5_SIP_DIR consistently. postPatch = '' substituteInPlace cmake/FindPyQt5.py \ - --replace 'pyqtcfg.pyqt_sip_dir' '"${python3Packages.pyqt5}/share/sip/PyQt5"' + --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${python3Packages.pyqt5}/share/sip/PyQt5"' ''; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 34bb8c9f55a..7440e2633a3 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -3,7 +3,9 @@ unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: stdenv.mkDerivation rec { - name = "saga-7.2.0"; + pname = "saga"; + version = "7.3.0"; + name = "${pname}-${version}"; # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin @@ -17,8 +19,8 @@ stdenv.mkDerivation rec { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; src = fetchurl { - url = "mirror://sourceforge/project/saga-gis/SAGA%20-%207/SAGA%20-%207.2.0/saga-7.2.0.tar.gz"; - sha256 = "10gjc5mc5kwg2c2la22hgwx6s5q60z9xxffjpjw0zrlhksijl5an"; + url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.3.0/saga-7.3.0.tar.gz"; + sha256 = "1g7v6vx7b8mfhbbg03pdk4kyks20maqbcdbasnxazhs8pl2zih7k"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/gis/saga/lts.nix b/pkgs/applications/gis/saga/lts.nix deleted file mode 100644 index ca0034aa970..00000000000 --- a/pkgs/applications/gis/saga/lts.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchgit, gdal, wxGTK30, proj, libiodbc, lzma, jasper, - libharu, opencv, vigra, postgresql, autoreconfHook, Cocoa - , unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: - -stdenv.mkDerivation rec { - name = "saga-2.3.2"; - - # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs - # for why the have additional buildInputs on darwin - buildInputs = [ autoreconfHook gdal wxGTK30 proj libharu opencv vigra - postgresql libiodbc lzma jasper - unixODBC poppler hdf4.out hdf5 netcdf sqlite qhull giflib ] - ++ stdenv.lib.optional stdenv.isDarwin Cocoa ; - - enableParallelBuilding = true; - - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; - - sourceRoot = "code-b6f474f/saga-gis"; - - patches = [ ./clang_patch.patch ./finite.patch]; - - src = fetchgit { - url = "https://git.code.sf.net/p/saga-gis/code.git"; - rev = "b6f474f8af4af7f0ff82548cc6f88c53547d91f5"; - sha256 = "0iakynai8mhcwj6wxvafkqhd7b417ss7hyhbcp9wf6092l6vc2zd"; - }; - - meta = with stdenv.lib; { - description = "System for Automated Geoscientific Analyses"; - homepage = http://www.saga-gis.org; - license = licenses.gpl2Plus; - maintainers = [ maintainers.mpickering ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index f61215f83e2..2bd2207a97a 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-46"; - sha256 = "1si3rv3b9jgjkwyny5ja76s8c0z9vyic28fm63j1jrqdd2jyq3pk"; + version = "7.0.8-53"; + sha256 = "0cgfsng2d14891fqwf7mlclsi576c42v0h5r6i4208bakcr25vzk"; patches = []; }; in diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 6fdc4f741ac..09dc9e7656d 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "3.1.3"; + version = "3.2"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1vsnxf4as3vyzjfhd8frzb1a8i7wnq7ck5ljx7qxqrnfqvxl1s4z"; + sha256 = "004vapxpl001yanqvw3cq37fmkdr527jyz0s5nybz1mnl4926660"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index f2e8eee9940..837446190fb 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "0nk72h7q1n664b268zkhibb7a3i7fb3nl2z7fg31ys5r9zlq6mnp"; + sha256 = "17diyfk586hll54cl476kbhbcm3nihw6cb4bgjkjxxzxbd3wx839"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index df321023c74..af0063301f1 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tesseract-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "1b5fi2vibc4kk9b30kkk4ais4bw8fbbv24bzr5709194hb81cav8"; + sha256 = "06i7abxy2ifmdx1fak81cx0kns85n8hvp0339jk6242fhshibljx"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index c05b98a0728..b022f523007 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.44.0"; + version = "3.45.2"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "13d3cbn8qbjd8a19qprra6gmib1d818c3zgf3q70kx6b2fq58lzi"; + sha256 = "1379g375s3h0fgv9qg43hrg16knd76ym7qkffpn1qyc7kkhv8a05"; }; patches = [ diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index b973c73c0dd..c29d8684c90 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cointop"; - version = "1.2.0"; + version = "1.3.4"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; rev = version; - sha256 = "1vhsbk55rrsmnh9b3cxjiv1pzdiip54cyj31j4aj33vlr4hkampn"; + sha256 = "0nw6vzp0c5r8bwnlvgzj4hzdah44p5pp03d2bcr1lkw8np8fy65n"; }; - modSha256 = "0vvypp97b3bjwxb96hajpjzr52sb5lc4r3zdkrdgg3vjwwacjwsn"; + modSha256 = "1fg5h689s6r79qa9qsmd8hcvyihfyzlvqrhhk0qyfl528ipi1zwg"; meta = with lib; { description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index e6b62817b90..26a297481d0 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: +{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? [ ./xim.patch ] }: stdenv.mkDerivation rec { name = "dmenu-4.9"; diff --git a/pkgs/applications/misc/dmenu/xim.patch b/pkgs/applications/misc/dmenu/xim.patch new file mode 100644 index 00000000000..f77d48324da --- /dev/null +++ b/pkgs/applications/misc/dmenu/xim.patch @@ -0,0 +1,31 @@ +Revert https://git.suckless.org/dmenu/commit/377bd37e212b1ec4c03a481245603c6560d0be22.html + +Upstream has reverted it after v4.9 in https://git.suckless.org/dmenu/commit/db6093f6ec1bb884f7540f2512935b5254750b30.html +--- a/dmenu.c ++++ b/dmenu.c +@@ -552,7 +552,7 @@ run(void) + XEvent ev; + + while (!XNextEvent(dpy, &ev)) { +- if (XFilterEvent(&ev, None)) ++ if (XFilterEvent(&ev, win)) + continue; + switch(ev.type) { + case Expose: +@@ -664,7 +664,6 @@ setup(void) + XNClientWindow, win, XNFocusWindow, win, NULL); + + XMapRaised(dpy, win); +- XSetInputFocus(dpy, win, RevertToParent, CurrentTime); + if (embed) { + XSelectInput(dpy, parentwin, FocusChangeMask); + if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { +@@ -730,8 +729,6 @@ main(int argc, char *argv[]) + + if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + fputs("warning: no locale support\n", stderr); +- if (!XSetLocaleModifiers("")) +- fputs("warning: no locale modifiers support\n", stderr); + if (!(dpy = XOpenDisplay(NULL))) + die("cannot open display"); + screen = DefaultScreen(dpy); diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 6ba0bed7847..64c693092b0 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jgmenu"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "01r92nili4v4pdmw4g5z0rsg1q7m7q3a5hjc47mnchgibdiissvl"; + sha256 = "03lk89d6wvqv234qciksd4zm0z4lkvrxfh6r9ff0d8yzg67m7rd0"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 4f7acb7731a..8838de9ac96 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "15155"; + version = "15238"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0qws5bgv7mm1iynsdrn7cdi16rd8k4139iia3bnjpm04xn69i5im"; + sha256 = "0zh84glb4545av0s1qnccqqp8nrnfsr7rnwgbqpwwzvc2ngk91gv"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 61eb959a1dd..4fb2227ee20 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -17,13 +17,13 @@ let }; in with python.pkgs; buildPythonApplication rec { - version = "0.13.0"; + version = "0.14.0"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "06b9xcdg1na6mxa2pnlh0wfsk02k2h6hlki089aaikbg8k8ykj8f"; + sha256 = "0m1pc67jz663yfc0xzfpknymn8jj2bpfxaph3pl0mjd3h1zjfyaq"; }; # setup.py reads the UTF-8 encoded readme. diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index c112cf0c928..0b802bedf8d 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { name = "memo-${version}"; - version = "0.6"; + version = "0.8"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "memo"; rev = "${version}"; - sha256 = "1cvjs36f6vxzfz5d63yhyw8j7gdw5hn6cfzccf7ag08lamjhfhbr"; + sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp"; }; installPhase = let diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 0833464f2c2..dec55e9c1e5 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + postInstall = '' wrapProgram $out/bin/merkaartor \ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 5787adef2a3..9d0fb3fdeb7 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "INSTALL_SHAREDIR=$(out)/share/" ]; + NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + installFlags = [ "DESTDIR=$(out)" ]; buildInputs = [ libroxml proj libyamlcpp boost ]; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index cdeca96568d..7c560cacda1 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,38 +1,45 @@ -{ stdenv, fetchFromGitHub, perl, python, sqlite, gpsbabel -, withWebKit ? false }: +{ stdenv +, fetchFromGitHub +, perl +, python3 +, sqlite +, gpsbabel +, gnome3 +, gobject-introspection +, wrapGAppsHook +, gtk3 +, xvfb_run +, webkitgtk +, glib-networking +, glibcLocales +, tzdata +, substituteAll +}: let - - # Pytrainer needs a matplotlib with GTK backend. Also ensure we are - # using the pygtk with glade support as needed by pytrainer. - matplotlibGtk = python.pkgs.matplotlib.override { - enableGtk2 = true; - pygtk = python.pkgs.pyGtkGlade; + # Pytrainer needs a matplotlib with GTK backend. + matplotlibGtk = python3.pkgs.matplotlib.override { + enableGtk3 = true; }; in -python.pkgs.buildPythonApplication rec { - name = "pytrainer-${version}"; - version = "1.12.1"; +python3.pkgs.buildPythonApplication rec { + pname = "pytrainer"; + version = "2.0.0"; src = fetchFromGitHub { owner = "pytrainer"; repo = "pytrainer"; rev = "v${version}"; - sha256 = "0rzf8kks96qzlknh6g3b9pjq04j7qk6rmz58scp7sck8xz9rjbwx"; + sha256 = "1w5z1xwb2g6j2izm89b7lv9n92r1zhsr8bglxcn7jc5gwbvwysvd"; }; - namePrefix = ""; - patches = [ - # The test fails in the UTC timezone and C locale. - ./fix-test-tz.patch - - # The existing use of pywebkitgtk shows raw HTML text instead of - # map. This patch solves the problems by showing the file from a - # string, which allows setting an explicit MIME type. - ./pytrainer-webkit.patch + (substituteAll { + src = ./fix-paths.patch; + perl = "${perl}/bin/perl"; + }) ]; postPatch = '' @@ -40,18 +47,40 @@ python.pkgs.buildPythonApplication rec { --replace "'mysqlclient'," "" ''; - propagatedBuildInputs = with python.pkgs; [ - dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy sqlalchemy_migrate psycopg2 - ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ]; + propagatedBuildInputs = with python3.pkgs; [ + dateutil + lxml + matplotlibGtk + pygobject3 + sqlalchemy + sqlalchemy_migrate + psycopg2 + requests + certifi + ]; - buildInputs = [ perl gpsbabel sqlite ]; + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + xvfb_run + ]; - # This package contains no binaries to patch or strip. - dontPatchELF = true; - dontStrip = true; + buildInputs = [ + gpsbabel + sqlite + gtk3 + webkitgtk + glib-networking + glibcLocales + gnome3.adwaita-icon-theme + ]; checkPhase = '' - ${python.interpreter} -m unittest discover + env HOME=$TEMPDIR TZDIR=${tzdata}/share/zoneinfo \ + TZ=Europe/Kaliningrad \ + LC_ALL=en_US.UTF-8 \ + xvfb-run -s '-screen 0 800x600x24' \ + ${python3.interpreter} setup.py test ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/pytrainer/fix-paths.patch b/pkgs/applications/misc/pytrainer/fix-paths.patch new file mode 100644 index 00000000000..7781f5aa4be --- /dev/null +++ b/pkgs/applications/misc/pytrainer/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/imports/file_garminfit.py ++++ b/imports/file_garminfit.py +@@ -81,7 +81,7 @@ + logging.debug(">>") + result = False + try: +- result = subprocess.check_output(["perl", ++ result = subprocess.check_output(["@perl@", + self.main_data_path+"plugins/garmin-fit/bin/fit2tcx", + filename]) + except subprocess.CalledProcessError: diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch deleted file mode 100644 index ca487576901..00000000000 --- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nurp source.orig/pytrainer/test/core/test_activity.py source/pytrainer/test/core/test_activity.py ---- source.orig/pytrainer/test/core/test_activity.py 2018-02-27 22:15:32.078243354 +0100 -+++ source/pytrainer/test/core/test_activity.py 2018-02-27 22:16:33.936867052 +0100 -@@ -92,7 +92,7 @@ class ActivityTest(unittest.TestCase): - self.assertEquals(self.activity.time, self.activity.duration) - - def test_activity_starttime(self): -- self.assertEquals(self.activity.starttime, '12:58:23 PM') -+ self.assertEquals(self.activity.starttime, '12:58:23') - - def test_activity_time_tuple(self): - self.assertEquals(self.activity.time_tuple, (2, 3, 46)) -diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrainer/test/imports/test_garmintcxv2.py ---- source.orig/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:15:32.079243364 +0100 -+++ source/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:17:10.778333751 +0100 -@@ -39,7 +39,7 @@ class GarminTCXv2Test(unittest.TestCase) - self.fail() - - def test_workout_summary(self): -- summary = [(0, False, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')] -+ summary = [(0, False, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] - try: - current_path = os.path.dirname(os.path.abspath(__file__)) - data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/" -@@ -52,7 +52,7 @@ class GarminTCXv2Test(unittest.TestCase) - self.fail() - - def test_summary_in_database(self): -- summary = [(0, True, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')] -+ summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] - activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1') - self.ddbb.session.add(activity) - self.ddbb.session.commit( -diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py ---- source.orig/pytrainer/test/lib/test_date.py 2018-05-10 21:15:22.196275555 +0200 -+++ source/pytrainer/test/lib/test_date.py 2018-05-10 21:22:43.647870401 +0200 -@@ -47,7 +47,7 @@ class DateFunctionTest(unittest.TestCase - def test_getDateTime(self): - utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015') - self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime) -- self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime) -+ self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime) - - class DateRangeTest(unittest.TestCase): - diff --git a/pkgs/applications/misc/pytrainer/pytrainer-webkit.patch b/pkgs/applications/misc/pytrainer/pytrainer-webkit.patch deleted file mode 100644 index 0f894c46a53..00000000000 --- a/pkgs/applications/misc/pytrainer/pytrainer-webkit.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nurp pytrainer-1.10.0-orig/pytrainer/extensions/mapviewer.py pytrainer-1.10.0/pytrainer/extensions/mapviewer.py ---- pytrainer-1.10.0-orig/pytrainer/extensions/mapviewer.py 2013-03-31 12:28:29.000000000 +0200 -+++ pytrainer-1.10.0/pytrainer/extensions/mapviewer.py 2014-12-22 11:44:44.367032126 +0100 -@@ -46,7 +46,9 @@ class MapViewer: - logging.debug(">>") - if htmlfile is None: - htmlfile = self.createErrorHtml() -- self.wkview.load_uri("file://%s" % (htmlfile)) -+ content = open(htmlfile, 'r').read() -+ self.wkview.load_string(content, 'text/html', 'UTF-8', 'file:///') -+ #self.wkview.load_uri("file://%s" % (htmlfile)) - #self.box.show_all() - logging.debug("<<") - diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index abf4bb05462..a45f12293fd 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -3,7 +3,7 @@ , makeWrapper, perlPackages }: let - version = "1.5"; + version = "1.5.90"; in stdenv.mkDerivation rec { name = "qdirstat-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "shundhammer"; repo = "qdirstat"; rev = "${version}"; - sha256 = "1v879kd7zahalb2qazq61wzi364k5cy3lgy6c8wj6mclwxjws1vc"; + sha256 = "161jzii5p0dflbpixibn3yhp13smjf6aw802rz1q4879s12gqdq6"; }; nativeBuildInputs = [ qmake makeWrapper ]; diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix new file mode 100644 index 00000000000..47b4641234f --- /dev/null +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, qtbase +, qtsvg +, qmake +, leptonica +, tesseract +}: + +stdenv.mkDerivation rec { + pname = "qt-box-editor"; + version = "unstable-2019-07-12"; + + src = fetchFromGitHub { + owner = "zdenop"; + repo = "qt-box-editor"; + rev = "75a68b466868ba41ba2886caa796057403fe1901"; + sha256 = "0zwsyy7cnbhy5aazwlkhd9y8bnzlgy1gffqa46abajn4809b95k3"; + }; + + buildInputs = [ qtbase qtsvg leptonica tesseract ]; + + nativeBuildInputs = [ qmake ]; + + # remove with next release + # https://github.com/zdenop/qt-box-editor/pull/78 + postPatch = '' + printf "INSTALLS += target\ntarget.path = $out/bin" >> qt-box-editor.pro + ''; + + meta = with stdenv.lib; { + description = "Editor of tesseract-ocr box files"; + homepage = https://github.com/zdenop/qt-box-editor; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 0be04c895e3..6fbe75aadfc 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "0fylq8sz00zv7jvjp7pgckabvmhanpcsqfvpw8c84vy4d8dvqbkx"; + sha256 = "0jj6sjsphyvdl4xy5wl64cl4p5y1vzr721cgapbd89g4y0cslsfy"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 13e4ed81a59..02fc2f3a575 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -1,26 +1,24 @@ -{ buildGoModule +{ buildGoPackage , fetchFromGitHub , lib }: -buildGoModule rec { +buildGoPackage rec { pname = "wtf"; - version = "0.11.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "1b671jhf3xaaisgpiad5apmvwkp40qr2hm4n21m0ya7k5ckps09z"; + sha256 = "1qiwl6z5rraspjqry8dwnx8fgl9vv70sn5kgvh8074vl651yjq8c"; }; - modSha256 = "0as736nnx7ci4w9gdp27g55g6dny9bh1fryz3g89gxm2sa2nlb9l"; - - buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ]; + goPackagePath = "github.com/wtfutil/wtf"; meta = with lib; { description = "The personal information dashboard for your terminal"; - homepage = http://wtfutil.com/; + homepage = "https://wtfutil.com/"; license = licenses.mpl20; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index ab33612ded9..61aab18bc76 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-346"; + name = "xterm-347"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "0xwamhawgh77q2nlibciv77hznirwhnbs3r52rl4sdaqq1rpscng"; + sha256 = "025r22vi5s0328ybhcj0g9js64vabr98hlw8ngy6vyby4zhp63s0"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 26b3c3ace8b..ce6a89f2997 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "1wfrbbdw429q2mkycn87fhci0jidcsflk5f2lbzfzccbcs8msffz"; + sha256 = "1mfg3iksk4z65qkc652vbc6pl34vxw5s560flhcj9g87n6444hqw"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 857604f4aa0..36ed04c8822 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,935 @@ { - version = "67.0.4"; + version = "68.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ach/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ach/firefox-68.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "242604c1cf23db5dbcd6906170e3f1146e1d56ea443f17ad52133e6bd5fa7febeb025a54e9bc8f6cad7421361d386508912376aa2dd40b6b583a1fc795520a2c"; + sha512 = "d101eef9be53196197eadf6035d09bdce1682f90dc3c740bc87be945790692647f8ca70d9fdeaa7bbaf58a5e5cf44d64138254f5454e4460f69b6288b052ba53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/af/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/af/firefox-68.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "46f3856b00935d44280c89095617cc48f3d84d29430eba3dbe003b5b20cc612be7c6144c932e683b2926b0961d7759253b233966fbe002c60cb0a5b36d58a76f"; + sha512 = "3f3e4728fce97a06e683a6c3642f8a87ce6226d2053c315026d4c8995739d000bc98874a08d2a008751854ec42a1e24ba6cec64e455b354334988f14b31221a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/an/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/an/firefox-68.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "31c70530b2669359458b3a4a8b63cb50abde9f7e77f0d2ac03a8fdfbef57b573a36a80c99a8e87cc7557172f97e8c74c96332501f763b4c137d9d21d783ea74f"; + sha512 = "a763419d711c5985b45c4983249517767da75ae4e866ed7aec05d5762d724fed1f465dd755ae8059953d832bef2098670124745ee54ef02416d919599bcc9826"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ar/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ar/firefox-68.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "11f2689e40ee208a4fe372e09b3f2484ff66f1944f909b08a95c95606b614b829ce13b51ef1ea614dd01fea05f60d629d7546e41b45cccf7ddd863c719e6f0f0"; + sha512 = "80e2942cc30772b50e13cb3dacff3142cb73b16a67ed5c2dfedcce89c7a82e9e678a858c467dc79e8b5d68c34310532a1a9711d2888777ff7d7a44fca5b55880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/as/firefox-67.0.4.tar.bz2"; - locale = "as"; - arch = "linux-x86_64"; - sha512 = "ef8e239ddba2b90444fd06141d9aa480a890da335f308deafda720266fcd7e0fc4fe533fba0b72309eafbff785bf3c1fade5008aad3537c5d6ebf8fdb9908742"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ast/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ast/firefox-68.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "bdbbe1339bf7341600a6c6568a24534232f84b3be5a8e7d0b7d02603be4b531afecb59f7eed4087fc143c1687c05da27188d0d7594095ad4a68fb1645c943189"; + sha512 = "0c8648f85936373e0d18f9ca91b2f77976d116f3ef876a857a76ad2c82ac7cb1c021e44b84cfca7cb05993692a89e8cdf624c40ca42028ea7c61b1d134c7d5db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/az/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/az/firefox-68.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "92dcdc797f853931cb9f7e39ca33cf267d2b92e4c2c1e914527af99089dcfda4d9238d7aea37e2184daae4b3678b76c0d5e59708ee36c2f27c8e702635541d7e"; + sha512 = "3011e7445fa2b6c5fdbbfb56de6718b601c90d7de004083edcbe29f8aaec0976ffde21351a1444f38a88df4dd8892050d9e3bd5fb578a59d4c84bb88e0b77b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/be/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/be/firefox-68.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "55390415d1a763e63100e3be94c3bd21d33f1045df4118547fd9e92879f6a44e927393ef82d3d65c08cb1689ab5fa171fb4725482741ef0c152ff61734b2277f"; + sha512 = "967dbfff34c92199d00e2f2a5d8270f8d8039527b25c80406db7b647d383f836c8e79e5ac0f86e3055e5386afef7d157b4c88ebf9928745f3b95c8239b374cb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/bg/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/bg/firefox-68.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "209bd91460775ab2e6d8de5ee18e93bfab3a316ba45fadfe236c7cb3014c59c3c7c05a2a2232ee214dd959b005dc664e8e31fd3c21d0d924740b2d04d637b033"; + sha512 = "401a394d1f9abb91894932ffd31c92280e2a94ec499bb41b851b000b5eaac701c553781b7a520a862037f854ac7323bd554707b304440914d10232e94fec2b63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/bn-BD/firefox-67.0.4.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/bn/firefox-68.0.tar.bz2"; + locale = "bn"; arch = "linux-x86_64"; - sha512 = "777adaca9943505cba74da7fea7ff6c620d44d12f16b0f8e513680a4d9c00b8a657d6a04b2b23fdcb8ce0cb126a9ffb7d4f983d168858ffa522a2373c42da30c"; + sha512 = "25b613ace3f48fab8d13f0b7da414cd96f74908ad15f7c0f8858e222d8b261a4c3569609845f0c6ac755d1c3dac16968b6e7557d048a543eaa774ffff9db9736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/bn-IN/firefox-67.0.4.tar.bz2"; - locale = "bn-IN"; - arch = "linux-x86_64"; - sha512 = "5d5b2f2cfc5ca0ed17da313a052679aa9c9cece912afc660f7d3ebc098a55aff07cc206653570529343b7c3c0a9b3c3be71cc75befbf9f221d0049f90848d3ce"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/br/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/br/firefox-68.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "6aef5a3e24d4afe68eb852c02442159e41edbad67bdeadffe0cb0e464c733a07f150a4ed45b47765f2891c5b6c625ee6dcbed36ea586dd838e99ec13ebd1521c"; + sha512 = "e1638c65de18fab7669cf684eca3cc2c2fc2f5c4dfec76aa71f30f8a6e31868727be4979868f684c43d0c3c9da383e4d0c02718ad096ee84d88586e5b67b2f95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/bs/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/bs/firefox-68.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "37ba7d7c676f703bec7c95281a88a43c2c4e92b6fcb78ab0c11bd5ed6fe166610e3e07c53205438d6f114c9219a67fbff936cbe753d05ecf26e45e259735216e"; + sha512 = "1cd0e4893bf9b1270533a4f1e66b3392240d25e0f62492a1cdb9e7c9e4455bc7966b2373915b9235788f5a419c38ef81c57fd6d4633968c8a3b2706306f64b39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ca/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ca/firefox-68.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "44f8a0d3950182f70adf2a07c0fcba5d0ac6d37566829a8db8eaf0cd5951e43cb45190f7e7d2b756c525c590e10bdeb7c11e349bce50255c3bd6b17eeec4721f"; + sha512 = "62fcd17294fe8560acd0f5288fdd3e46cdf47f12663e92c2bc6f8b5f27efb8d8d03769d364c187fe6a36e784da62ab5bc77c596ff04f6db4f2bb207952dcb237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/cak/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/cak/firefox-68.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "1aaa8dc01acc7c72f59ffbea3e391e909bfca8a4444c7cf2642460598eb583f6ea0530efa52044244069c076ff10d22f23362d115a46557eeb9dd6bbbe18ced0"; + sha512 = "d520b16988f435d9617e470f6404b249365cc4069bbdf1a011958e19d9b4d277389f259220345a735e534f18147da3262d7d6ccc5a17690273ba9d750f7beb33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/cs/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/cs/firefox-68.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "109078cc033d14c80ad3a78c6a17f36b1c3717b7d144b619cdd0c4858d05740d2b04da92eaccf8f844206b584fc99a6bc3bd493a06a814157e9f3a130bfc3523"; + sha512 = "9d86ed813c8c96a9743ad67ab424d50c3363468c7a53c7ae0d1835b91a63fadeb3f6305d6960b84e4b9e3cf5d5e3f77e383f6b25439b91df8c8f7a1888d6c103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/cy/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/cy/firefox-68.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "391bd48099a9533373ff6abd571c81ee584bd1cebedb6b2c8aef0c16a5d8e7dd54222f31935e98e1e17b66e1eb43b7b0ac65f80fd3638c41341557c1988e2e14"; + sha512 = "5ba474d654323792da1dc0c5be474b43186c27fc1c060a46b348003a4c9c1333dcf9cc60a8dfebea136d275263cf40efa1e724f805cec153be7b59cf18b0efd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/da/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/da/firefox-68.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f94b5400f504fe72326da70ad3027e3e316b33414c511ca1f72f6c4b0e37761f57115c4e75119c694777d28753dd204b9166f73d365515c6699733035778982e"; + sha512 = "86550341ce9cfc1942e611c2ef718123424a495c7c7fa2b964063f3503bba477027c62f355c861ad0afefbd7d0279ac8b945719db8f428236a6d91ed5032efb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/de/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/de/firefox-68.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d4d923af91c7fb209e1f2f220ae8c8cb48ee88906da2b10af9addb21820750862b952fd111feb047701f5cc71db8b56380349be1e24c22a42307bc2958d27601"; + sha512 = "81df9031e8b1adec65c9fe5a34564f425a60affbdc5e1662392d70dc4724dd08624ddabacb2fb6cd6739e87ea117f0433d2a2034e883c2097a09e62fa7bb1480"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/dsb/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/dsb/firefox-68.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "478f25678ee53c9fe0b7725e155249e8781fadd349b476a365c4417f3426b4fae04ea2ba1d39d49ca674442f38bb1bc0bb5992b3506618a3f8172495d8304df1"; + sha512 = "7a8bb3cd4c4dd1907a2a86026a81eab2f456520ef28f0c1c8751f17faae23ef9f3063d773fe9bfd7efd1285f06096daa2e9dfeabc621906ce344239c32a4f1e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/el/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/el/firefox-68.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "48906f8582bee9e751ca515e798d1eff390acda3f747885fd27da335be3aaf67d9eaa89a5d51f3d752dfd303041d486fb5147c47a12d1260ce16b4c5d5145dbf"; + sha512 = "cbb7ff2010719ae2cc278d4243f72bcb0ea1170ba3729c49aca0e1c500a3c5905e6768702af3ac3b5568fcd529258aadf4ed6584d1f98250f3a2a0f71e6e62b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/en-CA/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/en-CA/firefox-68.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "4696bb7d8489b1db39e6fcecd7f0863aee3ac7b46ce1ceffd3583a5d0059b1f99345ee99c1d64ec867c276b20745740c5fd82ade24aa05a284b61d132c3b91ca"; + sha512 = "aadb72f6dd1360e93549b0a0470276d7a9e97c050fba6cdc2b0309d87d8bba5614e366f0b526d31f1840e3fe67e5143aa1ab00173bba36b9c0ba376a070cadad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/en-GB/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/en-GB/firefox-68.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "6e11781c6427376994afa642ee2b59c257a57f81b4c2db69be56347f624f22adeff3595c0fc919b82d9a1249f026d7be24706ec192a9ce2f988d9a3184136703"; + sha512 = "a6969f9873b430341b324b0e0d99a384520bc09b3156f2d4d969f80a0784399e0b297166db0456b96c10e6773b85cb1a4047107d71ac061240ef970ed8c1a1b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/en-US/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/en-US/firefox-68.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "45182265a7fdc3059088502e9f1a9ec6be54a99138d5215f3a46b7e33384e1bdd8d21a5ef5fe5efb99ae3873f146fda9a26c028b114b46bf04c5c3e6812f4913"; + sha512 = "e93ab3bb54f14b59d8e0a1339bf1f0193ea081116e1fbd706c37ce218788e827520920e1a67c5fd35c500364949d257db7183ee95a13889a40543e2fdaa42897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/en-ZA/firefox-67.0.4.tar.bz2"; - locale = "en-ZA"; - arch = "linux-x86_64"; - sha512 = "e0919b61881cbffbf26a58839dc8d5468e2c70edfa2ef0ba35e00a8ec7675edd9053ab2c632b05499b1ffa27275fa5b74c125e04b56cd79740a6fba1cc52119a"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/eo/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/eo/firefox-68.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "1c50be0bbbfb74211f958453c938cb5896cbee9d2a891221edfbdbae17726f106ad8da071f067f55fac6988fd6902219033709cb47493b2875348c9a4e734b3f"; + sha512 = "78b134194bd1eeee34f3ca405a55c368ba345d17c82495b227a04149bd93af233c27df62374e12adfe6637dd9cfb3d69394243cab6558468f159481468a9fb08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/es-AR/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/es-AR/firefox-68.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "e1484d5aa03f6be6bcaf366613deaeb1fe40b724a81a3bb101b20d4eb46c64d872c52cdc57a68ac35cabef7e9e4bcb70f83c72cd4d848ebcd4465e4b113fae2a"; + sha512 = "6729b204377653635f62b161c4022f1598fbd5a49f8edcf1603e416a0fa525d1f89182400f4fec087b13a9b3566cb51b5d964e895e7a46efc734ffc92daa9467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/es-CL/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/es-CL/firefox-68.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "5a61fb2fb1c7bc43ff05be5d75e6ba60f604cecda4b9771b262d9c6b6c2daa710781b84e2d877a003c4e6def1ccf08fdc9d3f6e1c899e2ff05021f298e3b590f"; + sha512 = "761d623120743a8bc8191f0996bdd4e48242531000b58e80aa74b6af99142b91a39195b647b662833bf494c3db3e105d01cf0301eea5ac085b4ca766df79ac98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/es-ES/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/es-ES/firefox-68.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "3a7709301b5611d055c888b737cfcc49b20c9b7289fed3f8c5c5f0273531c2c7ca4fa82e1c9ea38cfdc122f0b75978b5d5a9c5b3fdd5abaac4d7c17b30d2a006"; + sha512 = "10f9f0980376ce0799925d4f9e86b03c2cac7dfa857f8f4c874b9aa069ee1b021f25bb274d6c8357cc51aa9b4ac4b3b877e782c4dcd5ffc846ce5190a960c9f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/es-MX/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/es-MX/firefox-68.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "be4492ddb9bd9b31b67c7cb4583311db2769b42462049c338f9be61fca7013712aae7369b36041560e351b9c7a7d1c6e799cc1423f17846af4dbf1f5d742deef"; + sha512 = "3b8df6f200e71234cc9ab5d096c84084c24886aa08389572bd952e3c6178b20f6d8e2e44012327942713716d4bc26f087792869e246708f0cbdb6bbd0839b7de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/et/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/et/firefox-68.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "edce69aab3f0edb914620a024fcad64a73bbbbe091875b453b82269aa7f24919ff91b1a077af495c0891f20234ab86504571db57f71da7187c399741e65a7959"; + sha512 = "f7d0b6c4d7692baf332460ce41d9bf243e41f3fed0a547ad2acf82101429e1301aee18b5168aab00e758b6953e8c28e6466efc524a48b0dde686d5a18c2ac10d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/eu/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/eu/firefox-68.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "612186f2bf70742dc506c73aa6a49715ffab15607413ec2eec6050172f24cfd598facca1caa18f8bd3c872bd768d61a3e7f55a5c7994b687253e8d5e7919aaf9"; + sha512 = "a5146238c071f3361f24b016a24bfab8449e8d79d1357614694bb42aa24e8266cedc127be3ffa107f3f4481a791e9c16aa914f0edb1433d3f8120cecd7104cf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/fa/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/fa/firefox-68.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "3038cfec8a88eda74b32c14638c001b0bb9bdaf4f4e400a22d2036132659bfaf1d11ae6df0f5722cf5ef4ca14b7a2e2228a10473cadc3d7786b09f7f50016976"; + sha512 = "6150cc3f001910963c83b9c6baea10396c79aaf78d74ba35af73821b5c8ddd9c41f867fd9fdc143a532e693c9c42601c54bdfa01391700b22f3e571133bebf8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ff/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ff/firefox-68.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "6601d3508bf587050a4a5314b735f3d63ee059097ad89aa93861e3eea0208fd465bd496d3b0970ebe062fbb7daf2852d3f77aa10b8baeaebcde90f7db3ca37ff"; + sha512 = "e93a1a41ea65433e7b55c72519d0b1d5d3b742887ea380c62e19345fdd9715124804e161eedb59eba9ff61431eca2d3f74fcf788315080733ddaf89e6bc2475a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/fi/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/fi/firefox-68.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "483d8ed081312fddce4702ff2e72e4c4ee9323bae826a60ff1a4a4b78fe6e091e4dabc7874b89fd0e3cecd68644c11d33e0c5941bc414f33de1f3b22c93cf364"; + sha512 = "8462ee57dd9e5affe5acb78290916c45b68ba4219a9ee0a71fc3c7eca5a1174ae4b738bb6807de4dbe4216851b6e13b49f367bdd9ab17e0ae3c336937831f318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/fr/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/fr/firefox-68.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "f6f040446cf1a29023a55d3b7a6a8d8f54b615c5e0bcd39d3b6ec598ac1dbdba50596d1192ef7c33cef6265d2260ae0bcdb71bac36f483877076a6769ade28bf"; + sha512 = "270c53b297ac3164ef791800a4e1413e58b4ce95e3006456e3ac4c24da054001c4efc0ac2be61d814d6d0b04ebe0e427437cc75cfc80b4a85cb51363ec6ee26b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/fy-NL/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/fy-NL/firefox-68.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "04c2872a8e50f2aa7fcc98d51597a6b7294892e3059e55042962012da68694df15b6958b8c3ca19dda0bc4f2216b49bf1ec4b8a34ea500cbe21b1d9baa692d01"; + sha512 = "6d748ffa25bc34d8bdbde1d849ddc683e947a4e046114ec97aceb7703d67241f395cffd0a056cb01c50c616cb19a03a9d1c94d292031e39b9326fffe4c96f1dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ga-IE/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ga-IE/firefox-68.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "54e01fc0f483784a2c70a2745ec8e4c80a71f522977923887ae1b4fe9563d79eff3823026d9ae45f33a8a551dfa36ab571ca775b6a1862c8e604be36584b1ec0"; + sha512 = "7b5437f7da1d7b991896e4cd9599248f6336a0303f9cf4e6e59979d5c49eec768393994ff788912a69e52153e3b85b21d5faf6988a642c197a44393eb363b638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/gd/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/gd/firefox-68.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "c692c2913943c09a8a69bdcface0108d61db14160619be46407d807bcfe3737e8b47bed5ab5f90a056d3fca4c71004f75feace357d6a328a9dc436aa884d6024"; + sha512 = "4fbeba40f7c87d5121586768acfa86b652a37fc5ea6886ada09e77e637952ec00f6875be5260daf35274c9800f1838ba89e711bf7f93c6bbe948d40b16402100"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/gl/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/gl/firefox-68.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "70df7ef346ed2ad2e1e7e6decc27092fdaad803184b7e58e5a633b0f6922f824904a17f85e7c98c3300ede8d0574974d6b425dee82b917fe0d55d4933fd9ff99"; + sha512 = "3605779f504f5e6cadd6e185244a008156290779e3dd3f243a86792d8aa8d967a3f9e83cbbb509eee0ba698729a51a01626d956c2ddd5f337eb58f0ca4adc8dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/gn/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/gn/firefox-68.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b9f7b5d6cef7c07ed465e4a5d584835e5fa259aac33b9d19fa97fdb2ec86fbde126be0f9e572e1e15aea131dcda6624b7d8a524b13b56615d0566f814ae7f040"; + sha512 = "1feb11fbc99bd526ae43b9e377262803e092ce973f68fa5703b07ba296012f9e707d1b3ecb627bf4b5b1a97383c7af0d460e60665a87c10f79ba644d463415a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/gu-IN/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/gu-IN/firefox-68.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "f58051861e6900bb348674631fb9f7a415a72824f518d35948ca44ce6454a9f7fc6c6cad8666f23084edba94158fa45f3e3385eecba2fd966e64869acf5b926a"; + sha512 = "8d857d0b09d23bbec739e3a6dd7a834f16bf9a7f7c60ebd36e68ccbcca121535201b43d7d5eb206e1801250dbbbc509bfc3acc8b5cec814307aa7fc680c77661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/he/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/he/firefox-68.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "44146e5c7ddd727ceef7ad24be80d57b820d020103baec8a695a5d11660efbefd29074a550bfaade8fe344e2b984ff853ea739fef60a6fc66fc5ab27ca9894f2"; + sha512 = "816c8855effaebd765383c4fa355dbe50694ec2916431be9c4665927f906c8d705f4913ebccfc822f56ef44c74e74a532f3d3f46dc003302672b0e766dbe8616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/hi-IN/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/hi-IN/firefox-68.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "07b36ef659a4eed67fee4a8c93db3857b7e676142a42671ff0df002ab63fa2fb2572dfe98ef3b1804ebfbf5aceec855fd684899a7d67b09501a4891f059982c3"; + sha512 = "338ad80834548cde84be8dc26d597b8f69ff0fc7770dd69758d71301ef749723c634d5abc757326c8b4caea1b81341108ce4a3641a967437c77b4eebc31e55c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/hr/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/hr/firefox-68.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "2409de1ae91130e0034f23fc3bba58c5456eb5ab5dec67b611da8c4c3c70a19d995ed6381ab9c0ca6cd296d247f8a35ea151acd699a5967c6bea926861534774"; + sha512 = "5c501a55279fadb611b872510235e3ab905116f4e6f107977ae9a790fbc2df9690ba6e96cdd5a51522eb3fc88d2dda35657691991129acce7cca2a65210885dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/hsb/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/hsb/firefox-68.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "52cadba3ec438175ab2ca4675db83f3e309464115dd8ced69f3efea29b6b902248257e77749fa3a3c7ae57325cfb57bb0b9fc7b71b8f3509b46f00718c6b4d7d"; + sha512 = "254b5d2d8127638a9c75140e562be7bd51915f4870306ba1f8d5fbdfa89a6d62d24a529e0951d7aaf88454a2a7197f1ac32a030a08968e22ca7b81649af6846c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/hu/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/hu/firefox-68.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "204c7b3b0bcfd44c483bd6d9e5478bf02aab41b8968bd960fc0f656ca2b09e863cc618adf800b409eeda16cad846f66ab1e2f879c4d891a7a60b339b558e6df9"; + sha512 = "0d2f182d9640bc5af616145715808a2bc24327b4066e9e0f92fd98932d33dfe45f5bbb24a1ea4595be85d29919aab31e4a8d805e628418ad7497c727fd523492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/hy-AM/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/hy-AM/firefox-68.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "70e90d4218c16d0161fe90856040a038af733e4ba42c9de73c39aeea60b34ea508fbce697f8e81155a232913a948f239fde5a103a9a73662e94e491b58ebcac8"; + sha512 = "efa98720171d7f4793c02c6270badc7f7c5fd0951dcd6e569216e642da112c94e39de7bf67fea4a535da17cb6d852ef34983f573e210440958fc540cbf54963d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ia/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ia/firefox-68.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e2fd287beeb581ea5891ba0d8d71e72fa31b31d6ab4309616103eab56fabddcaf2fef51733a078a421c23545399da7f3ae24b6ca90ef2dd42f123150a38dac24"; + sha512 = "bf60c3d07c9d3008d0ca4cc4e09759d9176df6e9632150d03435f1eb1edab76bf4504d4055d1826c526c435fcf7747546f7574ac85fd87e497165bf2f6a3c34c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/id/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/id/firefox-68.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "cc7a86b9b1a5801a7929e85c8aa379e3f42ef33cd1b37cc484f4ba339cd048811261dc666d209a30acd10413cf6d788df186624d54a3b95f293b766bd8dc5348"; + sha512 = "ae11410bf6338659b3259d144461706bfcb1c85e6f9e3484bdae75c72cf1f015ff1d8acbb7daea7dc78df1bd1428462b52c5b2fbc32ac22a2264e501758712e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/is/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/is/firefox-68.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "c45f90c83e0599c0774b024868a624788418da9506b02eabdacc31fe8ef6d1caf6599981d3e0f2759dd17208e8b2f613565205203a9bf629c91f129c2431c4d5"; + sha512 = "703c104d9cbc3c36394a8854000a5fc1e919c28c382347f23e09f348808f84cc173ce3b20cdbe615594536a0817e77b942a4ba211eb4019d45b224d6a074c2dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/it/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/it/firefox-68.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "14ffaf74df4ccdf86cc0695907a5d6a9ef07122a953ead71c6d3c41f532730cfcdff8fc2cdd2c49116ea491cb855f6eb7c9d224e927a50891d237252ac9e5cb2"; + sha512 = "13381af9f0b85c7eca0c17b5ebbd7918f8dfdc1228c19804855dd78e84966de7d95dc104ac93d002deeea0689ed9e64a965062541dc4464e63b783683d3baf99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ja/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ja/firefox-68.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "eade3b14793f865f03f74fd10902670168d75869a36d10bd6e7baf0ae65b1c5fa3f9fd44d4966f125462a3dc1151260a7965abe8f0152e8047ee1d8a3af31c11"; + sha512 = "22aa65d53fea68d327725e78d8e6226bbf97b76abb0361917faddba0704c1dff81e4b8ce5e3bfb3e719625cde2257cc64e361791e6c9eb02d25614ce2e072d07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ka/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ka/firefox-68.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "bd58a7bd403583220ca2f8b74936fb7ccd5f38f589a148e1c9fabe679b08d910d501cc511ce4245ea4bc4536e0926a4dfa8696e31498e0dadf8ecf38698cfa27"; + sha512 = "c1d6e80fcc16ac47c23123d871230d96295820e0a406ec7f20e4829b00378a4fcdb205a1556abd218d126a7b6873440cce3ca651b552117ea179bb8542e6c925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/kab/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/kab/firefox-68.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "6302548d66039f68381294b9520188cda6a70b27d6ead2ced4f12ecec12f6437ace80abdda99c61ad120aeb1128f7e90a5cf8779e4c23bfa8b0ea831e14225c1"; + sha512 = "6e5b60fbaf1221e035ad6341b3d8fc154d663c0e361f768df0182416b66f3705cf0d2c14caf2787c915a981e9ee7c67848576e3204a50975d1160ad23fbcd7ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/kk/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/kk/firefox-68.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9d12b4ad44b2640b4d5c8e98b3ab0fb410c91b37317debe78967524b4fde5cf8b7ef6abf2f7ecf9d86912e3a642af2a1aa619977430c40f697e361a2c8f67928"; + sha512 = "48484e9b8e67dee1f5c02c654b3bd4212e36ae2397a30b4e443f769ef10d8309f76ec0bd0bbbcd59f2cb9cc37e96482970777a573b099d864160ca9a546d87f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/km/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/km/firefox-68.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "289c791203c50133eb07788dd8c37cfd167618520987679c18071d3527ec00891e5528280095659f4e6a92e44ccf1c39a4fa38fa7ff980a443c8a4e83052fc6f"; + sha512 = "00f10438a68194ee206603df9583e737191fb323e71412b9ab5f41486376725f285019b9429a4048b48a363b66c2dc821b3f761a3b1f529bf43dcdfa0f18dec2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/kn/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/kn/firefox-68.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "be8998c94d8d6cf6652be2988d20bcfb09bc62322d295b8e045f2dfeb1eec5493d2b12ab1c9e12a2a86b4e3faa987ba0edf52f69f1e910eda4cdf987ff5ed35b"; + sha512 = "d73e519768ae0e5b16f33ab8ff2277d865e856ae4fa8242de3ecf6df9f74f1e04d0cbce9c4c7e351362dd2cd419ad67019fa0d8c05d0f718a585284c51748261"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ko/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ko/firefox-68.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d2f46ce6787b5baac49bba69e1945ee6cdb7d3ee8f6540c6237a4e007b48a29a398d58e68214659d9d432aeb71bb19a2267e083776f6b3f60ba9359799c41b28"; + sha512 = "38a54be34b004a4a378af09a354e96a41814303fca0cc55d693cfc6c70e40e927e1ac47d554457a1be6efdc0981d68eb9463a406c415db677b8a6c9e1097992c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/lij/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/lij/firefox-68.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "e7177311e672435e86d3b281850d5fc3ccd21c091bfd0388ce29d811ba0de3be687d68a045c197ae5fd6f37224677f538245bbd208cb5a5fcf8e3cc8300ff28f"; + sha512 = "30432760846675034194e36f005e71eea19c13f8063472aa30b00bd8f2cb359c577c194b71d2aee21fe6371ef01918c3ccc77b4d9adac7dc5e8697d1ae788d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/lt/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/lt/firefox-68.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "c5961686eab01bf78dcb8912864483e6d97f154604c6721463ef005f61a6bcd0b79a026de2608a07614386357b63c53b4b32efe92f82ca99847bd7f691350bc0"; + sha512 = "06036a7271e654dafa39519e52f1e860a7e0c9c554a10b9a2e06ba3e8fd684b1dc12f1fed969db580939ab534b399c3bea3556668de32a3e6755bed5ed1f05d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/lv/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/lv/firefox-68.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "2db572e52e9404fd2db5f19eaae5166b6459c8dc323e00b3043d76135a2eb83d349236ba0465cf3f57fa981ba338ffb52f9c8fe29197003c9dec3f64a6db39fb"; + sha512 = "6ee8f158bd9995fa02cab38272fcb493400778cd398557e9b8c8335c66199ee64fded5dafe5f46a2a082611602024a7571fca8377dd74014f36c50059dccc008"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/mai/firefox-67.0.4.tar.bz2"; - locale = "mai"; - arch = "linux-x86_64"; - sha512 = "e7e35572de9a505d795e79d4ad9b66c53c283ef74e9fcb7cc48a9cdd41c1e292742f84dbc4260f581078dfb7e3b73890a1eb032c87bd7b3e62608bbc12505221"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/mk/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/mk/firefox-68.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "1737e482eabd1a16146e9fa20e24c419af4a8b271c215f5399df961162f34b5029c97afca73921af7605a22013a7434f36cb3e70896840705940f664a57db215"; + sha512 = "68e85cdebd1b4811ea8a90666bdf18e519b2731be8a01b099ab55ee2d2823267e76d7329e8cbbcb6a3e9b31553a8e882a8f4590402f4883ea600c81d4c861519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ml/firefox-67.0.4.tar.bz2"; - locale = "ml"; - arch = "linux-x86_64"; - sha512 = "6d47977664f7c728faf961cf1ab3cc3c2280b61f53b1854f0094313bf9adf682ac23d948f9d771943fc0e047d5b38cfb661a9cd06dad63b3596642be45b1591a"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/mr/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/mr/firefox-68.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "43e4d717641c2d6c0c71cd035467939300c33adeecb0facc4f0576e9eaa25278c136e77d9a27284a90450c6cfd037ae8793acd224170048c52755ad74caaa776"; + sha512 = "06267cf13d3bde94280fc7ee837a24809e8e856fdf769e6f5e6f9d2583863d70b00d0da262ee3c96fb2b72d7cbe0b04e8697e4d3b73eb128ba26b25c0a304e8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ms/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ms/firefox-68.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a25a69dffe57f289a1a2782a9dc83f255aba7fa91fdba227993528aeb6b2c99c4e3f4002b0054d1493682fdb816b735579815bf2d944460e0dd323ca354c7894"; + sha512 = "d52ac748c903b763308bf83f9da8e898fe7f97418da43061c8c717ddab97aaa778647b241529d023490bb7c28434b1b04284234d6c1f1ac6c4bc4bfaf0133e1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/my/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/my/firefox-68.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "77f3e770bc9abda2357461c6c730f4e06948875abdd7bd3b9ef6b0caa5b20133c84e7b7123a4fb6bc3d8228a48a341667328690c155eedfae499f316a79854fa"; + sha512 = "c59fe9e91260af739f37de4ea81b3fa09a6202fe76e9cc03922b136de8e8deae140798de1b9645732c31203e4617954da83d8e2f279330f0a3ddcc949b95d550"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/nb-NO/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/nb-NO/firefox-68.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "78440c8870e68a99e7f7e4604aee99e7bcbc5081361e38351630538d77e8f82da62c4aab3b90b75df561d2a10b7949eb62e28a03ec7c65185dc74127066928a9"; + sha512 = "87c37012c85ce2301655d81b8b388bf5412c19e401e4e48713607b69157e017fc9cd0a9dd7ec980761ff11bdf74e3b3899c568c808f98a77005add4a23632b33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ne-NP/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ne-NP/firefox-68.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "37c7b5f03e09debc7602963c1be733a6b68e77fdd94e06e7e7fae9d40bef703ebf66a615b28a26311fbcef2c9d3838b72f0bf368eedc3f263ce432a77fc73387"; + sha512 = "5847c023bf23b8f399b13b85e9d41006d7871593b64c158ea873b9dc1d272345b7daf08b89faf0af072336d09523025997d2d769035e4bcd0fda6919a9afcd68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/nl/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/nl/firefox-68.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "297781a85c222f941289404a501f561cec8f74efe653fe474dc160005bd71b554726596577edfcc43ffcb20f6d435f80bf0cfc529504451f83da3a78c8ff89c4"; + sha512 = "55543a83655090fc326c0c58714faace33c43ac478f3471efc1508bb66c6cc60a306bedd9a059c3eb8c130a330bffced32eade1d93c5a2efad6c168f801b8c80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/nn-NO/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/nn-NO/firefox-68.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "0ab591c373e2d79b9a2386a48ffd8da288b88ddbbf3a14916be7040476a094eb8c5e77d169bf30203b66fdd013b18f909fb1c378552f6a54c87fa652b81b2a37"; + sha512 = "110778a27744add44dd912af54bd72a304e6ffe8627e8d2e557fe52b4ff616ff65649d8be21bb34d5c3198125bd4e645050a761795877ed2bc52ffb18a19c74d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/oc/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/oc/firefox-68.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "5987b182780f501cd82efebbc570b078a09e23a2da542fd3b3dada15791e112a674b670ce856f80b9240d2fab1429915112c4f6d15e51165ab276a0c8aad1b16"; + sha512 = "ee4924824d66643e92ed30190c391a6f18aec76d134b0eb5a300a824d5e24abc368623792a034dac7ac9fed1d70e0e07903446670b14ffebd78df191021e2970"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/or/firefox-67.0.4.tar.bz2"; - locale = "or"; - arch = "linux-x86_64"; - sha512 = "564e0169643bc3096686d925c690a70e32dd41c263cf0a43cdeb45058af663c94dc9f794eb88fdf84d7fe35153f80162f47ff3dbebb2f8e76f332ffa29fc1320"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/pa-IN/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/pa-IN/firefox-68.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f2b327bfb199030415747788799105556abcf6186bd8d1de8530eb178ddacc20df75e670f815c95d51eaa6210e353d6ef0e0b156c17d944995caf1ecc11a1552"; + sha512 = "440d04629c926288de2b1f7e2dd0849e2743155cb51d98cda33583cf352fbea6bb742f12cae1031708f55e0407ec390777f7e6d0ac6aed9c542ae6558b37aa4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/pl/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/pl/firefox-68.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ca0b43ca5911076e0a22bc19074e634def120944b3a010a05f182b6c30cce841618f0ecde1acac067a1b685989759a50796f8ad2a3688fc432d09a3c245d4501"; + sha512 = "fb91cf62eab23a1b1d1406844a6703ad63acf5b59d727728660ff02670969903deeca9436615a3682c7aa24e3dec96b335561db62cd8f02eeddc1064e0cd5c9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/pt-BR/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/pt-BR/firefox-68.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "81b9c6f031bad7ac993d797eb1a1d0711393c47ab69ed7b4401265f1b0ba462fe8e777ed9283514c9546ea265d98d6773321baa59b81eb0f214d69a98abdc771"; + sha512 = "61f34d2b0f3b9191e3ea7ef18d17d64044b030fdc066ce169b3464bfdaa6c47c1490e45eed5a864ce9cda2b49a688b8c3a43ff80b6933f0ef3e4402082005122"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/pt-PT/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/pt-PT/firefox-68.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d653fb7efad8a0fb81dbe31010a9c4ad96b3d0773df8f5bc86a6aa1f03f97826c4be66d3e3806b0a25af7699081c2e8fee26b81fe4768c35677acf6310cbce35"; + sha512 = "a23a5dc6634ab4e92d93017a9cdbdc6d5fb8fd2582da9eef80dc9e7c1aa374e8f25349e8dc62af71fe79a4144358161c01317125196c2492dc27fbfe2bac3732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/rm/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/rm/firefox-68.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "244f2acdf4905714575b21dbfd961b370c9891acf67f79aa1c8c3014a01b549eb18741a9d2dd5df41d5bf8042ac38a506fc08494914ac7b429b9456292400adc"; + sha512 = "bdbef6e73b7b151b45ed55c4a58aa2543388a3b0ff93afc6120981f5e7f43a2b4016355aa253d25061f31772934d3f5c12fc06901e77a1d57f49fbe29fb895bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ro/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ro/firefox-68.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "365fe04fa3caa16d356514596def6684e4c138a19ba27c43a57f418745870262c781d470101b97e9baec23187e7c779dd6be9aaff491a1cabad0cae064713d2b"; + sha512 = "44aba7def57c5aac88a64aa67f185a487cb8f6833c8cf608f3e0dfc4271f66f1c91582120ebf81eb9e8f3547a2124a99be322401c7ba8c3d70a2dc67002299c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ru/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ru/firefox-68.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "6f23a039207fb9ba69f480e310e5107c3f7d4a595400751a711479138bcdf46de900bf30808164ae3e781b4a016d893e36931b049fc687d96b9000eb6d641c1b"; + sha512 = "6c51da10756208b0a7ec5b411f72f3fbe20e7966df5e53f65c27290cab29b70e270c9a6ae56ea21e6fec2855660200a543b79647e9b7031c604e747507191411"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/si/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/si/firefox-68.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "cb743b4b6c1cc2b48e1d484503d613a8749e5712778d955ec178a9d922056c46e71c4221fb575e0d66650bc193c6f473b4a4e084743459bb17116252f9328d76"; + sha512 = "c005b4f99142002aa4e6ad2baec8bf80dac8dcd5010242ae0ade76fa21a47f04cee53f8813ee23007862e52e9347fd4ee0f573e497e01c50fa7eb12e1a40081c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/sk/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/sk/firefox-68.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "72e512796abfcf9c3a0567a87e34354df9c9d695d955274be130b4499b6e4d7bacfa28ee558c9c93b051361e329bfaccf47bf94119ae4dda19f0a7f1dfd44677"; + sha512 = "3eb07a28d0bdbb76348932c2c9af9d6f108d32d6598fa2a77edc1d7b124f1ee7cd6b7861a8ad3687bfe19cf43fa3a2b6cd54b1f688d40d89a0e9592c081e7808"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/sl/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/sl/firefox-68.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "f30fcdc67f6733acbc5587e41e819d63b254c40643a2df10e5d492163f4f1a59ab9287f55de96482e3a973d0be84860372074631d7097f39e153e96c96dfe241"; + sha512 = "4765af13425c1f2bbb5b389d43a1409e82534f24ef880a18025a09f9c686b257563e7478cfeb3cb0e104d13ddbd7f761a0783d7dc684b6dd133d8aaabc5a2e6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/son/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/son/firefox-68.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "8d29fc17b73f0284ffabb03f710d4d4687b7070f381a4cf0af0695e6f5eaf01e403cced9996a728871138f2152c594ec75f227777f721059f61e6cd9e182db1b"; + sha512 = "4c6182c4d94a6dac615a57f7fc5e7b1ef7e79d9574d04750c40f4b0b803983ec4e22538caed24b12b1ba97f16e3726924fd9c203ae14d286aa82462ce0c6bcf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/sq/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/sq/firefox-68.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "a9ba2d2f7320b432c0427478d60e4c5f5dc0628152845d827ff22b2b5f39bf2c8b2f75855c78c6c13b8f266531a4e7abe7031bce8825741509d4d7e72a40eaa6"; + sha512 = "8a392701fccff096a0af7f1af3ad4c591c222a61f55bac80e12b09fd760fc23ed162308f96680cef459f324254bd6f989a4d11a1e24a5f8eaafedf81641d938e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/sr/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/sr/firefox-68.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "14b1bdcbcd216ce8fbef761884df3a969821a815616dfcccb9858be52cc8ecabd8874d62b6de7a2960277085cf7b71f24971b987c5005bc89631fe5e84c05d54"; + sha512 = "5db4ff2f488d18091e5499a6f32cbca16bc115e5f4cefed50b6d2e6b074a245613a7e1e397ce7c902d2ec227d94b02c11ad1a785cfdb54b6bcf2f16ea54161e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/sv-SE/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/sv-SE/firefox-68.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "76a9110b775ad84326d4cae80bfc5fd1fcf37e152aa89814ed968adec2592e96e8d7c883c2dc6371542316122ec1df4d18f9f2758f9a1d804cee3f4c390456d5"; + sha512 = "e4e6546b45421837029b4234a6166a170c62167f7353f06f6dad4500c9aa63460c421a64219a258bc1efe2caea4d0def9a37bb62e99b95d7d33744498661b8ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ta/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ta/firefox-68.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "e24ac38bd95b430a6753f8a8d8501a8f810979ddd26319c07abb1e32fb23b16904616526a55e4328c72bf7f9d1ffc41aa393c9ae31920e70c196de90e135cc27"; + sha512 = "c6eca4d784c78d60eeefb65148b7c184d24edf3cd97824cb17c1bcdf234503d2989177a2f11f75b6491cfe98d1c3d55bdf5a8b33317791dbf19dc33e62c46d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/te/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/te/firefox-68.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "1840c39c580152d4a94997618436c41cfd3d18bd0dc6f2fd76bedad5282cfe0a340b465acd1bdde3d8ae237b6c1a2ceee4c615e25b0c663ff6081de3d16f081a"; + sha512 = "df4a964e69ef9809d6e6bf50a3985d89805b3aa27614831a923e064ae58981fd6a10abdf4b91314986a8617a59e10793310a7c0f92897d01402e331da682ad06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/th/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/th/firefox-68.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "aad5cd039ec39b3cb67215bd5c90531f9ce8b92ca4dd33da09c9b862fba637fcfb2e2ac77c12e73fedc700d0f12f95eeec3ee6767be44fb853f5174cd477118e"; + sha512 = "764bfcbe5b81656959e5736509b3749a3e42c4850800992ce74cdd409b491c57e06c675c1ae5f2571311f0583a0e6ce3ac1f8b0537c5c005ca494e67839d981f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/tr/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/tr/firefox-68.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "597fdee3a72ffaee8784acf2cf33862f825d7d9d261bb86909f5387ca9ad8ba7099c4d18ac0e7bd8611bb675bf9385a886af7929a90b84a83c659e6922673caa"; + sha512 = "580dd7c33ed8e54ee6e9a05cf570bb0d5604a4f602dff9708aa0075d2120fbb011443d134e7adbd53f45ac3405b5796d3d955fb1a33b2de1238b5acdcbfed2a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/uk/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/uk/firefox-68.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2937705240b4e95dc0f5dc318f8dcadb1f8ad3a44e010f83778e853328d7313997823ac1f7e72bc693727a535582b81a2346726989086014a761656bc689f5d4"; + sha512 = "2e9ba8759ca9478173dd5d8f175cf827b4fef9e8cf778630ddf240554347c0c3ce9e76a2df9ad3f371cf379ddc04b058e9c9a8e0abfaa53236c95c2e088ab82a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/ur/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ur/firefox-68.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4671c428523535497ac2d7a349b7352c71d990884cc4e4836306fac34504eb41c7a04322f972ccdf048853262407b54b9b5877753ce8263eafd12addea7b2bfc"; + sha512 = "5dad30d09dce8ca3b5f8d2dd2bd2bc3bfc0e03cb21b07995e3c1c8364cb0095c16799fca879820998880579c88bd6a1883c2faeb47f53058e35095bd263862f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/uz/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/uz/firefox-68.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "8762eac0a03b2e4952bf8983746cf4fb6482920e81486e5a68c36b1af09fb72ecc5ee22bdb30edf8ec042441b9e3060c8bc55561350b155f85fca19c0f40a906"; + sha512 = "62f894177712c0e1cf536afd93a15d146abb60936416d6fe8172b87e56a510927245aafdd0ca14472e2f938cae63e4773804d258f362fb8bb65b981b2b2928ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/vi/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/vi/firefox-68.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fb15081b62d0dc05159dde1dc9e1e1dee93caa533990ef02f104a0c8d2699b91392fde2fd20510164640f1491f296bba7cef3b5921b4f199a3fdae1c16884bbf"; + sha512 = "177065bb438cfa27d21d3f371a2a602b00b7f8411b4119e4f7248087ced64d31bef0b3bd8b71f5b55f9a3a3dc2f946f67bd37b74e501bd03d565d94735a26b3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/xh/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/xh/firefox-68.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "245c4818d8deb944def5e3b5e449b235b9fb0819f239737f17a8421a03ef1d987e688dafbd319f2f605c9a8fd041252fd70d533e8d920d51b7ea18cfb85d2c35"; + sha512 = "e9b764770520b1d2caf358e9a0baf27bf693201493ac8008bca4e46d5e918d1d3659c6142d60745944cb4ce9673cb165ce72248527dafc801fa8c2acb4768371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/zh-CN/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/zh-CN/firefox-68.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "fc9af298d18a015d05793e7d39a250f08d8814c7f319eadc69822b544bb588b97b81ceec68d1f2678a914d453038797b8636d783c9eced145d4d99de63c1d82a"; + sha512 = "3ec5489e08c721fb62c28426d3bc3bbb40005a37b0a7ac0476dabd9e207dd199f8f58f79cdac7cd411baf1b8c3f7bf647db211d509821c0742f4fa104c5ae2cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/zh-TW/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/zh-TW/firefox-68.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "65eefb2302e28dd7a50236fad1d6e3d3a6e324fd00c3895d9b00e44f89af139f9c56f097ce84e772456f69d33ed260050e153201622692b4fbf2206a02d7e6c6"; + sha512 = "318a7f3cbbbebf222ef5524d40bc9b8dbf4d2bdea16b8c81d311ad54872c0c0e4312655b7bdb59029a8092b8a7e9fe6a25c3c85fd637c0a4ed794644eb639841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ach/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ach/firefox-68.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "1ca913950f33d56bfa4de1a6e64bd16e684f904a0a0409645900d31e0859abb9dcb2818467da52ff69c0414e17918453258856054aea89d5fbde528b790f7f29"; + sha512 = "507638c2bd8840a4abb4b2f5165bd6bd9b2a23179c895563792fa1930826dec9e63be7a494e70af95ce39c051798f81a9cfdadd9b8af0b3f05a6ee12c67d9ab7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/af/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/af/firefox-68.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "b9ddd1d7a5303ca7003dee0875945c35a825473b4e43162f9db69ff13c1b61dc0f98fbb7be4b761bad69fd89fac1c09f0c793dbd74e9b946088a35166a86393f"; + sha512 = "6c1f477ff2348cb01bff82c6dcaf9902c296831cd4104fbcfa4755688135249a7afaad464f00a2d569d152fd409c50b6b0d6e14b34aa504afc139d7e7a32d3f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/an/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/an/firefox-68.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "b4e18dce44176993cec5c0a5e6052f0bbc792b2c271681d494851dbe9b899280f5ea685b9241c280709f11362249fa5f296fd9b3d881b3bcc595b9b97b69a059"; + sha512 = "2a1c9f44a19f717e9831f34afd6b1948572789cbc14183b3c8fa4aeccc74d4d0616124af84e2cdfbc24bb6e709e5c09352183f5a4d8e92e9498f7f41e9b5b10b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ar/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ar/firefox-68.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "eb303909cae6777402e57d99edc6759f31d7c50e39e9e1e966d715c1b484e321ee573da3bbbcdf132bd15fe842e5b4fe8f497ddccc766c04eeb05b147df38715"; + sha512 = "aa838908e9b6a712e74d786ecb4d32c7a51335fe35d3952b98b685fd7c3e7caf0a18359f24088459f45aced141cecfd58b04e23e56f1e712c42cd4925ceb123f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/as/firefox-67.0.4.tar.bz2"; - locale = "as"; - arch = "linux-i686"; - sha512 = "ba48aa6cc90f66f60cd08e1f74bc1a0360103746e6c9b88210a69ad611929dae7473097c3bfb858ba306ee881bcb6f3ebb6fa49817beb1c7a716aa7a9352c836"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ast/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ast/firefox-68.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "2350ecc74bb7a5503782aba038941a21c8e9617af6165c5f2cc34760ad09c2a4002670b3e7b361fd3c00c26f17bff2ab95df5f5417bd7be0c2bc8846db3f8d6f"; + sha512 = "5b4d3101dfc82886478395008a0de194b94b23f1b8beef6f29eefada2289ed60d1593d88ddab6dcf6644670dd0133cd5671a5ac30125db2efeae5407181aecf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/az/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/az/firefox-68.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "ad5cf8307148b39e485d94bb2f5abb7f5b36ba7cbe5593d72f933c70a1359e56993700757fce0bb0d8ac3ac8c8a1c95c39167f603e8e4db09ed7144e6f12ed35"; + sha512 = "51faf8a870124f96088c913345a81c665203a2677f9d1e7fc993a2de34c6181c3e3aa86fd02efb0a11f45afbcb27a27e98a875c71d15cf8d2e6b9c9368cf5153"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/be/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/be/firefox-68.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ebc54fba1a79a88d01b2f9a922a76360ce1c20122f8b3efaee1d3a753f41b6899e642e9bede768f03a6bdda588084975e914e054153853165a3518873487811c"; + sha512 = "4046b43b1d3bdbc721cad19c771450bd02580a29f6d14a6a4c6875b5d6aaa05c4c6afe23d4682246d75a42fe96710cce6f4082395dd67ad2bb2ded7c352b31ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/bg/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/bg/firefox-68.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "412f23bdf1d3aeab8eb66778cb0bf1021f2303c5805dd7c1c7e9779307683db4fe780b8da645ed5f80f45d312b4a53abc07ea8653a1fad810a2fba9360dda281"; + sha512 = "bdca1aa33f7dfb5430bea80993a18d12edc7b395907dfa2c687ab6d8e1b6e8d2f684680056da96e2122523d831a8e20b38fdea2ac8570978a3af7768f36d0c2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/bn-BD/firefox-67.0.4.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/bn/firefox-68.0.tar.bz2"; + locale = "bn"; arch = "linux-i686"; - sha512 = "b5452e64b205b93d0192eed48b6f8d863cdc8eb0f73729ddc59b256458320090c5d2f0e9fee39eff8e566bc8e856469048b52a7418d2063147eda2fd0bcd5b0e"; + sha512 = "ee90ed4ac7182c42459976f84bec6318482f321abdf2048060c1e279bea6764b96cea64b2876fead39f5c194ff4baafefac189e05d264376e2c7a4afb7137b29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/bn-IN/firefox-67.0.4.tar.bz2"; - locale = "bn-IN"; - arch = "linux-i686"; - sha512 = "a26a23dcb510fc3915f89fd74e346f1847e8c58aa65ba03db425d18ef54ed6a332e06e8411780e8d9af75e7f2ad78238683580a37777e1b1a22e0172ad65c600"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/br/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/br/firefox-68.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c46d5b2f5c66f4b70c291d3ecf51fe88bcee952fbd4232605b0a9916bbb6e5c55852a82c6634e9d2b94f791a53da6e67f5876caf4bec0b609f7eacf07574fa5e"; + sha512 = "c697fbb1aebd277d30daa907b99b1e1bac9c883b074db42c24788cce719bd97d036824d517e5c4d88abd92e1db42d3edd7b834a36fb57fbaa3474b45096cca37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/bs/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/bs/firefox-68.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "342ee4a6cc8daceea892ecedd23fe4765a5718d81279ab86ea61dcbd2ab7cc7dfb50898836116c7a694445c162cfa294c29fe3169a180b8d88256f5826e95013"; + sha512 = "ee20cce9514ceeed247f250da5c685d26f6606d9db46e60786ce46e7807cca81b8b2ace58ecc17dedbcece83313cc8aa7b4b12495f26d4421990597e68a8f617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ca/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ca/firefox-68.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e706802e9a227301b5221b2e210a328577180a93cdaf4d5e9c0ae0011ea2e4bce1d55cac2c9546f38b05a45e41bcaf6cd78d7f96b5236ea3a0ff42a229ad5a80"; + sha512 = "e11f71785eb7ea3b571980cfd214d3c8355122d6a6e5a338a7cfe1a52a43f448580109ed0fa3a5f081cc4b33983473459a41f5a2e89ab06ba924a23f446e05ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/cak/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/cak/firefox-68.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "9d3fcf5d19c0442454b59f2c5e65e4a2e9ceeac737edbb9eb7259e33f9c02e5899df7f2b94eac61e846c98b6253b8a6ab15eaa47befad26ef6384a8dd510098b"; + sha512 = "7989ba79d408e4d9d277a9ad29bfb8d8d74bc89e68cde6f026a505e941417ea585b762b21f18c0041c65cc7a3a5447b850f74d12cf2484c208430b4c213bbe34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/cs/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/cs/firefox-68.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "f6926fce90e79da7802cd35578a495e3da7141608e48f2dd2e716c735322f90ae004e49555dec7eb126782e182c337c6987d0b5cf86ffac3513383bb957b43d4"; + sha512 = "1246c3850e8ce51ee7ff844001c1dcb8f50c1e132c22d2ac78865f140248031b0960d5531e115d21e6cf9a6d99f579c902012117045b4153f32e24fa08a77436"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/cy/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/cy/firefox-68.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "2c8cbecfe3cca250ac063257f4965d67bd46a7accca55ba7048a06bff820e0458e9cb8b1a6d47809b49ca6c1963621dffceeea582077f1097ab3e397250db5f9"; + sha512 = "ce07f94f3e5937cc94067b01e59b30d2063ece9b91c0788b0e4ed3c99fa8ae234db42ea19b53e0ef998a478c3ae4fd1d490499bea82082d4c5a2d8374dcb8e19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/da/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/da/firefox-68.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "98440bc2579f87b3c5179a77b8b63b895275701814c59a6ae53a30f858e97d876bfb7a642c2dff7a2077f602f9edc6dde76f800a49f7da0bd434fc3fa2cc5ca3"; + sha512 = "9e78b03982951ba49b4965a6659416ec6ad05a57d38a80036297879c35214c401d69900563ee5a9bcc63be88ef82eadc0a7b77484bd36e1d71ff3ee8e92526b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/de/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/de/firefox-68.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "2ed4a49b2b8ff3b450bfa213c63d32248457b1037600dcb02f3b8d3d086cd50953cf5b6c0a38f0aeb454fffe13deeb49e7d730f001989ed09fa5593bf5c341eb"; + sha512 = "c527fc6c30ec28adc873d6aa98e880b90ef3cfb9b5522996a94f5e45075f0248e3e6340bc4b18549bc7c0db98af0e8f9078eeca34aca3e829853dc08d178c32d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/dsb/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/dsb/firefox-68.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "fbe57e3ebc7c5059ece406b32772e3005776861f115542811f72529dfdac2fce98d002838aa60b6bcb57f31b9575cbc732a21ed072618c0ed0178d6a560e90a4"; + sha512 = "38c654c6bc6cf74b50af68ffac1bc1857ee334d0046c178fb1ad620de5e5c8d06348db6bd64717adeb4c938bab95426c0f12df9b9a5575154570214d2c6f57e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/el/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/el/firefox-68.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "25f17eef3d6d1b270452349d80ae5b5ecb43506f14efa36bdcabdc4c4cec45080d7cabf95f3d68cb2d0febd27cc2f723a9d1396321b9cad33acce0bf62b599d8"; + sha512 = "05c6fd48d2e8d3d8aa29198867136eec1921f4ed7e3539095be5fa9751d8993de7070c92fc5492d99e91f7609e5fa29eb35b955a489eb7180970f0f904cb1987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/en-CA/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/en-CA/firefox-68.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "ecbafedb0e4074be5d8cb390adf3004d6eeb75b9b7e561ff0f161ec8d35882edca50f371366aba033039e940c78d4b9eb2af6a0960694896e2a9900361e2ffa1"; + sha512 = "dc86f2395cadfcee44727b7beca3778badbeabd816787d29efafce96fb6ae2dd3c1ec1c22aa2ca2b80c460868cfce602897e1551f2cce960bbb1964b8851b362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/en-GB/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/en-GB/firefox-68.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "2337d112409bf0012d2f1bb757c8e7e8678d879fb3bcaf54f47a76efe982d9b7a719cefe607fffc0022440342dc15b837924ff1d22d239fdb5edb5b5b578d76e"; + sha512 = "863d32935c992fd0f13c7060650e013f98ae6cad34474d8ba537696dd906bb80a753693707e64af8216f51caf83e0b7a124182280533a8d19e9c9262357a42df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/en-US/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/en-US/firefox-68.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "3efdace2379f042860fdf7f39a757816881b552fbbed37c7693fd95b94c04835c5df6891ec2fe7c09b3fa12beacbc9d22e200fd4f7a73350eed8f9c24437b112"; + sha512 = "37dfd7d1f901941fa61443729125b6f327cef5d310401834bb35ee6a97ea28967b07b321e239dbf145a5ff55e4c3d28a8492a4c5838794c2862beb0847ce5271"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/en-ZA/firefox-67.0.4.tar.bz2"; - locale = "en-ZA"; - arch = "linux-i686"; - sha512 = "6c701d87c4606855cae615904d06d35ec8c7f233987ef3ae72212d8624a2696a99fcee66ed151cd2e35775f3addf0b031276e61b17b2d6008c3579a8a639369e"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/eo/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/eo/firefox-68.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "58e350ba1d9cd0a3d975c2639271f77be28c61c322cf8509618e4358ccdaf27de1954c9616f0fce0e216bae1ba5e8333d595765733e734c15c301af67764c52e"; + sha512 = "cae422321ebf8ff0d39d2c68b5aa92edc02e99cdd749a9fe166c2d6b0ced0ce667b430f29285a89841052c68f2bcd44fe1363bfe594bea9694a9e0461ff5585a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/es-AR/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/es-AR/firefox-68.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "3a6bc52fc479d40f20594121125fdcc9bada9d605ea8434b724f2f3d48df84def2b15b9057b4b11646bbf6810dde063a2469f324c62e126096fe74ac00ed55d7"; + sha512 = "a8391bae6d3611685e1727e0f09166d51727cd4718375b4eaff0de918cbdbeb294f72a5502db2858eb81fe99d7b941f03b7483f0c481199f6555a70b0ecb0045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/es-CL/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/es-CL/firefox-68.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "db035d6ce032905ffde2b70bb66d961e806bdd3103641ff4d4bde6d5a3366baf7dd20326bb8284763ac595b88a8e0ad0070b1c50390f75eabf7103a809cf1ccd"; + sha512 = "7ca917d51fa0554f66821f37057178b255b0ac127e702d81e4e30b49512c335f6a9947590ad10ec84c533e529022c538b43752b04446e8ffa0150af666abc943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/es-ES/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/es-ES/firefox-68.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "44ce9a434905d2272d030d5ce4be09fca6fd4f55b6663f0507ee8c0aee03e4408d26f490c5ffd0cafd5fa6b82c4cd6cde0a8c2a8732e6b2bc662752d53d60721"; + sha512 = "6595348d944cf68072836581890e9a3058ebf5126f4c44b907c8493be51f67f7431e03ddd6f62ea09459b853029ae5c42ef753ce81ae83bd8ef5b99bc3c46f54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/es-MX/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/es-MX/firefox-68.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "ec0280055da2dcac78c746367fee1d8fb99e032173098f9979023e2c12b8fc03edf2c780ee68cf3e6efca735479e269ae9285ffd9f7873a47825036022b31db7"; + sha512 = "1d9317b799a89d0177677c2b7ab10b8260442deab2cab03c6867364f4f4872032e9cf364eeb74036627bcee38bbac173658b5cf9beae82f2440cefd3c6304b84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/et/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/et/firefox-68.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "1115d18b4043600bcb26512b557a34d10bee6c6289b0b0411a26d958d0922c1f52883419f23473aa031748bfa373c35d6949223ce07450910c79bd285b024f67"; + sha512 = "6be56086b78fc6190dd812da88e60662216391db92216430ee8c0123a7f2cf95a7456b7ef7a42d34d39c9c37755568d99992a417feac73d8f3b0b4f46e18e821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/eu/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/eu/firefox-68.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d279b25565ff56dd4cdb77937a93cf5ed76f7c3a0a3ac207b4915e2a8c810d6a8588de47378e76c1214481bf3006e3d3d5ec4978ab090007fa419fd651d05e2c"; + sha512 = "e6abb85b38179a6d33f422ac2e69d677febbf47f823b469acd55e737922d76cd09a34af5b1105697f44ba542a85d9d16674f0dada7bae418a9e3d5b8dfa7edba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/fa/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/fa/firefox-68.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "04f23f63a888d0aa7b5fd33dd4e19fcde637d1590c4243c1286f9471286b80cd584edd57290eb2f43e7f92991ef6a22a8e1b5b5b702347f23974121064cd0d73"; + sha512 = "1f4da6b0f5dc40d653c020365284d33182ea0a115268158f9e22e603ac5f2a951c726518bc859748f955cbc07e032ca0a7c6582e29f9ef1af1cf3a10335bcc49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ff/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ff/firefox-68.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "9f799f595f6eb3eb32ee166f87f8ed4dd0faddd11c24b31031f2bc75c471c7692f7c13509bab36c4f9f00370b7e73bf95f0704d58456060ce2ff9eb610d1a090"; + sha512 = "c18d91c33414a0bf583b5bcbc09422325e8b974e59e6d161027c68727e6b40f81919e97bf812bce093b1d71d9d0c7a404fe1d4d1e8ecd90e6d2813a2d644d7d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/fi/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/fi/firefox-68.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "bba3768d887c0f01d59396c00017ac3e6ef043d2dc6a535b8735e38a7f864763a5b2aa4ed36732a106ac77a31bc628099d39acae94075c659621a0321b3ea9ee"; + sha512 = "079a4a418fb93c59c151af61423ae9ed73b36b5ef6811b05ed8e276323ab51a0dbeb7e247147961920f2747561bbebe49cfc8fc95ab9db4ac4056c1814c77e44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/fr/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/fr/firefox-68.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "3ba16ea5681f031d42eb036f9e3c8ddc7df628d365e44ebf10269c7e3e3e4d5bbf6a996e91e132abc793ec521d1151b0426d3bef972c6b8ad74af845393426e6"; + sha512 = "b7a668487d9573642f0499e27d7ef7b56ef836f132c3c8c1c58da05477f177489dabcc316297e16ade0405d200c6d66073a883d534b38497e6ed8f20e0973760"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/fy-NL/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/fy-NL/firefox-68.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "1279fb954b0dc5c2e2ce38e8ddadb88f811c6dc4449d65bf85f6ea62351c64b61d06ee907c68ed85beed25d7727b4c0c70fe6ae056f1f7b13b969713e2106a2e"; + sha512 = "302ab58859a2dad709e20b9593c5020c02964bd6ac71aa21a0f8ad321c12c4ee24a6d24fcdd88735ff60411ac8c137837a2f6f86bff24b415a948d9384a02f65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ga-IE/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ga-IE/firefox-68.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4710e9ee57772dea96042153097c29d90ef9dd94836e5eb40d8fe302e42f8be9a2b1315a194955c5990f10f43175ccc1b72772753211fc4e592b15139f1b6ec6"; + sha512 = "2e47ff4f35e8ee118aae3f655e38f58d9730bf86f6bc12080a514a9761f96f340d3f25f7ac55c4f95fd3118c4f5ff22645c4d26c3973afcc7666f3bdb644082c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/gd/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/gd/firefox-68.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "ed40d52447fe066e934db434e700b30bf5f6763c506495363d5fa91cdab1f0fc2a72c30506c574ab80b42aaaed97d2dad0dcd25791be53fbd8d3bdf3f19b367e"; + sha512 = "bbe4c3ed5f57cb6eba8856207d112d350041113cbf72d473b28996de733fdabaac3d83348e6940739a957205f12527c8f11f589456c62243b5a4ec60832644da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/gl/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/gl/firefox-68.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "7ddb53a5e5c23d794492c82643c5c902f1d4f8c3a87f541c6dc7a409091f06ec3226673fa52430cd28d4ba4378e61731f0199d83e19950d6d69e8b66c4f29e6e"; + sha512 = "60214ec1f9aa29b979fb67604b1e16d251a872cadf8c3da604ad0c3d01b7f73cbb756968760873bbfffbb379734caba66016dadc29c8e487cb5641b4a9709a93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/gn/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/gn/firefox-68.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "e55c9b6bd2868db442cf160100acd00a746c4dff5a7336384cb3fda3b0feaa3a00b5586a8c0f1c8b6616563dcad44f8ec2d97d073c3dc8f020e6512ccab2b43a"; + sha512 = "485960787162c311d05dd4c028812691e9869dd8b57aa2fb50aae47733545deeada36c6518d060251d1a883377cff787d852648602c554d70e80c652f28a431c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/gu-IN/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/gu-IN/firefox-68.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "d407a0f97c2d70f8e09cc7fc99ef46906edbc377e7bbcfac1ac5410ad653eeb854d0980668b2f23ed62e768d560901f18c390857923715949a0f8f1a0dcd85cf"; + sha512 = "15dbcfb3db5d6e60be14af811f5ae69668a330b4e59abfc75a4e90db91390bf17716d7b25d2d65783df5baf9b0e35babff879bdc26af661f98364f3996972ade"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/he/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/he/firefox-68.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "aca94bf7da574695d3116202e2df381617d88fc45a3b2ad7a0066452b870faa24e1c1de7dfe2114a33261a623689ce9f09d8498d49987ae2ba1db8f447452cec"; + sha512 = "8f15a5512ff4c5ab9d94092e8b93d36633b31b8a8c5ddaf2b1621d2607defa01bea3d6496f88aaf6c4769bd16a29b8df7b173667290cd1637e48835832841102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/hi-IN/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/hi-IN/firefox-68.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "4f32f9d92ed40a16e0c64f78d2554bdd8bb383a12eaabf54df224b9f1faa132465dad0182ef2852abeaf5d3d3ca1f3d49e40a4f98400e5f44db40d69c88d4ebe"; + sha512 = "a84d627df710941cf2997ed842f75c0d61e699ca4d2960846dd2a012d87f085b414ae91bce178e1f1cf180ee964f0b40e1741b2408ff9a340005cc56c314bb42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/hr/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/hr/firefox-68.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "33bdcb0cd147cc3ff33b2be284df267926d9b001ad347630c3d66eab1cf2b874c04d7853f2f36fbfc8680e02673cd254d216a5e2660e2cff37014224269583ba"; + sha512 = "d0deccb5b7d0ff3a8158ed293c84ab015bbf3ab9feef7f881584166db649ff0cd66797856c89b178c81862b0a23a55cc50824a88108cd322d84d4ddced5ae56d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/hsb/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/hsb/firefox-68.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "9ba075a1825fc9ec059b17049c3e1dacc7c78b3ee744a06e748db05df1b46d5bd74e348d887749f01ad5c8d0c3f6bcb5d27fada572fad33d462d9cc80c5357fc"; + sha512 = "0d929bbf4350ae0a450eda2258b642dce44d232b18a4942590f5a47a271a6cc5ae2629af0fcfd916402adc593356345f1e92a6f9ba7f479bc7b1be9489349369"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/hu/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/hu/firefox-68.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "3df7a4a27dfe0366da893297c590b03d9fe4130df6af575cd36cac2d77db2342229274539dbe66b7d3765377ff712a913e988823c512f803a9dbb4fb0148ee06"; + sha512 = "040b30479f3db19d56daf0cf8541e6ed7da7952be75b3e34b5ba39e4cadb4e48214ab39df5d54f000c2ccd242ef00924ea56de11be1bc6636d9e334a457cfc08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/hy-AM/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/hy-AM/firefox-68.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "9fe26d24dde3199d9a6aabc8928291c7026b3820805d95ddac852f2b05c008698bb455e71338a42cc8a6a398c2245effccea22e0a85cb1d77c7a8f23b3757c00"; + sha512 = "835bdfb4eb527c815e46320a729be1695ba7a56aaabdc19198c6e2029a69979c6716a0640dfe55a8d7b5086643c2352e8adfa0964a5bfbcb831a1a2da287430f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ia/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ia/firefox-68.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "5d37b96915afbd0764bc47d64d5b0d0301de97431e1393ba12e0431374fe9e4bbf7b886e0a4c37948d5e2c6aa3c4f02311920d5596828366d00a3831914cce82"; + sha512 = "400ea5d0c6dc2b3a4f7c6c054f89de89e836994608ef956016ac5a17ae5893b3a1db8f5951f44f2ef2e76124a88662a6031e975381007925791401d8e7d825da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/id/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/id/firefox-68.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "950b9d6ea82dbdbe5220860a2b187e95b06dfe09cd91ccc8689ce9cf44724200e8d75bdfa9a77767ae03931359af3ae817cd86096ccedb20e95b53a332041d7d"; + sha512 = "34164d93a3dd8b7dd5a3ecf85f744ce706f33838b202050c4a7c32283e1f09ba6d40232af79b729e9e12d85864c8d8c6f4515b443320a0efcba8eb5bc4421ecb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/is/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/is/firefox-68.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0d2203891d42930a5ea16f101aca540c6483b0b78f44aa4c4649e63a9378f1ef41b7132a05013a6a09e80aeee17fb0f4636e1e2a16e74eacbe8b9f36b6133615"; + sha512 = "5462c980419738e0db5eb9345af198e6d090646e12a70f9cc9c9c65f7732837e9e57d98ddce93d11db47bed9ec661165c17352f699e47239f78308f4e828cf3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/it/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/it/firefox-68.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "be656fbfe88663034e75506607cf853a3a3bee5e225b3ce18b9dc50f7ccd8c44441719e4efedf5e8c85fee3cfabddbd9d1fba5ff64b1b76c2a4d7bccea4e5976"; + sha512 = "90875707e86b58e0cdd456a59c9dba08cb195f5e945bd0a716ea08ac3839b8143a086941f3a34cc928fead6a74b09f48dd25a61611d53e4cef5343eaee60fef7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ja/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ja/firefox-68.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "3ab89940a7026b73ee3875f7b1d3907203cd444d60e81f47ffcdf4b7d19defc7ad9ee330a2ae3ecf5bd756839992241c73849ac2c3c78316240ae0c2ee147275"; + sha512 = "d80a2152c04ed3a41a5d8c65847d26f7fd7a0003b50625bcc741a3fae3aac5e4b6e9b8f24c718936cf3698c65dbcfc89ebd1c55b1077d64103dd6e1c0293b230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ka/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ka/firefox-68.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "6f89d79a6c106be67a7442c0e690eb51d1b1b4c79c6439f05fb47a810690d9a0c3a9827e432b2d913093e3407382a77245860c02886d1d45d5621e513b3b2ef1"; + sha512 = "fee5c2e5ab258e13042a5d582535e5eb67b05e241df7b839f50833740b05afa05fda347e0c8ff8803053799f7d09f7007c4b6e5c647d8e313d9ece535131e247"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/kab/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/kab/firefox-68.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "def58e13253b056ea526e63d58047711d7c137299fdd63897055ef231f341d64cdeeab6b7092d8cca8ddb1f60547f6dfdb67cec2811df24da2e767ccaafb38e5"; + sha512 = "6154ab3d0409d26bc32e503cd68147c1c72b4328c18174a95dd4ac52309ccace8e5dda1d2687867cb784bb682720deaeff17955320c6b6922f807738f25a9cbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/kk/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/kk/firefox-68.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "03deae4c54d87ad87cc152f8977156cc16997f3a5593d26cfd7950b05bb39fa7392d6b6dccad265700922776f2eb2b4f4e77d790e8eec32e7c7c618a058b0362"; + sha512 = "c4e628cd9d16ef12e46d8a8dfec3c904e6145c71bea86630622959573ea516a92042726e9ade567f1f6a82a56033392e79e380ff19057026b2500d0626bb390f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/km/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/km/firefox-68.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "bb29597b7d42e7707c5098d811605786a873cc9d74834485a4426aa2898dde727e2cd6ceddad80421605eb9f4e9e17fad739e1469c90c8f71fcd7862b7a93ec2"; + sha512 = "6323eb37dcc8020287a712364d2a1233aec8556b14ce70d431892889c323100b2cfb45a9e92ed1090cabcb16a2612a6f00e4758eb9c182f20260485ed16be1fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/kn/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/kn/firefox-68.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "1264cd2228d0fbc327eb3e3448df8e767c53a24010be21433a318b22e260a72079c7d7edf1762a2ad63b3704c0fd7399cfdab691baccb2841b566556a603c78c"; + sha512 = "fa2ae302dbc24b87b832a0bc56b36dd172d4506e50a1034b579ae7091d88cda81735db2514c52a42311bcd4497c2545dbd173c7b8eee09885675e836ee9eabcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ko/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ko/firefox-68.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "5eb15947e5abfca34f90f6fa148eb4457c318cf84e1a48ef381d8142bccd7ec7050da31bf34b78a38d4f76b60bb941d9227d00111a96f2933a023dad8d47708a"; + sha512 = "46356f06c988d22c6d61b0992d827669838bb4019b450f219cc5a5124589ddefc072d97c1fab33927408a02649c579377b9f1a1c23a5b5ff1bd9abb3df663130"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/lij/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/lij/firefox-68.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "324d7ca1d7f44eebd2a7f653b8236c9db8f677e5eb01864222330622a7966887a8ca120f622b5268b6a8eac405c3e6a20f767857cdd030d964d10203a18c6127"; + sha512 = "174427a5da567195811f2d12f60e0b2ab063980a452a60960b591a36e8094d0a495e0dce10b068a0db0793fc6a6327e957caaa27f3bd86293658ce2df1bdf89f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/lt/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/lt/firefox-68.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b8b0608a664c058548b2c0476d8be3b88fc67ef7a4ce3b72245326560445f6016ae41e7b7d3f4220fb70a47c12806a9acf3462615467638de0bc75f6b41a4d2c"; + sha512 = "39ce98ee07778e7a5275b22a2f68e81bb0363fcebb0371dbfab8b1dfc7aa8f7a755b5e49ef1f3c29b16999a5a3a9403bf1d35309969ea2ff539cfa40608c54f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/lv/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/lv/firefox-68.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b64102c3569d9330689d32a5cce5ff1a4995b05ba9f1f761bfbe2103d51a79375668b11d17aa755839d998256efd82dc0b12395ad1d70f14df2f70cf80288c90"; + sha512 = "d631400d24bd3790ce62e2e9ec5c3e2716fb5849d014d1d57122d5ead7cc9857ba46ab6450bb72bc05b94dc4d6022b693e82713dfd4ab934668c769452e0c1b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/mai/firefox-67.0.4.tar.bz2"; - locale = "mai"; - arch = "linux-i686"; - sha512 = "f87d2bcf31c64ed1d33b9387a9ec24ad8862b850704fef7d7eb2ce93209bd6cad05f399b8866d58e399af015aae36d610ff9ad744095ed271875f12e89abefa9"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/mk/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/mk/firefox-68.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "5d086733ac69fc05c8943c27748df82fff1698920457d972ea21b4169bf39b04f6d409bf78febbd68803084bb6836fa9dd8504786a0e076cb3361dd49b1b6f91"; + sha512 = "eaa6ef0130cb39bc626523ccf6b884554c2abb31e1a506b779bad7b9be3442c95bd6eec0762bfc99f8dede2596173daf907deef7612c6ac86e8d3b26a355913d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ml/firefox-67.0.4.tar.bz2"; - locale = "ml"; - arch = "linux-i686"; - sha512 = "6a3b1c5e76c89e820da58997da44ac0282b985ec16be23bef3417f3d1a8995bdf03de59b4cbfd3012f7ffa60c460cb6fddda3b45d87df175c3ffa5e9a2f6fa69"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/mr/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/mr/firefox-68.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "77e19235c5f6fca82cdce3f22dee23875212b536fd41ffbd44cee7ded54b64fed67b1965150f6c6487dc49214c42aa9fa9219b5bac9ffdb107bfba8daf3ede58"; + sha512 = "48c05b3ce08858113f3c2874029d78041930ba79ead74a6d2b6d836f057763be624f66264210a091a60b92a653b4dce22a5210fd1a7469078612940474a66388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ms/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ms/firefox-68.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2438462e98b45df9527247e7010ea4611e35e94562526bbf1932e35d1bdf2ec8b50f8ba601d585cd5efbca535f146ecc3a8ae609b2939af3d9c11f9134d659eb"; + sha512 = "ada772d59677f4c7608617253c34d89df25638816e38533c06dc157b378671fd23b1ad6f1176212748c5330c25753755665c1174164a284b028ca7f078ab9aaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/my/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/my/firefox-68.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "7ac6bf9bf2fea58434ca4eaee2c4ed7bf0f0299024cfa69207caecb1e91c94484603e0f127791c97f9ac8b5d59e2341a6aba854c4e67e80e6c3086a1eae94868"; + sha512 = "2f3a3f5d2a8f505106efafad5caf33613ce1929a80c02a0b0138ca6a39c8db0012d7c27b0ee00d1a39d7c7291f52f351feceddc1885a87bd715ac35892fc3d63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/nb-NO/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/nb-NO/firefox-68.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "442b1fdd9968f09b42cee1b54166df4eb4eae24cb2115ee9e966ed7590a2a75ff0e2095b83c1edf7463a30cf24118f57c93317dc69ede1aca1052584cc685657"; + sha512 = "6c080669b4903e7429252d16a662915ba420e28d8b290686fae7d6194a5077a78ed358488241c92d3dd9f26ba343c8ff9b79b116a92c7af99dcdcb4fdafa46dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ne-NP/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ne-NP/firefox-68.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "2d14089dc61a36fedc9583a9aa5215c277b3454e7bbc1b3f4ca3ea48e4456e6bb5993db2f9e8433b7db1f373c46b8ea9834840b61acc1283ac6b5a2608b8018a"; + sha512 = "0d5f08a0c2ddd132fda00c742099323441caedced36994d0521869175af2a0c43c1465623be2299de508407061521dd41eabddb180194d4183ab270cd430f781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/nl/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/nl/firefox-68.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "7fa6bc5b35d685019b800ec742e420387e732fe4fd60451ebc7e8edbd93848d6697fc850034ece498333c5cbc782404d7b0730bce3f83944c8190832401d2ff0"; + sha512 = "a15d64d1c9d9d4a59fba4cb67e6425cd68ad0b7050b67001909262e9765af0501b3d8a270c321e9b5496bce14a84d77be6fc11e65fd28a54807f707051ee2458"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/nn-NO/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/nn-NO/firefox-68.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "fd979510d0b3bf2f865af9dff39581d483a82984e845ad59485e61e824d64c3a30b774d8b924974f039b5e2c8a8900c74da1df48bf5b92465f65c0837a1ce5a0"; + sha512 = "50cfed4352dcc571193fbf832be4ae20486d6f11ca5ef06f46fc24bacea30a431ce99aaff2ecf5f0efcf475cf855be45292080f70664249aa5065b467101a0ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/oc/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/oc/firefox-68.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "49135cd6bacaf99798eef21670f728c02cac84a2c278b4e0d83bdc5ac36de8c0d568ff5925b55f9869f202c117b20cdf901c52703b5452aa1258d72d811d01c4"; + sha512 = "8497da1c9b49ebbb09d70a8e84c76b47868ebaa116127db68eec97e8f336b8aecbd2fd39d7da51f12b166afd9e477d59ce620baf8dc3ae8ae97a2fbf07d627e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/or/firefox-67.0.4.tar.bz2"; - locale = "or"; - arch = "linux-i686"; - sha512 = "83b2b21f39641a80c48e6c7d0659f0dc4df627fd40d86c9e5a80951b83da9a51f31c6d180be3e22314330849ade32e559cf36a3edb10215182906d9d0313b753"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/pa-IN/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/pa-IN/firefox-68.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "930280f01912ab9e83b9bf8fce2f946f7508a20241ee11e83b03ef2fdb078646c485d39e85e9995edf36098a86b6d84b8012da29efd56b44847b50d551ab47f7"; + sha512 = "e02bab0b8f649f6c1324061fa6efd4f1670f99f9bfa552b344fb3e43ec0cafca4807212f8727ebb2d90d57eefe2b6c18313c8272fe777fa92d9828ebe22dfaf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/pl/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/pl/firefox-68.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ad16ee9963517c6c6c3338835b4659d83401db21b843a7799bdbb3ea4a786de5c1995577ed2b66f63e6159481683f8a72d0d7440fea84223fdc2c788c3084c03"; + sha512 = "b88cedc985dce847d9d8504dfd3b726667b9c3596349c4e65e0effd2af3185296f0eeabf412dffa6b523cb63583815c9361979722493884cc4762f81ae3b6507"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/pt-BR/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/pt-BR/firefox-68.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "4e0c2772120d3b1c0b231c7ec9dcb331e7095534c1e63a864b46cc1085255f6367a575f214f45e27d3d0ff98bb28d63c945d944aaae2e731436345998824d2a2"; + sha512 = "b82f0f7f3eb071272cce5452e3ad5ea9718fee76c9881e40bedb7862b7dde7bd7b0a07442891feee15d0637ce0023d9ffd98d30950eb2c4157aca1095d44cac0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/pt-PT/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/pt-PT/firefox-68.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "60fba6ace4c4ddc5ce7b4f114d415c83d6f6e5464dd0a9c5fc186ae84fc3e9ebcd5ce952a8f8975aa4a43bb5214ccd9525deacac75d2a3a458ab7d89e4ce10b2"; + sha512 = "afe28d592dc295acd7140eda084ea6040aa5fc64b548f04bba547c4118d53b243c28e25a7a2e87a5750e500eb31c0b67a9c7881e796dde1451948154b72deddd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/rm/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/rm/firefox-68.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "de6e943eebe7c252e89cf38901a75f900dad2a74ac8ac52c4a89996684e9973e7dad5dbdb51e18b0d57844ca430c2ad19da1e65063397c112336816563a8833a"; + sha512 = "6ba0a99e82345ea09ceead864bf4ce077ef82e6a7c243cab0b6ddf037a1c299ed54198cbe069a8f9f7feb14ec32bd5f3b60dd0c20797b6703493f6ec84e51169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ro/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ro/firefox-68.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "4fe9ec3ef4cf67b075d6487671a68eadad07774a2c0b8bfa36193949e0b07e1cc81fa58f6b5d999413d6bd8d5772a8b1cdeed913c9a84a862d9a27db3fed91b2"; + sha512 = "27d4f1cfed08d8c51cb76759324af81ef4071352a956e6f4da1fd03e623ebb7f5319b85e27df27f9067b5f86b062d95e381b70c22f00aded622a9371cdbbb5e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ru/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ru/firefox-68.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ce6d3612868aa36c2c757b4259283577bf147d5a4d642c3b4e3925d6c6dc1c46744173101b692c8eee96e871a64c7871da992e4a8213a8ebe8f5bd443a7863ec"; + sha512 = "baef019f8f4450f02571c5dbd42268be8fe17879ea23ae1f9053093e6aa6ba92ae0323e2e24a0061ab41904185fe0afc809d1a3a8c0291b593f2c4065fe3af99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/si/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/si/firefox-68.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "c244f4a86f46fac28b38ccddd391b84e5e6d04398efc117a07f9c32486963a62e20dca11666f5f0776e8cd33078ad8861a40352437a53fa889b6e834fbcfade0"; + sha512 = "8c10604eea95adbcf8aa7e7a76ca0facda741596ea31f3ea9ddbffef6f9e99eee14e5afac25fe2da3df102b3a7a6932661378b90d321a1ccca0ceafed64bd394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/sk/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/sk/firefox-68.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "8dab8f2b5f5e67be82149775ff5985a9c8e5161d562bd56633725baecb0776dd78e6f2c878ffbec9e55cd65140c2bad7413c980eafee31090f70adb3c603a9af"; + sha512 = "973199eb4a590a56eb797e8ecefaa4e435c4a8d7896024e6a1eca1f1d3c2f73924a2724d0cfa74a31a6c50f4afb4c45f61d6f403067243948fd06540ba869aeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/sl/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/sl/firefox-68.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "1df3ad4f5edae06926ba0779fc18552936fa07a4471d59e20591fff0ae4e36138277cf563feb128c41d34efb26029db6aa147a4bdcc872918b9c251783a75aec"; + sha512 = "36bbb0113f68a4d040a95c60b5ab796c8562db641c03eccf3edf1272f94a4c1f1850b8588c4c01bd1b5d94d5137ff97441d95037e0b68ed6b776ada171c4ceb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/son/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/son/firefox-68.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "0ccc7e9e9f74b9ab64584fbed7909baf706345986d788c33ebfd66712602a1d19ed3087da304ce911b8617c2463629309309c4798bbddc6d555630746db39929"; + sha512 = "4e243138ad6991b464e0ad9c5cb93788e0a6d30c840d1e31c60517c05d50ceec57075eaa9dd63d789b0030118cc17d98a8ac6014a9b4b0e6fb0a9cf27dbdcd32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/sq/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/sq/firefox-68.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ac47afcbc6311ebf5d5b46c9ed4d1ac5f00581180e365d1d62a7927ebdfbd8a6389e03dbc5887809a5991b5e010eeead964394350aa333d9294ac16ceadaa79c"; + sha512 = "3549297c0e4fc4e09250f6f7dd5bec54bbfabea8acfd70fedfecf376f3cffa61c11ab83d68307c4db7c34ba0e5bcef48f88f092312a1e5ab85dde37cbcedfce4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/sr/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/sr/firefox-68.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "204059de691624a417f39303060369982e08c21c7a2191b5a838a315319cc944a89a67c79dc2a4908375091bb08dd6e1ac7556e2fe38981af62c460a5dbd070e"; + sha512 = "939fb1a0d54053ac1d53c9ad41057e100aec9379bc4960c8788f9f0f0c92ddff2583631d9c64834b708cfc96d2e0e0944b6718e1c366fda4bb20802608b0d9b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/sv-SE/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/sv-SE/firefox-68.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "0a820797f23f6c6df8c2c807d3cbf3e48c6ca644c94f45ac7e7b58d5bc4a0cdb836bd35ea3f5d0dcfc14dab74d3eea2af1b40cd8343f1b47d365fc7eb42d963d"; + sha512 = "bdeec5c396c7b00f4d7a4a8d12a002f4ea1c8fdec382874c2424bd5ecd8ffdfb21ea8ef08224c870902b1678111c015f823ebf41588f68c02e0ac96e324077f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ta/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ta/firefox-68.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "77de338d3ad77a0e5616a8c4a15673359c569e53e5568a0b40b6f341d90f2e3bda24db86e9649642e7d69872e05ea766e863c9a333396043764d599d133313b1"; + sha512 = "35ebd3fce76f647b3f1a51bd39e8da5b1103acc8e6e26b65dabaea3d7b25107257d516a5236363c7c500c22d22c11d00dc3026fc3e569d136a56265572e6f50e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/te/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/te/firefox-68.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "95b98e4d5dfceb547bf96b5cb27963c7b3c7786994cc1a6d5aee243311fd7e6c6943dd16d7b063cb773dbeca5262f5ad22413a57e85ab90cd79ca417b4819355"; + sha512 = "dcf273cc1bbd7df8cac3c714b07cbb70153485674a7421820a1ee4dfcae5d68f47ed12712088e65b46c1b907dfe69bc4ab1fc67bfeaba7b672eb7b3fccfe22e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/th/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/th/firefox-68.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "dbe70905a9b04fef460ce0efefcff4a7c16782e8e361ce22c647287625a2d2c088c5fb1942634bbbf9ea000f1f31422c3543028cf07e0cace1a50015feb940f0"; + sha512 = "a26bf5ed87b9eb40c9539eae142a03a33deb3813e57ad3a8b4828e78a563fcab2630abbbef8c866a499540d44756cd4f5434da854ae04bcd2cfe0df85cd59351"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/tr/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/tr/firefox-68.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "56ae21e90b2d03664e18b3aaad9764613f4bc587088cbc8321d686ee6e4f1f122ff6a973a0bd8e38a49292d74b8181582d62d749033ee48e774c722971693b99"; + sha512 = "b8e0cf35ac9f53895a94dd1df2f71256eec331e1076558f8738dbb04744bfcd1ea672e54df19c7d0be4255d4d259362994acbec72eacc91c21ccc413b990f98c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/uk/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/uk/firefox-68.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "3cc450d78f77442c799d5aac7676d46792a6424158a4fafb38fd836281ba8a138b48b9221ac19326ab8f95a60fa2b9bab00d24e4cef2fa362291859b9460ceef"; + sha512 = "50f9a7225ed7130d1f612d0f2a1b7fe6eff93f59836826057ce75a3eeec3ad078e3cff524dc123f1e92ab523342cea724ddc1c09da8a86fb6847ad2dab773ec6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/ur/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ur/firefox-68.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "2402744ab2fa8166cd12ac91c8ef7e6bbe1373d6fa7c0da26f0a6fed3b56944b6b021d5e88248b66e40dcfb149004e5790b39bf0c937142b2f00745ad3b14d1e"; + sha512 = "5cc90daaacc19954cc9086dcf5b5f747d8303238bb1514f7985c8b5cb9314fddfd425f524417a8ca5e7b50db8241986e43f1a9727b22c7978452802e76ee9716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/uz/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/uz/firefox-68.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "98a5a869cc1378ba2fc6d54c3179e739800c7871cac10c00a449e4e4cabb2e35173a4310b62ae8ce689bfa341fd6a4b28b54119399dca3ed308800c793a957d0"; + sha512 = "7d7d3a69d39451414232fa6ada7c31abe3b0807c6a95147b505b8972828ac8315f130c0893881bfd1b1efc9f8712dbbf71267109f212e171f7606d18e58c3076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/vi/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/vi/firefox-68.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "daa5fa6676f12806e951c329e276c2360cdb17e83163cd2f71fd3400994ca478daee33adf7dd6459c8b825d4693c0755fba3051851e26833324e54d30f8056fb"; + sha512 = "fc3edf8262f75c2ea210ea43fd1c8efb067fc955ef8f0486b7be211dee50d6fdba891faaa502cefeca42e860a21d8dafecc9535e1258b7cdcece40b43c07de5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/xh/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/xh/firefox-68.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "ab6c0e09eebc112b13efddf7587da524f8afb35683d543e70196a63bd9966b7d2beb05778585aa86d49bc994cf51ed5e985b5b1da1cd6b3819680d9a8fccebd1"; + sha512 = "27655e8458d67130500dfd2e1d1700972ed03d2bb47c698aa42460e4315c99f93d2ba833365c1c78ec5b8735e2162a90e74f0393ee0a9106ea6fdca9698e292f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/zh-CN/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/zh-CN/firefox-68.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "a99a71a0f62749844a42664e6222d11b2fb25e0ad5af42eb062b624e8c929593881c8a2821a097dbf32d0ecd34f8c24e58c4dd0830d6f586bf60aafbf5ca8a57"; + sha512 = "061fac502f7ee5c5afa6946f704eec47756ad39d4107ed75a838d9c420603bb662963d20e18fc5d41d8a0b3d72fefb7857ebc87bb6cb5e3fb7b79af521fde789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.4/linux-i686/zh-TW/firefox-67.0.4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/zh-TW/firefox-68.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3399ad8de9c6bc12ecec297e46ba1a0c72e9d0fa95b407f333189aaa7da696bb74b1099791c86b40432246de9359150add28d2810dba535eabe5aa7e0fd74419"; + sha512 = "3f098a44a58a42b6ad7132fffe32454459e3261815c696278bc204db145c83948b08e254352744bbbaefed665ca3a148152093c81f1324e5b7d34223b9c6aeb4"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 29b12c9fec0..f464972a9df 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -4,7 +4,7 @@ , isIceCatLike ? false, icversion ? null , isTorBrowserLike ? false, tbversion ? null }: -{ lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL +{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper @@ -164,12 +164,15 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) '' substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' + '' + lib.optionalString (lib.versionAtLeast ffversion "68") '' + rm -rf obj-x86_64-pc-linux-gnu ''; nativeBuildInputs = [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] + ++ lib.optional (lib.versionAtLeast ffversion "61.0") [ python3 ] ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0 ++ extraNativeBuildInputs; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 93449288075..93b6843e5f2 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl, fetchFromGitHub, python3, overrideCC, gccStdenv, gcc6 }: +{ lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }: let @@ -17,18 +17,16 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "67.0.4"; + ffversion = "68.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3krwkc90m320a74vjyzlrxs4jc63cykbmpgisac9kv8m9n0bis5i1yf0dl9n14d9p4p541wvzhqygx7byj6mnvkhbk5b2l0nlvwias2"; + sha512 = "0pg8ww2ldlvdlri0zrzv20x69x00gxshr4afq62pnz7rgrnppkdd0pw5snflisgvpxq1syxcrg5750wz1k4bfjwnyq47jk9h3fzddpw"; }; patches = [ ./no-buildconfig-ffx65.patch ]; - extraNativeBuildInputs = [ python3 ]; - meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; @@ -72,10 +70,11 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.7.2esr"; + ffversion = "60.8.0esr"; + src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0mw5dgrxd5vj6cngd9v3dy6hzdsg82s0cs9fabhrzrl1dy3pqdkccqqnj9r0hxwmcrdgca3s35i5lwwmlljagq6nyb5q6qv4fzv0n0j"; + sha512 = "0332b6049b97e488e55a3b9540baad3bd159e297084e9a625b8492497c73f86eb3e144219dabc5e9f2c2e4a27630d83d243c919cd4f86b7f59f47133ed3afc54"; }; patches = [ @@ -98,6 +97,28 @@ rec { }; }; + firefox-esr-68 = common rec { + pname = "firefox-esr"; + ffversion = "68.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + sha512 = "29iqxxwkz2zgk2ppgq05w0bhs8c0938gina5s8brmwn6zn15nv379pa82a9djpzjryl6c5ff0hk0z7gx6n3xvf7w7ky9010h9il0kbg"; + }; + + patches = [ + ./no-buildconfig-ffx65.patch + ]; + + meta = firefox.meta // { + description = "A web browser built from Firefox Extended Support Release source tree"; + }; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-68-unwrapped"; + versionSuffix = "esr"; + versionKey = "ffversion"; + }; + }; + } // (let iccommon = args: common (args // { diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index fd047147e01..1bc7cea54eb 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,24 +2,26 @@ buildGoPackage rec { name = "cloudflared-${version}"; - version = "2018.10.3"; + version = "2019.7.0"; goPackagePath = "github.com/cloudflare/cloudflared"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; - rev = "41916365b689bf2cc1446ea5717e4d26cc8aed43"; # untagged - sha256 = "109bhnmvlvj3ag9vw090fy202z8aaqr1rakhn8v550wwy30h9zkf"; + rev = version; + sha256 = "19229p7c9m7v0xpmzi5rfwjzm845ikq8pndkry2si9azks18x77q"; }; goDeps = ./deps.nix; + buildFlagsArray = "-ldflags=-X main.Version=${version}"; + meta = with stdenv.lib; { description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)"; homepage = https://www.cloudflare.com/products/argo-tunnel; license = licenses.unfree; platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = [ maintainers.thoughtpolice maintainers.enorris ]; }; } diff --git a/pkgs/applications/networking/cloudflared/deps.nix b/pkgs/applications/networking/cloudflared/deps.nix index da7f509378d..e5ca7be0070 100644 --- a/pkgs/applications/networking/cloudflared/deps.nix +++ b/pkgs/applications/networking/cloudflared/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "b26d9c308763d68093482582cea63d69be07a0f0"; - sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; }; } { @@ -36,13 +36,22 @@ sha256 = "10112y4k8qing552n0df9w33cgminrzm6g3x7ng0vgin4sv59785"; }; } + { + goPackagePath = "github.com/cloudflare/golibs"; + fetch = { + type = "git"; + url = "https://github.com/cloudflare/golibs"; + rev = "333127dbecfcc23a8db7d9a4f52785d23aff44a1"; + sha256 = "170hbv9wyfmb5da9a6wjz2mphp0pylv23h8qp8h5kwa2i9frdqqi"; + }; + } { goPackagePath = "github.com/coredns/coredns"; fetch = { type = "git"; url = "https://github.com/coredns/coredns"; - rev = "992e7928c7c258628d2b13b769acc86781b9faea"; - sha256 = "0mvlkca11ikwzii0p7g5a2z3gn1xrp7qmmjwklp4i52lbnsawzv0"; + rev = "2e322f6e8a54f18c6aef9c25a7c432c291a3d9f7"; + sha256 = "0s9x5yww1qd9pzh2w846g9qw0n86ygymjiqjn15ws6ha3nj5p75p"; }; } { @@ -59,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/coreos/go-systemd"; - rev = "39ca1b05acc7ad1220e09f133283b8859a8b71ab"; - sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1"; + rev = "95778dfbb74eb7e4dbaf43bf7d71809650ef8076"; + sha256 = "1s3bg9p78wkixn2bqb2p23wbsqfg949ml6crw2b498s71mwh8rcf"; }; } { @@ -77,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } { @@ -95,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/equinox-io/equinox"; - rev = "f24972fa72facf59d05c91c848b65eac38815915"; - sha256 = "1d3620g1kxyzn8b3py2471qp8ssyzm1qnpbap9gxrmg8912wiww1"; + rev = "5205c98a6c11dc72747ce12fff6cd620a99fde05"; + sha256 = "19gya2zhs3xqfjh8y6s63yw9q8h1x710rl1drf4a1fmgdhaf2lrv"; }; } { @@ -140,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; }; } { @@ -149,17 +158,8 @@ fetch = { type = "git"; url = "https://github.com/google/uuid"; - rev = "064e2069ce9c359c118179501254f67d7d37ba24"; - sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + rev = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; }; } { @@ -167,8 +167,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/mux"; - rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + rev = "c5c6c98bc25355028a63748a498942a6398ccd22"; + sha256 = "0im4da3hqxb6zr8g3m640qz234f5gs0a8hqhcz35mkvfqlv48f62"; }; } { @@ -198,13 +198,22 @@ sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl"; }; } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + }; + } { goPackagePath = "github.com/lib/pq"; fetch = { type = "git"; url = "https://github.com/lib/pq"; - rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; - sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; + rev = "51e2106eed1cea199c802d2a49e91e2491b02056"; + sha256 = "00kp0k7sd7xrv92crd2xja68z096b2fw0mlz58mdjlri9w72hqbf"; }; } { @@ -212,8 +221,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + rev = "3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"; + sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; }; } { @@ -221,8 +230,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + rev = "c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7"; + sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; }; } { @@ -248,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1"; - sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; + rev = "73601d4aed9d844322611759d7f3619110b7c88e"; + sha256 = "1frnj97bbch1qhg55fx2yz6mdjsz8fw94sj7pkrjms239j7vqcvm"; }; } { @@ -257,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/go-homedir"; - rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; - sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; + rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; }; } { @@ -266,8 +275,8 @@ fetch = { type = "git"; url = "https://github.com/opentracing/opentracing-go"; - rev = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"; - sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; + rev = "659c90643e714681897ec2521c60567dd21da733"; + sha256 = "0aj9cbm21zsg1i5l25hz8gn0yf99yxyxcp1gqh3yd5g4knj2cgzf"; }; } { @@ -302,8 +311,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; + rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; }; } { @@ -311,8 +320,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "7600349dcfe1abd18d72d3a1770870d9800a7801"; - sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f"; + rev = "a82f4c12f983cc2649298185f296632953e50d3e"; + sha256 = "0pcgnxrv2i31jljqzhkv5hpdz92f6zrkh2p1i7i59acfz1fxhq0s"; }; } { @@ -320,8 +329,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a"; - sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f"; + rev = "8368d24ba045f26503eb745b624d930cbe214c79"; + sha256 = "0cfrgsy82c964hcmzzyk6ccghpr9dkfvdlxa0cj9cfc0w94cqvrl"; }; } { @@ -329,8 +338,8 @@ fetch = { type = "git"; url = "https://github.com/rifflock/lfshook"; - rev = "bf539943797a1f34c1f502d07de419b5238ae6c6"; - sha256 = "0hns4zidw8g3s5l9dyl894fnyjr0a5xgdvx26rnal9jrn4n6z835"; + rev = "b9218ef580f59a2e72dad1aa33d660150445d05a"; + sha256 = "0wxqjcjfg8c0klmdgmbw3ckagby3wg9rkga9ihd4fsf05x5scxrc"; }; } { @@ -338,8 +347,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"; - sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; + rev = "839c75faf7f98a33d445d181f3018b5c3409a45e"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; }; } { @@ -347,8 +356,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; + sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; }; } { @@ -356,8 +365,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; - sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + rev = "f416ebab96af27ca70b6e5c23d6a0747530da626"; + sha256 = "1cmddgh6x1c3lij50r8245jhqgi4j00add4wjpqpc2dmcg5928m3"; }; } { @@ -365,8 +374,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "32a936f46389aa10549d60bd7833e54b01685d09"; - sha256 = "0f24khgx6s7idpnmwgkml4qyrqwkvdjd18aapn5rmybyhmrb57j7"; + rev = "1da14a5a36f220ea3f03470682b737b1dfd5de22"; + sha256 = "1ivqwn3r44vlldlj53669jvsd6klwsg7hmla7f0vz03ny8xz4lpz"; }; } { @@ -383,8 +392,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "ce36f3865eeb42541ce3f87f32f8462c5687befa"; - sha256 = "0dkmxn48l9g7w1247c473qlacfkfp8wyan54k9cbi79icdp65jja"; + rev = "12500544f89f9420afe9529ba8940bf72d294972"; + sha256 = "1y37dlbbsp1dkfqaf563fwlf3xl74ymswmy52faqyv0wpcbwixgy"; }; } { @@ -401,8 +410,8 @@ fetch = { type = "git"; url = "https://github.com/google/go-genproto"; - rev = "ff3583edef7de132f219f0efc00e097cabcc0ec0"; - sha256 = "0bpzxk85fgvznmdf9356nzh8riqhwzcil9r2a955rbfn27lh4lmy"; + rev = "d1146b9035b912113a38af3b138eb2af567b2c67"; + sha256 = "1ry1vbbnfh7i3zrv3vmbsbmq2w8jmz88ykd6cxviijnxvms3zab8"; }; } { @@ -410,8 +419,8 @@ fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; - rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"; - sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3"; + rev = "236199dd5f8031d698fb64091194aecd1c3895b2"; + sha256 = "0rzpcmp5fscg3smn0aiaahgimv74smylg701na5px3pn5iymh94a"; }; } { @@ -428,8 +437,8 @@ fetch = { type = "git"; url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } { @@ -441,4 +450,4 @@ sha256 = "0nzw3g8xpxyzwqqv3ja0iznd0j18l1rwagwhf9sinwdjjgmh51sy"; }; } -] +] \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index bb0f3229ea5..3218e6a25b3 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -4,7 +4,7 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoPackage rec { name = "stern-${version}"; - version = "1.10.0"; + version = "1.11.0"; goPackagePath = "github.com/wercker/stern"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "wercker"; repo = "stern"; rev = "${version}"; - sha256 = "05wsif0pwh2v4rw4as36f1d9r149zzp2nyc0z4jwnj9nx58nfpll"; + sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 34d4858bf4f..f416daf4f88 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.3"; - sha256 = "190bvd1q6h2hgi6s2ca6wnaib4k90rjq5g5l93vcbfjcczcgbv5q"; + version = "0.12.4"; + sha256 = "0hbrdnryfla6d3mjn2sf6qbi79slhd92s2xgcqk3bgvr1n6k0k7n"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 6bac5bd5836..530671e6173 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,28 @@ -{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext -, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: +{ stdenv +, fetchurl -let version = "3.42.1"; in -stdenv.mkDerivation { - name = "filezilla-${version}"; +, dbus +, gettext +, gnutls +, gtk2 +, libfilezilla +, libidn +, nettle +, pkgconfig +, pugixml +, sqlite +, tinyxml +, wxGTK30 +, xdg_utils +}: + +stdenv.mkDerivation rec { + pname = "filezilla"; + version = "3.43.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "083ycsycwy1szhp3mzf998wsqa74hmdxdsy07x6k81vp2cxjxijg"; + sha256 = "13i505y34b6lg7knzznf8812d9nwpnbf3hidpq58cbv8c31m5rkg"; }; configureFlags = [ @@ -17,21 +32,32 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite - pugixml libfilezilla nettle ]; + dbus + gettext + gnutls + gtk2 + libfilezilla + libidn + nettle + pugixml + sqlite + tinyxml + wxGTK30 + xdg_utils + ]; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://filezilla-project.org/; + homepage = "https://filezilla-project.org/"; description = "Graphical FTP, FTPS and SFTP client"; - license = licenses.gpl2; longDescription = '' FileZilla Client is a free, open source FTP client. It supports FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available under many platforms, binaries for Windows, Linux and macOS are provided. ''; + license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 61a581e834c..2d6c0df412a 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,7 +3,6 @@ # Note for maintainers: # Versions of `riot-web` and `riot-desktop` should be kept in sync. -let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; version = "1.2.2"; @@ -13,10 +12,14 @@ stdenv.mkDerivation rec { sha256 = "19nb6gyjaijah068ika6hvk18hraivm71830i9cd4ssl6g5j4k8x"; }; - installPhase = '' + installPhase = let + configFile = if (conf != null) + then writeText "riot-config.json" conf + else "$out/config.sample.json"; + in '' mkdir -p $out/ cp -R . $out/ - ${lib.optionalString (conf != null) "ln -s ${configFile} $out/config.json"} + ln -s ${configFile} $out/config.json ''; meta = { diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 7ef42f8ddfd..8a732de08ce 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.47.0.59"; + version = "8.49.0.49"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -58,7 +58,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "0haiccmimbj1nyyyj556b0a181walmxwbbr0m18m2w67wi5z783r"; + sha256 = "0l5q336kkw9i13076qn7fkknypg7cwjp58qi8xd6h0rwha3kkqa2"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 1904b959c8e..44b740c6f36 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.8.252201.0616"; + version = "2.8.264592.0714"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1w7pwn6pvyacbz6s795r1qp5qaszr5yn9anq63zz6cgmzy8d1366"; + sha256 = "0ndrsyyawls487v7vlga0yn574xvhmfc14vdjxg23nvn0jxh2dvw"; }; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 2c31684c36c..8e1f2a0f65f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,585 +1,585 @@ { - version = "60.7.2"; + version = "60.8.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ar/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ar/thunderbird-60.8.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "87653b0f127300984bd126ad1a1f0c23b0ca68637a10d87c9029e88c1a2eb58b1d1a22528dc74f601956f803042b0a98161df31b41436e193c95a76dfd201d71"; + sha512 = "a10386c0c55e52571c5b922a1531a891a98caa9a1b118ffa6e5e0655b838c207ba2638988d6fdeeb62135bbd19b071f9c2dfd2c52379e4f8ca2012c17aa5a065"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ast/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ast/thunderbird-60.8.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "fbfa10c306bcc9d70a0721c537265d3644494352cf5ad94a5f9fd1e7cff0fdc33b2c86adeaf37bac2fbfc36074ea797d72a1cbfaf23b3cc0ae6e331452410c9c"; + sha512 = "fecf4367234a794e22ccc6665622bf083bbaf8ecb1f8e03bf64c2bfa91028ff6a02497ae5ebdf474b4073fff121b23a55d8373ce16e282b9630bf6bd6223b555"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/be/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/be/thunderbird-60.8.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "29f7c6e7e846680704e29c8d160fe24163849d30e8844e78f1923ef34cdc7313911b5715b03f4d03f8bfd65649beb81353a890df8af942ec66186ac0c7df6e48"; + sha512 = "3ffc3ab21f3a070d8f465591db242b5cc0485cb2655373fc697298825f46a5f2f93301684ff69510ea2d74743a8e00e23e7f56e2a29638484bed40089714b7ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/bg/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/bg/thunderbird-60.8.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "c5946b44517751a4cde090b7c1928f58ea6f9761a62abc2cc23536003139395b92266eaa65800e674bd48bff20fe2a0bedab4b9c9265ca8cd0d2f21fd07316f8"; + sha512 = "e789ca25f887bc9b228fd29796b38cb061ba931ebb0e2d2b15b290771b2312d4051d248dd467c64acc5cbdc1d5c1ae23e0d5b5dba4a35983ffa44062c7632bbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/br/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/br/thunderbird-60.8.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "7ed69a9006ca44ce7f8463af5de88702b8bee3afc9902e608f76751e039d0e6cd7e19083d7d641cd9314b0fd6ff33faabc0574bfe87c0d28cb4682b71d82e3a3"; + sha512 = "5088057f31b2ff77f89b25e9c1638b2080981a489a392d928f259cce38916b9b7da89132d931363fc652c1711250e1e77fc56b0427674f0648229688ba3285dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ca/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ca/thunderbird-60.8.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "e498d19f0c36f49b84d6ad5b82b3cb5c32942d941da9013457a544775f18f1aac815ec4b44d3755eee3e652a5a7a6f1d24aa4bc3efe1ca6ce3ca48ad65186023"; + sha512 = "3eb939b9a811254487eca4920ae84d33773d0963c77dfd84df7cf02a98b975d13d9088a70c2e8863f3290c6c7bfe6c7a240eda8e3bfdf3de28883c5d1e842e5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/cs/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/cs/thunderbird-60.8.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "b0b4dc1c92375b7b8591d228911e66959b07cf43ea7bd6a1eaff2c5c419fe49d444ae7c8535074379aa76d1cd335d3c90c322e3d84427c7c33ceb91dfc228c16"; + sha512 = "867706fc4e459d0e7723e9ef0e86176822623ca85f446f1ab9935f7f7a95292da637d57ab6046a8ef4d8a40bd5fc37451a32cad71a2d45bf4e4cf7adccd44775"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/cy/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/cy/thunderbird-60.8.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "5a7e93c146631e72e6fbfe127b372c56a68cb3b1840330c8a7b65c84696e13062da82666e618a9080c04b59f44997356b6a5f8c8819cb67d25535d6c4f69c842"; + sha512 = "56d6485c397984b3394831169efe8bc2d7078d958358a37f1c9775b17bef0a4a347429838f122291f10e3dbc289865aaa475d3d3f4e7deaa2d22205690110c05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/da/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/da/thunderbird-60.8.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "407b72041e63945a87e7da272d4218f6ca695ca2ea4e45992742db74faf14139f6cef6a1357dae0e8836ad757acadb73ff499f48cd17545bb4eac5cce721eaf7"; + sha512 = "6d35e77a03b0a44e8629baa80eb1889892a0dcd7a1a7ef5f016a6133fd8c5555474fa3bae79e3c5c25b0618832e680ea505cdf82de268bb4cecad7187830ff4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/de/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/de/thunderbird-60.8.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "1d446c9a97cb2279b2c202dc8023760ee6a1efd70fa5d2242df883cd23d0532c6815e2ae0fe65c04c62885ca2d145f77617faf137e727d6d711546cf119caa11"; + sha512 = "7b6f65c2146eccd91db9f2a050722c28ff3c9ed8a9e7a822fc1558c6b56761ba68ee5fdbbf1324c35dc98b0b33e8e54709664b972ad2318dcdf4472251ef1d1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/dsb/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/dsb/thunderbird-60.8.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "de925e98ac4748ebe65706eba961ac5cda68b76a5e3fac23123016de9b433b54d61855e73bd782c7ad97833d12b260151621cc385a1fcb111f9ba09fa06dd30e"; + sha512 = "fef020d88b4560b8eae5b81d9d36179719389c742a462682ca0afff942474158b1cdedeca6f348598ca89268bae3d953ac63debd972f7349ed8a7cb56e96cdd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/el/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/el/thunderbird-60.8.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9f2b2acaf717caf22f2b1e76185f40d172fc2c4debd507238aae13776cf67d40ca55916f2db168751e5f304ed3df38c6aadcc009f33369dbe9644a0bc06fe903"; + sha512 = "fae21025f07a7d0be663d6dda4cb43cdc2b4b488a76e4ab0bae304284b17598689ed32554066e1d00097479e1ca4f163473cee854b853acedc46887256a45d02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/en-GB/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/en-GB/thunderbird-60.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "e0ce0a41088b9ba5123b80a4da180fce73fbf3eed587829f27d5b0af60ffd7e2e11cb640dd07a05fdadc728d37daac95c754a6d4d2c6b678c081564b72568501"; + sha512 = "cfb8f7770d1fa2ad12ac19a2f069840a37f13c352d4271c4dc479cf4cc1d3ac381053ef9046b4b0fe891b67097f5db674ed6281853b2ebab1fe9744bd113bb08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/en-US/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/en-US/thunderbird-60.8.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "1bb2e0449a0bc4021c46d0ca1f291d926b57277db4ecd89e6712eed9fbc6b2aed84e5bfe54885ab08f796e6909288b8159f7e843ba7183d2cc3f67cddda45f57"; + sha512 = "c0eeec28c235be86760dca83941a202475846153a1b186ad948eb673e0c6b1e870cb1c485f5a1dd9ed885eaac52f36cdde4417ba86dca388c43c03299b0adcea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/es-AR/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/es-AR/thunderbird-60.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "833bb73d258e0c4829c5bb55c78919ce458de3e40f26c22ff51573921840bb83885c626bcb823151aab56be20fbda945044ee1bcc0f590d2ba7bcee269a489a4"; + sha512 = "151e9ecb12ee13dc9cf87040c5f90d9dfeb528e25889fb48d7bd5a9a47f7a6166402c1c4ebf96c9a4184d27e89cc13ff31079151f7ca2860ac91100d2dc7f6a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/es-ES/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/es-ES/thunderbird-60.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b0fa09cf09c373963cf028e96f05d71ebb4673d1bf328721fa59147201fd188e5addf4c150c6323f00abaec098f2ff723f9367310d44d9d5509d849224dc37b8"; + sha512 = "0209584bf7d1396d3d3f754e4f6cf3a6cfee2f7aeea9869edb60bdc832e87b9437f4962fe59a19df78ecd53681981e68bb6efc98e05f7ef50883a59983ddbb66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/et/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/et/thunderbird-60.8.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "1697c46bb4e3ef4d9ed864f86d374632f8cbcbe7baf6344c47d91127cb4d200d9e54e06fc87be0be155f46855fb6c4963ca301d9a6b2db20f4716c6aed53fc14"; + sha512 = "766656029454d89be4fa8ac8ebfc61f25d86c6f8974abe1426cd96dd5b7492bbdf4f8568ac18a69fa4ac3acf4a28486f1184c0852d4ee29416d6dbf3ddee097f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/eu/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/eu/thunderbird-60.8.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "d3c769bc9c7825536e7850e294f309a32193686b75aa708c9530a792ae923a11b04792789a51dd477acc40818398c7c75b030e024d7be9004cbe1158a2c63704"; + sha512 = "db312b24b48677e47fa9ade4f04e219ec6a1aefb03239b60ba63c46659e86eadbec32513c494d48c90e303a87bcdd7280d7c4ae5be4df1a2c30159516bca5abd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/fi/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fi/thunderbird-60.8.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "310abbbfcf11020c7aca618e6143b7561eee762af4ab33d530b628d0ad79787d7f9b8d224995389b770e63d7532e0a7bb7a7e55c0e7e5ab98d006d71f2e2ec50"; + sha512 = "003a0ca468ed7a7ab19065ef4a45504c9e95724112c6bb277c6e1964f8f642d5d1a7a4b135e412c81db5896eb00a831b089104563a9237c0594c2ad5c31c4814"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/fr/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fr/thunderbird-60.8.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3ca827ce0f48f803d7bccbdd642af848ba77c64e94d67fb8c8f3fde8dc2f61fbf1e43c2c209aca480648ae21b96d7a043d70fd7649b5fc67c048c3b4c15eddc5"; + sha512 = "5097831b1d77046583bd86dd124c48f2389a676a902cbdd4e408508452400f9d981c14475e43276ba31efa70bd3fe1bce5193bc9624de40e34a57319d6ede80f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/fy-NL/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fy-NL/thunderbird-60.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a2f1ba15c669cc937fb094077176d65663ad75281554263dd24bd4b0a484259c59bc90638674cf4848f129e1462ed13e6b2951d01bc037a648be11c40b55a801"; + sha512 = "bb1170342797ccb3cada48fe654cbba2c02391f30666f3c14891d813692c21400c24f0f1e02d6cf975b88b8e92943feff8da5daf05b9535ae4730272b104d43e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ga-IE/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ga-IE/thunderbird-60.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "6548fd716f8870c6c5e6cc58e8572a0d72a25a896d96d05a6c8686f23efe914c809bb005a8ae0fa856148361659b8953a6e25bf46a7cb1588e26061b5621b89b"; + sha512 = "a65089b76bb09f78bdd7c8c63e0fe4e68468a210a18069621d4b9fb3ef7cd54abe849fae983dd3e8f05bc5f7dfc3a03a64051587a9e65439fc5cb2c15836f13b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/gd/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/gd/thunderbird-60.8.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "63a225e8651bd2f4e40eb3393521f5c73316618e2bedb2543965a5aedac336bbe00bb606a331fe16d0e4c3cf39d97cad719d63c468217b70909ab743b95be3ac"; + sha512 = "bca1e964554eccf2c69968380954dedd9e76fe2952becd06b0cd56ddf0e3936d6c40f7cfa5d9c8719cdb4b5181d47048d10a47e6c549e74b2ab72a0d7b89d1ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/gl/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/gl/thunderbird-60.8.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "59bbb5c8356060e787555b8e235b64d4fa3936de579a4d0bb8cec47cf073050ea681b6f5be0eaec1335b14ddb6f08bd6e583f166081c57e85189b5d14d9da6a3"; + sha512 = "d8ec696e056b44059ce713dfb86980da72441d9c53e17f30d0ce43408a16d3e4b2c8700e595639f7bbe3b59082fbdca49a1ecc47bdfa7704ba189198efeb1909"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/he/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/he/thunderbird-60.8.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "6b9d3a84f78a75c2179f23e1a70e9f0a665b5cff7f27f9e4fd35704ab5719bb9c1f0ab920130975500bd80bd6fe870da68dfaed6a41ebb629ca21f4438f9087d"; + sha512 = "bf9d9db17930dae863bc8803d7f8e39fad79c74712d16d3912968b8605372521cd1ec23f2cb4c8d05e67341176749c97e85072cef40a899570811b594a5d994c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/hr/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hr/thunderbird-60.8.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6bb5bf395a37b7d398096787a3bc13eded00a0bddb9a854bca9c4f69b8aa0b352531b70cd493be6f8eeb5cbf57c34ad16f59a039542446a600bc9b95c7836da1"; + sha512 = "62c626a6dbc65e69443e0e33bbcca131f2b0c3ab521ad74c9de355328fef0e26689e99f7e41111cee688400ffeb2f749f1fc73cf35dff8908f3661218e5df29c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/hsb/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hsb/thunderbird-60.8.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "531a6b5ff4bccdad45394e9db3d1fccf07a7aef8c436c5975b82deba0d772a308923ecdab3fc019280b695816e590b6500ea1f6b97bbc321b6054272105a72fd"; + sha512 = "72a7c2356748b59103457fdb22ebe471b68bbdb4c8e61b53c83e14a64f25bfc781070242f2bb04dccbacb52387ee3b7a2b5a66c2bb01d653b4d78ee5a4d3aa86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/hu/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hu/thunderbird-60.8.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b59b1148862f4e2a800ca4e6b92065ac129507a390cecfaf926e34b44b401ad54e419c87778a1acbd560276ea9afe9f65f2d2a286f06138849c717b1f409aadf"; + sha512 = "b6e9b086b065555b2fdf3c243e72a37c1f7d1708b130ca060fc72cc4715514aed5a40ac19b497fdfc7b6d067d8a065ad16e077e8f1b6aa4f2f7204b47699c2a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/hy-AM/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hy-AM/thunderbird-60.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "7026cbe16233f305ecbb9a4dc51a5a76827aba20e6a3cf39946b79b117f3b1246d8c7556c62027ac5f414435302f026e2f227011769f2aa6ff5bfbee99531f26"; + sha512 = "7b4690527883906a6a6e2d2b6347b8d2bc1b6a16576b6970c2b7dd0a04b6f046337e191aeaae4b07e37b29a9e24db3848a2683c6f0d10923c1c7ccf4bc8a38f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/id/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/id/thunderbird-60.8.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "72578c5f46a6e225357218ade7c4f424ed889cb9b01077a3179ec69464a4778ea023df3bf577a63040e912ba993430c9e57815fcb84b9fc679756c5557c9e76e"; + sha512 = "d6446e829d5126386535463e4b44551529108c22c1f5ea054cbced5d6ecae56c31d8a6af99620edfad62acf54844a3a0484b8892ee85fe7cf8676aa2010bc0f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/is/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/is/thunderbird-60.8.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "633373ec74bdab8ab4c42d77673508a1e9be4924550958e0f8a3c4385e3b0b07402a448674f2e5ff39cf08786ec3b90e6a801b993edb868d73a009874b00384b"; + sha512 = "8527f8adbce559195b3487ac11b9ff7a716d4efbe4139289093b49e07b0767b99d90560695773433ccd838affe2e34f488e1051059213d79ef2c604aa5c239e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/it/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/it/thunderbird-60.8.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e0fea4beb6fb5c3d4a62f42f8022a33e24f136972c8ab6781c033b30183716290bdec3857aaab08c31b2ab1a0799d4c6689e75d2b7d5f405e3632ee64979a21f"; + sha512 = "3d376e4f8efeffae16c2a39fba40cf29433af35ffbcfc5d0a7491355a211ca25fd5157f64a4d9f4611ac0cfc7659cb7118f0e4db15f594767d0e8a7fca9bfa03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ja/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ja/thunderbird-60.8.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "5d4f9de52486cceaa492020715b40b83877e449c9c70227f4d99bf80ff1075ae3cc2c006e87bde842e24877b2585059577e27a5ec84656c2a0d5f1f7699d62ad"; + sha512 = "b9623d6902ad5f5d77b67b490d8df6f312c895257965580cf1108a4d9c3da78f3d021551f9e48ab56b92eb691c3c4007a7584b4681683b261bab7b6b7139ead3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/kab/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/kab/thunderbird-60.8.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f166551fe49f889a6793589a39724fdcbab3c5704b20707a1b531217f99c75aac37e9d7cedd2c0c06b5753b1b3aa7f3167d645afbd2fc74976ce072238ee9a42"; + sha512 = "33417e6604f706ff3bfab521c5bd890fcffd0f524e11d29fedafaf89ad5a7f6284598ef994059c00aed70ef921a08dfa763f57694976b365d3317aeab8209c6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/kk/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/kk/thunderbird-60.8.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "2a7074f395e3f2b3544ccce74464e7f281cbbe3538c1b1a67c061688520f03c31be77b00158e2bb4c2f096e48ba28d50fe0d99b840b656c3aa40adb46ffe46bd"; + sha512 = "05910b83e3c65b2be6c6382bb27f819f9d02e3a1f89c00afa22eb1e68ff04d6f39edf31468be245be1756f20e09cf9982ff0175017e91ff1fe08b62b2edea4f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ko/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ko/thunderbird-60.8.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3b0317c808294dc9e745dffe2e1fa45a99f06cf0ecf890593252e90dafdfee46dc87c20e53515eda9c7f39947035fcb96738db92f8fce5deb3c840d9772b3d07"; + sha512 = "f12a92b58c02dba4cb2fc8e8a9f90025d23c3849590bb149a50416aac3e3c15e0c2817e7a4bc518f24e796ea851bb5746b7611e2faeea2767e0f63dc67f2cb37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/lt/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/lt/thunderbird-60.8.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "67cc7d2bff4548d3aaa0cc59d1318ffb3f8437bdbb53a2919996afc2430c27000eadbbb509729f85908dc88b46914bf4ae11d97a2958eee83a0e54ff578a59d1"; + sha512 = "06d12d4dffaaf863d77ab1fcc59517bec26732db4b81f6114602b9ad06a77d86d52a0b21066d93854459fc3087dce8d8087df635151f672194edf55d7903bacd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ms/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ms/thunderbird-60.8.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "5c136b101f4dd6f71735f9c518cd287a42f2e7255961a784c3e9351a6039011bff345ee1de9466c651539f2e938cd1deb8d97ba56722a8b2d8e6fd2c25cc7660"; + sha512 = "021f1843a788cd6285e4d56559b7042e161f0279b9b64234bb7cc39847f7f2011265e86a738b5926413f2e98e293fbb478d36322c9071b0f7346dbd07eb05a7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/nb-NO/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nb-NO/thunderbird-60.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e9cb187813252fb812c950dc7b435e98874a915a07e30ee565369fa08a6529544cc09b06a65f9312b18a3db334871e9cd2e0362387694c31eef07642d0ea3ab7"; + sha512 = "9913898a8b6ae8745f76aae51f82aa1fc9f71e410f458c3deaef5879521bbf1e25067709999a4c7722b42ae152eeed7016e5aa0437b8b3fc81d246b297f92f22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/nl/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nl/thunderbird-60.8.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "62c0e58c0ee81a2ff674de97eb98cb30908d238de4dddb845557b5d86f0c27353b4cb057c3244e57dc99932b9f004c0a04e8a82bbf5fd539824f86915f1761c2"; + sha512 = "006e2332079d8a837c42b44df7b7af01bf9363109a47158357438140a068a9a17b2eb1ecba351b49b3300dae5a8e3abb0938fa1222012a886e6a123f7612dfa7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/nn-NO/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nn-NO/thunderbird-60.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "dd9fa519b243de01e34ec61d44af07fdcf9667260b49955a0f72eea73860514dafee0d449791b74c0dc25b41d8fa55d1285ad66ccf66f60c85e8dbddd1a58813"; + sha512 = "022fb45fd0305cad23853277f2b18d22879a4d0523cbbb73a65209ac3d2a87782667e71c6903a6b944aa824ebe8d30421d511f346df7a511ae1f7c325d53de41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/pl/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pl/thunderbird-60.8.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "8f0b3c0a9c8b2f0c75eca0a3ddf820b4d70ed7ef35903065d97b421296575d037fb5d2cbbeba2b27c4c0e9df63d87a1701f8b4049443defcd760f4ab1b09a66d"; + sha512 = "ecbad62e54f5b49fa89d0f8d00ccc3315cae71e0a46b25e3bb72b117ef4a8271d9374d82352a7ed75bb93fed9504ac883165911cb6423c5c993d75ee620e27c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/pt-BR/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pt-BR/thunderbird-60.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "d72d3fdcf51cb412169cef19724d84a4da29ecca39516fc137650af2216abc127f249f0018618f4c4bbd584235248d894fd32dbd2035bb86eb42155bdb1d6157"; + sha512 = "e9f2180eef290f0d0fb3b91eafafa7ea0a8cbbb7acc01758fafb56d6c56caa0ac5455b728013ac88d50757830a7f65a3e77423417abd3ee77238657c94461381"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/pt-PT/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pt-PT/thunderbird-60.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "7ef0d38d40c7b4d024fc46c05ff9122d487ddf8d3a254372bbeefc82943b8a96a56d4b4be9a74789d5f37606d6b098d58862393757f6b49cc43382a14180482f"; + sha512 = "20e448cdc26b9a27b2c42b7baa09d299ea9ea834bb3bfba284d5f907bdfe0170ba7ef611e0e7ddc1ccdf296781401fe32b80f5e909b68c12a23652c06b3c93c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/rm/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/rm/thunderbird-60.8.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "68f3dda06c4d5cddf4a0cd4b5f7ee06975c7d491562b1138f61fb149f256fcdb5a2d1d9c4192c8b9c0c876bd72a2e55c93cd7d1e984c02e12d1d72be23b32e05"; + sha512 = "62d71bc39dc895514eb2cb957205ad7379ce95bacf6d75e193e0d9eca34df300dbbbb9df3e4cf200a5c1266b1747949df54a969edae62b720b10d0d756ff4c08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ro/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ro/thunderbird-60.8.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "981a1b64e8ba9b5715cf736064dbf65dc57ebf60446ddeaba37d6e652cf197afe903f79b831e4ee86814ca8425a3f24897987a1ec05c534788529138b97520b1"; + sha512 = "2a506e9c7d1f752452201ff78c0a2d678115404294200ad07317672220674eb32227dd7b1f8af65ee91ffb4051beadbdbf2da2dbc243d14d22ecb81dd004549e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ru/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ru/thunderbird-60.8.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "4396134b1d5e6debd319f9dd94b9262f6be5d5f545fc6f2535f42f1b1c94ad18773cf06cc0191274c2636125d339af7552995cabcdf88abe8c3d8f5a11160b2b"; + sha512 = "c76e85ae89f1d6f878f5ff745f76860a18d053d13c4deb6774de9e653e841273c09fd7297ade76ea390a30ab0d2af280a0e6b2d929a50ada2ea37c32c2d68d7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/si/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/si/thunderbird-60.8.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "ab5aedf3ce246b6b230a915b813743ebcfffe9db7da8e521b2d058a86166ad4bb05a1c2a31f1fe13efc05f4c7650055881939151644087e97ca558ff9249a623"; + sha512 = "92617456dd89e933130992a15247bffc9c8ebabbec41b061320ae6be8d86ef1af38c1469e633ef9dd312da8f8bcac99545077fb23665add9c82c0a38f538e56d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/sk/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sk/thunderbird-60.8.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "579073269dd14b6566ad2c7104db1c2075387aef05bae9e28bd6d2a5052aed9368549345901c5a893f443c7ed589e4272890f78683cff018133a0fd60cafe052"; + sha512 = "8ab573b0cf04ae24f0ce5f1b8e79024fac5e33da2e80ef28837b7bb941512d01396759b34ba4fe87bef74a9385d5b7fb8d656429c110a38e0ec30ba21c01dd48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/sl/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sl/thunderbird-60.8.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b561469e195b5d1ac52b8851e4f7b64605af0c316eb05952e344755ce78c0a1205066d0c0a5530809f29d988698db502ad1ca74db63fea52d0323edd94017426"; + sha512 = "4ca6019ec3420487ac141bed30efe310d4c01aa2d7adf16fd97ad543cc90d14611d270074c5ab1c52b90c6ac9cfde5f5957c323189965ea60c2f1110abf4bca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/sq/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sq/thunderbird-60.8.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1a20760dbc3ed1efd2fa1032679df86b6e0f660da54bc1c20463e7c158a98939c89bbd316fa82a90a33464ea075613529e8a68750468bea1287cf7492fb1016c"; + sha512 = "1a47ea68a8435099883a502e65e31aa0e7c14564f86e6b4e4937362fbad3b9771efc74df4ef92994c1ac77130fef228a1c131d0eb4508a5c655e2a4b3800d1ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/sr/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sr/thunderbird-60.8.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "9cb1cdcecfa8e1830172bc4a5bf926d73ee3d7aab32232a0063d1ac63dde316de57310b60c2a7102ebe76d9754ad042e8abe2745dfebc4a7af761ec014692dff"; + sha512 = "dbcf13d0333d1ea714b85e542f5bdcbc83bdb2b3f8c3dca829d4b224a0741fee36ac9d2df9bd12cd5505fc972454b990ccf830d71926f65a4f460be2fb7ca937"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/sv-SE/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sv-SE/thunderbird-60.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "524944a758153d216c7db81eb2c03f0186f8fd3575b5be4498aeed438910ad7e85de4657457f2fae01783e966a3c6c75b318231ce59307da57c4fa805bb84569"; + sha512 = "7602c9dab1202e84822d537c0aec36d1705c259e3d5f34ce6212363450e1e0dda508ed36ea999467be2f39b991cd21a6f8a153b0aca87aa70ba62f01f078bbb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/tr/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/tr/thunderbird-60.8.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "153d0d8bff8df4915271f255402f937c1ba838826b84d9bdcb60da4d74597f598aa66c90efbee7e1c823cdb74f7ca0c51b6876c38d2adceae7316e6c3c2fd82b"; + sha512 = "0fbec00596ccd59e54aaf23058e96abc6ae672ab55d2a7ebd0bb20c37c03f47daa70acfb981d9edf48c45a75d0b0a02328025e100dc4b344c03e3540089b1cbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/uk/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/uk/thunderbird-60.8.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "b357f3fa44988267fb757bb2e9ca63312f92d2e36d8bb014c6b92efc12fffb0d9ef86ef87ea5850c241d78e95504c6e539e2b62fee96fb0151ceab6841bc7f85"; + sha512 = "4f1b0608f55f945552bfb3ff28fb93b52ba8a180426e6a101c7c849a48a65c13c78cdd707c8bcd6bc02f55942750c3d34151a4f674bbf53d5e1aeb4fa5d8b974"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/vi/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/vi/thunderbird-60.8.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "96f1e9b40a1d689af3340febcaa4774b19c71bd9c2e7cfe5d1866472cfb65d60a590503c598a2ff9f74378a7af23f06853d9b4faabef7b54f7900fa501ac5f4c"; + sha512 = "e3fbe83460505e135427c773650151e8d7d4d14df5a432392625871c561f6cb0c4eacbeb73d1078f4e3b195014373735a1383a472f6a85d9adf76d4b98929689"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/zh-CN/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/zh-CN/thunderbird-60.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "edde4d0199ee89652a9aab6e5af77b5a61a2b58be4763513689d3276b43611b9b5bdaf37ac78f7f92ce015e779d845e3c66d001e341e63a53b22dfe5d45a2eb8"; + sha512 = "050cf6cddd3a4f7f56af9f271114d6aa10e032644a958e62f3957d0df61e6f6d92e2a21fcd203a1f45dab7127a652a0dc192993477570ed82726fc9765372dce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/zh-TW/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/zh-TW/thunderbird-60.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f2ef157cbd94d59df50ee999a15d0dff5ee1b9bcc7bdc515d74105f5c9fdfe671ced0d51bfbe1a464e66037fa6b6c8738a2fdefdbf43c391595b4774d1a98d09"; + sha512 = "566a7288a7819ac3bf72ae97fc10470530656c2c4bd75f9b06b4e4c1c07e0e80534fd3dc14081c828a7aff3319d83ca482e4d8d15aa6e3dd02201ce0038a1de2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ar/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ar/thunderbird-60.8.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "34966e3398b537782da2df24fe9c6651b71af93f1a4cf48a910c75c65c96d83e21b73ccfe5729277a3a18fae51f7c7d5c61525cdf92942f3456032d6c19fd6f8"; + sha512 = "fa10e2e513050f8c62a0e53530a3ce99cc74aecb0b93090207531556a394d41308c599c469380b39daf178e775c61cf5c279b8fb26429652368ab0468dee4ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ast/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ast/thunderbird-60.8.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "eac5b32afeea7c15be37ab3cb1443cf0f08b3144d71c83ceb35b4145ea5e217d2d680404115a66c549532f018dfc43babf70ce19b5ea60602442c0803a9100e2"; + sha512 = "a88c415580fe8b5a1f83468afdcc55714abc13eb53c6b4a8b6b4779837b0668934c58ce40928b8a215a099fa06cce957754ac714a941172ded5087f09b8b2abc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/be/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/be/thunderbird-60.8.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "4e6085353b787ab1a518b8e8bda7deaf4cd5b54e5a3d9e8c74d98ea7dd0d927d9f836be41b4d5e5e06f0e2cf137b3a02b477cb734acc7b82880e04ecb055e795"; + sha512 = "d0c7edde8c6d2b2daa4d2389781962ebbb8b11e2b6ff4f0c79a15052cb65e869711cc18c5ed86310800dd5fdacb4d594347663a440ad7caf874599bf9aa696d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/bg/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/bg/thunderbird-60.8.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "75d0dffcd68d495932c68cae67e876b5d73066258051638c8c324cb513bd7d5e83bbb658745cd29fdd5a0e7da280bea1ae1cb984d0530cb3fbb9ff41560c3867"; + sha512 = "f5fa777606c529b5d5d85af9ea1bc9d7bae55571d11cb02fd46903643bd2fb9bde0dba0eb9e3b8a0276b004e40a12bcfc8b35f0a5d0445b1d6989caaffca2ed4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/br/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/br/thunderbird-60.8.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7dc116897e0a43f464f36975a7ef1dd9de3eee9bde1eba0620afcf5f5855775020c347e2656e5e5467284fb2709e823032053bf7e79144f7a47804ac1b99603c"; + sha512 = "673478f9995d4b43c3a67abfe876004e71871a45b9b13fa89b5266fca48d1edd69b601d34ce4d007080346f99d8a6ad61a47bc891b61364b239b24a1066da75e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ca/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ca/thunderbird-60.8.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "5cd9211dee38ac338379d3e3484bed46d84022bc57bcc4795cdba17292be635ca9849a7597f7adf4eba311ad01f78f589b9bf2a59b8f9db8f59e3115b08edaf4"; + sha512 = "336e500bad4e173a675f24ea05a2507c8729a30c9bbea2659135808bc04fa31b0306ade3073c70de22c76827f0494d517d9ad95fbe03a5526d14bf3e492001ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/cs/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/cs/thunderbird-60.8.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "f2f6a57a215cb896ed0a947446296e6afd5b5b2e7b5e260e2d041fcf2eed1933c4a6ae88c1a669f97899177ce2704565219f64cab33412d501339439a91a89aa"; + sha512 = "abb309d772ba27eaea1cbf79436d21cb18eca0733f2ecbaab18778daa7ad55ead8471e76c46ef0e86cc0c95d4877fed61553a8d195c8ab835be24cd55af0e923"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/cy/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/cy/thunderbird-60.8.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0cbdcea225c7d3a50ffbbf9644cf3182e5775e6d54383d3190cfcb4396ffbf7ed1c390cf100ea08b3cba7c2cb225684780f969ed5180bcacf34f840aaf4c1671"; + sha512 = "cd1ad0258585f14ee8c5243f18841f80b1cfab41934efdc92871ad4c3d71708f1397836bc2f3843f769f2232c05ea9e8f3cc25c1b76f86b7658934e4a331a6e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/da/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/da/thunderbird-60.8.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "bc002637f863487725c4bfdcbd4d14979dd343163eb2eb35e570479d6ee0b1f470ca8b84e0443da1ae17ef0b0cf3f2f0fbe6c402b100b56dbb0a3da8b1e739c6"; + sha512 = "7d9fb57f9681934f8e564c92d80acf3ffc8df1341346adfb5c4fc13738a5068aba7cdf6ecaea2937bff076b66a6103cff95fea27e2a6a7b4b545b78b2c423a4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/de/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/de/thunderbird-60.8.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "ac4b84b9e1309bf010f3211b027da68607dbf2b068bf73667f3c92696c4a7a3148f5c6064d0b17d4518052755dcc3a3497aba64a5ccaa8875374f7343cab93bc"; + sha512 = "f5c1c01677f4605f9e4731681d1e9e1395d2fee6fc32f88ae8f207750859887e0a49b2d95bc27e4311b05c6af2a390866662f79094e9c3a55e4f2bcbb92f60cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/dsb/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/dsb/thunderbird-60.8.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b59c62d54bbf57c27a4c2385ad03de664346a28f5e0ac4c009805c8a81f5c0b7225fcf6418f2b7c25140474bb3b6ce248850bcfcd4854280942d85c75d36b025"; + sha512 = "92171f0c8140b360953c6b5310f260503d17d1da71e795c91a4ec80fc4cc15ac43405db8f345c0675233dde4d89f57a1db3177c3699f241fc2d4d6f43cde71eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/el/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/el/thunderbird-60.8.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a09b524c67265aaf9925c8325eac0301c275f0daf3eeb7695a2b143d2969754003d48833ce6b420de1374938fe08fd80a884f70c869d4327cd08b19857ac90d5"; + sha512 = "1062d28a437aa854dc213e632afc0e41edbe00d4398601db671d14e39fa2ee832c1fe6d263e7fab3d8347b4b2cacd541cb9f4b1fd640aa4bf97c3bd1fe23a2ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/en-GB/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/en-GB/thunderbird-60.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "9f4079ae7f4b7a1fccaf0777b2eccf2078926a2f69037f8248ce43b3008fab666b927f4011413b3fd6025ec29dd11c81a9758e2682eff95aa85af47707692b3e"; + sha512 = "61dd1c410b5c87ca41eaf303f85a5c90b5c65fcba5a75d93654b3a5ff898991fd59b89ae772876c707dd7d5a2767fa607b3ea0c2f2c57ccb73a7a75720157f43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/en-US/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/en-US/thunderbird-60.8.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "82a20230237ff8e1997dced5a704f2ddcb2d08bd9dc8615a324a75179287c0bb7fb8a56a07feed62c36b6e5845fbfc6a70d0f8b70ed2cfa9f7769fc01a5e5546"; + sha512 = "5f989316cfe29ff75adae5feb34e6914f25e6e7980c17fe902d70deede44ebe54052d2540cfbe3d4629e927d9f2129edf19f659bb2cae9f09ab984be7d47aaaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/es-AR/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/es-AR/thunderbird-60.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "62740e66ad12e3919e18e1db3c6f1a86d957225e0c188bc288ef12f1e657ffb82b1cdc79d71bb4ed297c222ba0cdc56a454cecfcf146e2451d30768e3f797a58"; + sha512 = "45e0eb7e51110bc892cab458286e5c37f0aca4bfc88b01801c184521eb3bde33bdfc78758a67e7337be157b7507891874def8e7456fde8483054fd9671f068b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/es-ES/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/es-ES/thunderbird-60.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6c54311c0c9a7b85b244645dedd73c0c30bf21620a81d9acd54889b75ad26f2d5c39c3e2a53309592b08ad645359e4d436e2cc33e7ce2f414b140000f72631cc"; + sha512 = "a8dca85c7ecc2678cf48de000fa4e46432a28a02ec200447789da0213d01841f142de45c0c93b52c8952248eed7e0afb12c1f84026dcbaa0b47ce8b907bee779"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/et/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/et/thunderbird-60.8.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3501ef96ecee9410be5dafcfb416ae1523a1a2dda3d2ec5022b1edc935a5a91708e1e2da33cbe677a3df8707c04b5fc1abd6094ed34bc2aed2c792033f9aec42"; + sha512 = "d212bf0d4881094835f156c277015e37f1de4d1927d2f89bc993071f50eaeb604913022c3db948baabb1d76b17a982bfd1911050c46bab54fd3ffd4f374ce378"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/eu/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/eu/thunderbird-60.8.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "18065e7cda2d94c2bc9b93e96329e4883c87106dc5e721a1622fb1e8598059f4019804ede7738ca10dc5d494ee94e9b9e6f56738a343094ad159439cf37ae6f9"; + sha512 = "14602ea4b22210049756484646fe538cece02d7a23e6079e7020ff30d08868d353f9d59fc831e1b600c061faf18f5af93a67ac95cc2f2f64a137c430d6ea6bd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/fi/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fi/thunderbird-60.8.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "40f1c228d4f301657c580f0810748807c6dc227189ef0665ba2fcf094b4d7b5560db20b795ecc6a7cfae8811f46387e6fb63897d7e1515cb4c1c3e3c56a52720"; + sha512 = "aaf723df2d042c7fca5457b0646998c7ed799d0d24021fb6de3b66d35519a7c189844bbd4a2840b884915995be4ec191455bbdbda7f5711831fc7702232a5d12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/fr/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fr/thunderbird-60.8.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7a1974b6fb379bb4802f35d86e2851f493bb39237127304f55edc5786d70a1cac9576ef97182b80d10191f90144fc2aaf16be4590c85457fc08058dbbe771732"; + sha512 = "9dd7e8c61049f4de1d03c73e1b7a1b38e244ad67be84dc6e4a53b94dc810d98b35e49b199662672f0954cf87cba7e3df75ba11fada1b74e8096d866131b08550"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/fy-NL/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fy-NL/thunderbird-60.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "0b6e189fa5180aa29ad0bcea5be06916e570d8c46a83032188f511e661aa79cf4af8a51d85a2265c664ac7e76429bca4435bda098a001eae46cfda426bffea32"; + sha512 = "aba1031a349f835577a06cbb8452760c4ab65fb1c8a7183e92556b6d140814f16e794f4a5305e789aba3b0c10703006641546751460fa5fe2a822835881d8e6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ga-IE/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ga-IE/thunderbird-60.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "690d8399580eb4614718745d536fa5d1d235bca7fec8d38695b71f4bf89fecd9fcc1aa4e712e6771836667a20fa28cef2a4a729604ce2267ae274c4862e34753"; + sha512 = "9172d99e57d02a676f9bfe3373fef7448a2d6f70f3de8139205c55a37c73c5b70133373763daf8c58adf2acf4916cfb34aee60a431d55aa94cbe95e8e58430f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/gd/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/gd/thunderbird-60.8.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "c5adaa232b394c59ef3c759da8911edd85fd2c21ba1987284f8a636eb75545e7f48008797a288b184690e456b8ed229b3dff6cbe4c122e4ea14dfae0058e2611"; + sha512 = "f8449e20680cf02220e009f19b2cb66d1354941c0deda60086ae80f1d3bdf2159a8b5bb45a45c480528437e78d8c71c00a8ee42827b3254e37c83cb8af1d3de1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/gl/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/gl/thunderbird-60.8.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "e36b11242ce8c19f4b8f8ec20f4231593c9fce36d0ed06d0254f02d77aad8f7e6d060ce79c9e3bcd7d8fa810c29ce5292b3326bd566b6f505ace4dfab952a2ee"; + sha512 = "04d8babded176785625add5bc9c457a0ff380c293579a18146924e57fb3782017c12d5569d10d2a3f1fa872fa8eaa87bbe5f1ac5f44f05cf5d5f3936fb12706e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/he/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/he/thunderbird-60.8.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6443a40d8b6b12b625626f3d81f4ed7e5df70a98d36891a12bc66f3ab55e6be15182fdb43a1f93b4627e09bae65a8216db489c2ae6ab405c4853a12abf017106"; + sha512 = "2b77c7c4044c73257f24f1961d431ae50cc9dd0b0f2a58464a745ed3888e957467e6f35dba904a47c3d8d84aba81827184070ac6c12ecccf02760202b831b578"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/hr/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hr/thunderbird-60.8.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "0094ddcb782cea193001c84ae9b19d2508f31d096b5dd94b3b9f6d8ff669f36cc46bc512c0d77e3271cfd4fdf442faa29753956894ebeb6c641ac2a410fbaf8b"; + sha512 = "17d68b938531b89eb8972fa315fb6951821a1a55478a801b5697afe5b84450841ac66c8aef49a43c4aa6acec4f81652a1de32a3acbbb41ee6cf0a4ed9f03acd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/hsb/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hsb/thunderbird-60.8.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "ed41408453c785634a66820746eb6ed7d668e1ddda3f6ccce2481454b0975aad5bf56c1f92721ff8088050697c2a6c604fc898c8762d06ffee390ac7bfb747cb"; + sha512 = "556b441cbd6e9a34e101385484fc292e3a2edefd39dc8286b5880c66ad558beecc9206084ed0ee35aced87ba0325fe737f6595cf3ddbe4d3842b10bfb535ed36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/hu/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hu/thunderbird-60.8.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "fdaf322033e4f9fcc6cb9754c50bdb7cd50ad4200aa529b4b88c583e6e35deed494e86796caca82da92c3daae8f26494d1a285d48e09309af19c8217cf000d86"; + sha512 = "7a355c9ab063d6b6d8c17d1df4e30a3c2511c4f9d78be578a1a0b73e4728bb08d917190249baff08e30fe76eda16bc889d64ddba673f51067dc3b1957f8ebba3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/hy-AM/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hy-AM/thunderbird-60.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a9332d15c72a07a85774a4ca5559e0cf506eeb94eade4be38c7f9165909b17968f82c3e6e341c99287805002a2a6862f1ff3c9719b34cdd91510e5c3e4dbb25a"; + sha512 = "b5a94db363d6a16507e71fa0d6d8928b4c8d14b7b6a35e287232fca511caaf9f7852db37502ed9ac0fcba65cfc9d3185db8f08d7dd3941df660e083f0bc6c6a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/id/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/id/thunderbird-60.8.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ef6f4411236967a4913a9ae99dec743c66ded26ce30b396daed1a7e05f17b05dd59bf38943922ca4358cbed8ee2542eb5d5e21dd95931f6e0be59f0ddc591102"; + sha512 = "6a94778d20665c901005150fab16c4fbcf86bba10b7a1833b7d89d3e76a7b90a0c1e755617ade294fb3c86611a0f2bb0e812d1b282e66d2a63e11a2f25b9da1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/is/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/is/thunderbird-60.8.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "586418b182ecb4feefa08a5aa4e2b28351f4286f1853ebd3a94ca99b58fe4480dea261fd22bd43b9ddfe60d965c70acd70ab290c5f73dc39cda79702c7136955"; + sha512 = "c6f89a98f956ab17bddc6250af88b1422a347733c15d12a720a8d84ffbd00142afd09b80bbac39dd14907558dc97f33890a091203c1f907dbe0df5f5f12a87f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/it/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/it/thunderbird-60.8.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "775e34d20f36e5a0d5c2214f85560a419c257f87aedd96906b0d5b27cc90d094ad41b0dd1c510dca98d48ab9754b4dfaec5efd67bff0db01c37401a9848b47ce"; + sha512 = "38bcd03bf02276feef2321503bedbd7b8e8c609f48a038e660e522af5cad603ac642622f8b08b7aa870c1bf50b136d09034995941d14fa574ff9ca4f11d3cc66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ja/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ja/thunderbird-60.8.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "fb5300330ab2f3a436086ba6896eed84710cb17bbd4fedb38241b15bd9683e6ac9e0ac179c6e14db332467d6ce35f6f70cb3046232b24c2fee6b99c8a8ffaaa1"; + sha512 = "e91f0e3ee53575d9e3fd02be22c46a8aebfe2e12998db77f3bf73c4756d4d615341c20fed031ee0b146aa1e9200bae3bb92c02da18bbca6e99574c46e2049f01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/kab/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/kab/thunderbird-60.8.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "6df96615387ad1e9ed2b56c8a10aea6b657171189a10b9173e6d3137efcfa248c8583689adf4913534b37746389893c62ed155422432a19e8ed51ab7b9a91cb5"; + sha512 = "a858c81c5fc9110757328df3705cfd8ca1bc61ca173448f411a849bc3799b586e7119e6c4ecafd12d0522ba37463092271b76744bc0a7fe603702627f598ad36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/kk/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/kk/thunderbird-60.8.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0f65220fa1e926315048b0a9250fdf14a0039f0989ac4f5cd6c6d5a2a249e9d26bc75dc3e034bc4d952625c05e74c02690621abcb99d4ad922567e7b8a4e738d"; + sha512 = "1bf45fa38562308f4285c5bea746bafee65f498e5b4f4d1971e7ff68cbc5b8d3e6c7a32a4318100f1fa6bb203a12e3dde14df25a70aa1aad5d6279766b398c2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ko/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ko/thunderbird-60.8.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "902a7e7a0bb1da2ecc70be16d229af7cb1c7ae0405fecba7628d48cee487aea08ef7fd248c699ac6090095119defa9169c94bdea7016d6bdb4ae33adc5af2aa8"; + sha512 = "56e59aeb1286ec53ee558ab029476b72ed4094504123bb93abb3e3425f60065d66c9de83190d6f00528045f934d4775dfa555243f13fcdd540ca522e9f825740"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/lt/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/lt/thunderbird-60.8.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "98c18cad772d7456ead477ff48be5e25a5b704ffc498d2d92dcb71a5a083c945f567a396e9005273855c723d6ccc70a5755333a403728edc076a37f50f01625e"; + sha512 = "4572fe9803b28c6f94ac4e1fc5283d2569723698c4295279099bd33358a33cf50c1a49bec70c001dad65d19d30bcb215d50f2084b458143d338b8ecbcea1ebe5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ms/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ms/thunderbird-60.8.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "870cd984adcc562223fd0ce21146880b088cc1d858775a1679ad9ec44b4ebc80795f429b2f3873fb00cb80bdc495e40899701888ff446fa45ae4ff0a23e2d026"; + sha512 = "fd1a58ebb66a39fc00ba20eaf555cfaa6124cc2e2fa7b44e1d4d7f1e914d86a0617f1be8d461f952196fa6dd8d29ae622769e5e6f8e4c0eb30b757da62d3864d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/nb-NO/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nb-NO/thunderbird-60.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "13967e29de286b5726e260e47fd479e0be5bad943f6f47298f4453ebe7be4d60925408a0398b5e99c57cf486fcf3361c885b6c84a01d6c27b55d5b4dda7704bd"; + sha512 = "bf4663ffe717d07b37e4f6741c9d6a804420f0104ac9adf152f73900d89818dddd67b1d047bf3f095d1a6ca7ac9da8e2132567e11caf486588f262e84e87905b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/nl/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nl/thunderbird-60.8.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b5c8b15c33e4c8d7800c924433fc0c79ac83cbef571c96dd25c5aa699eae18fd605544c1a3348f29213e903efc2cc2a5245158ef941ed30855b444ca6fe5d7c0"; + sha512 = "b7f7a989fe70860eec8349cbf85a943c0a5e7e4c9f7ae2010309adf96778797b036847e6860c0d89213c51c3c01ee1e9e4dfc6ba4a45d31c6ec4b6e9cc7e76bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/nn-NO/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nn-NO/thunderbird-60.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "58e3171178c89d1381faa779d52142968f55ff06f1e06902be078480604acf44a1814f76f0826079df08b29a6aaef97732ccc44d6dd094b6e894f2977085154c"; + sha512 = "b2a8a72ce49d15c0629e038deaa8fef4b93893da9198e712daaddaadd2169c4781fe6c2544f33954d28e4be30048716a80c20063a13ea78f0ff3c466ee814cce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/pl/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pl/thunderbird-60.8.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "c2eb8367aa82c7bbbcde0d9f99f9bf6160c5c0f8c5f103c71f8013d711f2cb1e9100bfcb8c633e6055076d40f77f469b126955f4696b4fe1b856bf7227335343"; + sha512 = "e6d0f12754182f5bcfaead0bce7183a7f6527983f8a4ece9b9f7968d87d9c55b06257c20e1dd4bcd82be56961a08f6e20d7140cd8239531e2f346bd4c6aaba1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/pt-BR/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pt-BR/thunderbird-60.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "2fc8045e6ccd7d42805dbd95c2228f4fba076869f1c574266779ca231e479bfa7408b0d19ee97eed633250e0bae45d21021225e872d2a5bd1435ec9c9edd6f42"; + sha512 = "bf1fa8c66264ef98b4d192e794cb789ea0f062f342bc3aa664fd8e228acae045dbff4673e31b5b65754eb80e6af2581b3b540b3fbd3e1042439caad9177f7499"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/pt-PT/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pt-PT/thunderbird-60.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "5d1d1cb05743821a72cb696a3521cc957e1c122afcb1c6681c8e9f683492960b67593984ff6016803cbc3a82f5aebd4144cd171fbdbe9be9d45098c1b97a8d51"; + sha512 = "2b503e6b87230e4939c09774d9e7b70130e42ef4bdc0e3500563fc0848f138b7b569d37ba09eb676efa6e0d9b245d49acca8c740ec44abbe25b57a8546095871"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/rm/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/rm/thunderbird-60.8.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5b37fa18341493fe5c88f151d2b59fcc19bd238ffb6c08b5c23469c1a1138453c3c1c6a15e61a90b41ccd5678a5a7c04d7cce5a9754723ed27777a33d26627b3"; + sha512 = "fbb4192fa466549313d874d5b48258d3d133040449f96c55270a5ad25798067b921d0336e577081985e1e0cff28aa17d8b1890e77aa3cdc9c369e5e416ac20dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ro/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ro/thunderbird-60.8.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "920cd81ee9b5d47c560ba43cc712fb2efe7e57b87407f67315687a36a1814a871821aa9d39e1e0e6fdfb3aad9d27b2cc8f9a2db7fced63439bd74c7cab9e1949"; + sha512 = "5e6ca640f36f44b8d6594aa13847acf16b7f5d96d21761fc43b38b16d39deebf6dd30cc2eae778ec1f8f37408451acb19485f52ae3e701833103e59b6e0615e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ru/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ru/thunderbird-60.8.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "302c9118eda3770faa307f658a1b621e167bbf641293c5b838a24346d2ec27b9a4f301d5cdae4b8d30efd815d3567d802b0b0c64788cc4f305514cbd33990cd8"; + sha512 = "4bdaf5e71f18d75554a4d954a802390ca6689d07b3ba16de8654b6557c874622ad2b2d587d8306edecfad47c1bf89550378d478377fe49b0e87b5d4417d05840"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/si/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/si/thunderbird-60.8.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "c601b8a00f1b637034d4d64ef9e9c97ffa34aa268ecf90bb92b1afd937590a1fe6c4413bd25171d339e85c26840784ba2a4247664978c3223c213e4d8340dbdc"; + sha512 = "096ca4b2efe21c92d041b5fbcb5ac19351d39b339b0686fbefd1b127f7fe1da8b31dcd9135149006a71b664eb9f98d729a48da4f138af250330b60f80ea07f11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/sk/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sk/thunderbird-60.8.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "2d214b1f408550dd86a0fae6027e1044613d4d6c847e44653dffbd4abf1d679a45b061529fd4bced124572d32a12170890fac2d9fee3ece2531c7700de9caf32"; + sha512 = "101363485e58e8a733523f103994c0abaa520ffe758a0ca39db9d5cebea273bde9a93be489d49db67a37130191a3e54ab9454e74cc392c5e0a163020a740149a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/sl/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sl/thunderbird-60.8.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "dd18aa54feb2603a729e704158271165d54baf6d12e8b39b4df9f58f15076e8dc945756385aea1ae0261ce94938377778ed02163b7d42b78dfcbf93ca8d1c176"; + sha512 = "7060e6918d9818be407fe568caedf7e65738ce6335e287ca9ecee9d7f7be9d00599364b8d7b1033c7943d3a417fef32cd2e6912e832ce0e5eefe6e04db3a7dcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/sq/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sq/thunderbird-60.8.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "62ae0c34120bbfeae9f968bf78924b5fbfdec99832be7ab5d9d00027914ca4d214d445fb0a129573c2d46e4a3e0ff4c2f6fb4d283d491e88109725eff306b698"; + sha512 = "56c297aa61bb50517a5cf126e506cd7fbedda6250434a21423581b2a2cd79352f21c51265f7e3fa9b60636c8e3bd6dfedbf81c058daa8545f5da0f02837e0719"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/sr/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sr/thunderbird-60.8.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "bb8e3d418e66dda50e58b54671cb55d4cd45786f248b0bc9b9c63fe6fdfebcfdc674bdbe2adb7b265ce2a3414074b7490f82aa083451d3d77ff16875670d9d6f"; + sha512 = "95f8bb13b4ecc9774452b799a8ec06dc6abbb585471f5f2f9ce38e4af733fcc99132b66df73df96159872ca6e6285a62c86e61e4d389c2c96da547f875cb9841"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/sv-SE/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sv-SE/thunderbird-60.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e060e7dca802c02acd054e97c4d3dffd8b4a3ee36f63d114ec2066c3cd6e86356070f6fe2459a62c0e29cd0a94458ef148dd33162f5f72b8fc29097bf1fbb0da"; + sha512 = "fc48493a7873299d4c284c806fe2ba856ff197e5f50bb57d3fdbc95eda062b035f98318c0f5bb4d1bec63dedae486b9872e3f1718b922a1ec8da311796794121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/tr/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/tr/thunderbird-60.8.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "00669af188fffbcd4746860f39a2b11b86d0081b7bec3d333ad399943f637b59414c225c8d4408ad404975ca8c356d2da3e6b22faef3b7f4fdb2a99d4ed3c002"; + sha512 = "649527a4c603798b0f726eec995d721156c36279b1aa5afb956fe64ef40298956e1abf6eee2d15eb3f5e4c9c5d48ed804eb425483456adf068084114b6d5cae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/uk/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/uk/thunderbird-60.8.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "687ca54bee2f6f05ce02c9f50bd1056d6076d7cac82e273c07cde8f2ddc7538ad5f19cde7e09e5317102a182b7325d7509adbd98864ebc53d61eb394aac17fdc"; + sha512 = "2b4ae669b99ac9a7b20eef71b7dd6d5ad2b20ddb516ba1b3fce7dfbc783f0aa945e8f319b71e8912b2d72b78025fbdcb355ff96be43ffe828d2ba1ac4fa00d41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/vi/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/vi/thunderbird-60.8.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "9fd6ae344725f75ea15db931f383fe30434baf490d538c96b8a906ff4faf58c2495a6b22aaf4dcefac86d6c35fe1b014c95faf4fd0f5b90579f23eb32635f13c"; + sha512 = "5808e5e2a75cf63366b190dc67177c8f1b2998b2001972412a760eac3c6a370aaf7e60d3fc7978783469163c55f69756637b4436593530d518dab27dddb6c295"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/zh-CN/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/zh-CN/thunderbird-60.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "f28745941f9236d14d802d21d88f98a9b5620e854106b38fb6d49ddcef0cea34b3d47e366e8a136e7338ca8965000d62eb2bf80daf9e0a138375852293161c8c"; + sha512 = "95cf6871aacf5d36ca04673fe23277dcc4674dd5b2d215c1f453fb6e5f82d64774efee4a0538e7c451b8807bf930912a31eaada65248416c24e8e1382923d09f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/zh-TW/thunderbird-60.7.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/zh-TW/thunderbird-60.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "4cf5fcd7b32ef5ed550b31bd712eef182183e039a820c247801b9108ccefc06f461e404082803e1a0a68daebc27a07e4fd58b3c543913f1d0ee342f56d8e7bd9"; + sha512 = "8429305258abecd306e01417bff356a536ad7f6982705a51b4c35b26a83c18f661ae743029597d69466e3618f99ed71070071743c5821264143f78cad2b7aeed"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 36eb46e5ef7..6921279b27f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -24,11 +24,11 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "60.7.2"; + version = "60.8.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "09fg8rzbg0nl5b7p3s6pnai3xgsnga1wcxii2rjnky4p96di94jby9whrjidnj2ixxmjqwysnaif6lj5mq9pr7l48qhd9vjbb3vp2g8"; + sha512 = "1cd1ps4r70bnxn9kydljsp776dazfzfsghc5zwp1xz6p3cwb9g0gybj677sac7y3ma2wsq1xbqk20q35n7gjz3k1zzhmpxyii558rdl"; }; # from firefox, but without sound libraries diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 60049cd64b9..7d311d4bc70 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0j21cp8bw12vgfymxi3i4av3j97lrcyb5y9xa3mb59wr17izz73x"; + sha256 = "1m6743j8g777lijvxqw2wz6pv2g5a9wlh6zq7awk0hvd44xp4sav"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 1e067b3c335..8a66c039b5a 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { name = "pjsip-${version}"; - version = "2.8"; + version = "2.9"; src = fetchurl { url = "https://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2"; - sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah"; + sha256 = "0dm6l8fypkimmzvld35zyykbg957cm5zb4ny3lchgv68amwfz1fi"; }; + patches = [ ./fix-aarch64.patch ]; + buildInputs = [ openssl libsamplerate alsaLib ]; preConfigure = '' diff --git a/pkgs/applications/networking/pjsip/fix-aarch64.patch b/pkgs/applications/networking/pjsip/fix-aarch64.patch new file mode 100644 index 00000000000..f4aabf7a9bb --- /dev/null +++ b/pkgs/applications/networking/pjsip/fix-aarch64.patch @@ -0,0 +1,13 @@ +--- a/aconfigure ++++ b/aconfigure +@@ -8945,6 +8945,10 @@ + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon" + ;; ++ arm64*|aarch64*) ++ ac_webrtc_instset=neon ++ ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" ++ ;; + *) + ac_webrtc_instset=sse2 + ;; diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix new file mode 100644 index 00000000000..5c536b8aec2 --- /dev/null +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -0,0 +1,38 @@ +{ stdenv, autoconf, automake, fetchFromGitHub, libpcap, ncurses, openssl, pcre }: + +stdenv.mkDerivation rec { + pname = "sngrep"; + version = "1.4.6"; + + src = fetchFromGitHub { + owner = "irontec"; + repo = pname; + rev = "v${version}"; + sha256 = "0fj13pim5bfm3a2nr05apspraf29klpmcnhmycklfmrlncq5xqdf"; + }; + + buildInputs = [ + libpcap ncurses pcre openssl ncurses + ]; + + nativeBuildInputs = [ + autoconf automake + ]; + + configureFlags = [ + "--with-pcre" + "--enable-unicode" + "--enable-ipv6" + "--enable-eep" + ]; + + preConfigure = "./bootstrap.sh"; + + meta = with stdenv.lib; { + description = "A tool for displaying SIP calls message flows from terminal"; + homepage = "https://github.com/irontec/sngrep"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ jorise ]; + }; +} diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index c8610d80ca7..763c740c817 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { name = "syncplay-${version}"; - version = "1.6.3"; + version = "1.6.4"; format = "other"; @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "Syncplay"; repo = "syncplay"; rev = "v${version}"; - sha256 = "03xw44lxdk1h9kbvfviqzpmxxld6zvp07i0hvdm1chchyp0a109h"; + sha256 = "0afh2a0l1c3hwgj5q6wy0v5iimg8qcjam3pw7b8mf63lasx6iqk4"; }; propagatedBuildInputs = [ pyside twisted certifi ] ++ twisted.extras.tls; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 7b3e62779e9..8a210c1af68 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.2"; + version = "2.3"; src = fetchurl { - sha256 = "0b7020rlc568pz6vkiy28kl8493z88wzrn18wv9b0iq2bv1pn2n6"; + sha256 = "138s79dqxrm59xc2s2xch16qkzzjks580sac4ppq8jy5lxrzj2i8"; url = "https://humdi.net/${pname}/${pname}-${version}.tar.gz"; }; diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 4c183dd4607..88d33a9a9f3 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "meteo"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitLab { owner = "bitseater"; repo = pname; rev = version; - sha256 = "1786s5637hc3dnnkf5vr2ngfiq73dyvx8187gx7qkh7cr8xrl50w"; + sha256 = "014x3mg2dc58h1qwy2nrz3a5mzdnbzish8zgn3x6lj6szfz5c72n"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index d3a216fb71a..363c484fa28 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { name = "kmymoney-${version}"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz"; - sha256 = "06lbavhl9b8cybnss2mmy3g5w8qn2vl6zhipvbl11lsr3j9bsa8q"; + sha256 = "1hghs4676kn2giwpwz1y7p6djpmi41x64idf3ybiz8ky14a5s977"; }; # Hidden dependency that wasn't included in CMakeLists.txt: diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index b58872975ae..13755b88c65 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }: let - version = "1.1.7"; + version = "1.1.8"; in stdenv.mkDerivation { name = "multimon-ng-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { owner = "EliasOenal"; repo = "multimon-ng"; rev = "${version}"; - sha256 = "11wfk8jw86z44y0ji4jr4s8ig3zwxp6g9h3sl81pvk6l3ipqqbgi"; + sha256 = "1973xfyvzl1viz19zr83cgqlx5laxbjrca35rqabn6dlb6xb5xk8"; }; buildInputs = [ qt4 libpulseaudio ]; diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix index ee3a71cf181..dc7c7c920a1 100644 --- a/pkgs/applications/science/astronomy/openspace/default.nix +++ b/pkgs/applications/science/astronomy/openspace/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.11.1"; name = "openspace-${version}"; - + src = fetchFromGitHub { owner = "OpenSpace"; repo = "OpenSpace"; @@ -13,37 +13,37 @@ stdenv.mkDerivation rec { sha256 = "0msqixf30r0d41xmfmzkdfw6w9jkx2ph5clq8xiwrg1jc3z9q7nv"; fetchSubmodules = true; }; - + buildInputs = [ makeWrapper cmake curl boost gdal glew soil libX11 libXi libXxf86vm libXcursor libXrandr libXinerama ]; - + glmPlatformH = fetchurl { url = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h"; sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw"; }; - + # See prePatch = '' cp ${glmPlatformH} ext/sgct/include/glm/simd/platform.h cp ${glmPlatformH} ext/ghoul/ext/glm/glm/simd/platform.h ''; - + patches = [ # See ./vrpn.patch - + ./constexpr.patch ./config.patch # WARNING: This patch disables some slow torrents in a very dirty way. - ./assets.patch + ./assets.patch ]; - + bundle = "$out/usr/share/openspace"; - + preConfigure = '' cmakeFlagsArray=( $cmakeFlagsArray @@ -51,28 +51,28 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_PREFIX=${bundle}" ) ''; - + preInstall = '' mkdir -p $out/bin mkdir -p ${bundle} ''; - + postInstall = '' cp ext/spice/libSpice.so ${bundle}/lib cp ext/ghoul/ext/lua/libLua.so ${bundle}/lib ''; - + postFixup = '' for bin in ${bundle}/bin/* do rpath=$(patchelf --print-rpath $bin) patchelf --set-rpath $rpath:${bundle}/lib $bin - + name=$(basename $bin) makeWrapper $bin $out/bin/$name --run "cd ${bundle}" done ''; - + meta = { description = "Open-source astrovisualization project"; longDescription = '' @@ -85,5 +85,6 @@ stdenv.mkDerivation rec { homepage = https://www.openspaceproject.com/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; + broken = true; # fails to build }; } diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix index 9ccf54a8113..9d41fed0691 100644 --- a/pkgs/applications/science/biology/hisat2/default.nix +++ b/pkgs/applications/science/biology/hisat2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, which, python}: +{stdenv, fetchurl, unzip, which, python, perl}: stdenv.mkDerivation rec { name = "hisat2-${version}"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "10g73sdf6vqqfhhd92hliw7bbpkb8v4pp5012r5l21zws7p7d8l9"; }; - buildInputs = [ unzip which python ]; + nativeBuildInputs = [ unzip which ]; + buildInputs = [ python perl ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 5fc222bb299..d58b4bf8c4d 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.20.2"; + version = "2.20.3"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0qpc6pi3fmzv8rs5cmk3dd4clrkzbrngsl384b5g0y7471lhavbi"; + sha256 = "0qgj062c983w6qlgfkj6in5cl5rmvpak7rdwmjg2gv972kcfs7lp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index d188ca02b18..e778c3bd52c 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.4"; + version = "2.41"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "1ha1avkh6rqqvsy4k42336a2gj14y1jq19a2x8cjmiidi9l3s29h"; + sha256 = "0q420rzjb05jfchcls3pysm4hxfgs6xj2jw246isx0il10g93gkq"; }; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 2373ae43e76..10fe722d7e9 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -28,7 +28,7 @@ let "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2"; - "8.10+beta1" = "19wf39i0ap2vakglgdlqxpjd3l1h5w7dp460w8y7nc1y06b2153h"; + "8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal"; }."${version}"; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index 4915e42025b..86bd2e84367 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gp2c-${version}"; - version = "0.0.11pl1"; + version = "0.0.11pl2"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz"; - sha256 = "1c6f6vmncw032kfzrfyr8bynw6yd3faxpy2285r009fmr0zxfs5s"; + sha256 = "0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g"; }; buildInputs = [ pari perl ]; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index d0f79600e8c..d4b60a4f538 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "fossil-${version}"; - version = "2.8"; + version = "2.9"; src = fetchurl { urls = @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${name}.tar.gz"; - sha256 = "0pbinf8d2kj1j7niblhzjd2l2khg6r2pn2xvig6gavz27p3vwcka"; + sha256 = "0kwb7pkp7y2my916rhyl6kmcf0fk8gkzaxzy13hfgqs35nlsvchw"; }; buildInputs = [ zlib openssl readline sqlite which ed ] diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 82414befa91..169315d1e2e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { - name = "git-absorb-${version}"; - version = "0.3.0"; + pname = "git-absorb"; + version = "0.5.0"; src = fetchFromGitHub { owner = "tummychow"; - repo = "git-absorb"; + repo = pname; rev = "refs/tags/${version}"; - sha256 = "1dm442lyk7f44bshm2ajync5pzdwvdc5xfpw2lkvjzxflmh5572z"; + sha256 = "0lggv3knh6iglkh8x2zqvqcs3dlwfsdiclg7pmdrycny72la4k2j"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "0q40qcki49dw23n3brgdz5plvigmsf61jm0kfy48j89mijih8zy7"; + cargoSha256 = "1khplyglavsidh13nnq9y5rxd5w89ail08wgzn29a5m03zir1yfd"; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/tummychow/git-absorb"; description = "git commit --fixup, but automatic"; license = [ licenses.bsd3 ]; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 6a39f1fe3d1..abb09ff9a45 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -1,17 +1,20 @@ -{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, stdenv }: +{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, stdenv +, libxslt, docbook_xsl +}: stdenv.mkDerivation rec { - name = "git-crypt-${version}"; + pname = "git-crypt"; version = "0.6.0"; src = fetchFromGitHub { owner = "AGWA"; - repo = "git-crypt"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602"; - inherit name; }; + nativeBuildInputs = [ libxslt ]; + buildInputs = [ openssl makeWrapper ]; patchPhase = '' @@ -19,9 +22,14 @@ stdenv.mkDerivation rec { --replace '(escape_shell_arg(our_exe_path()))' '= "git-crypt"' ''; - installPhase = '' - make install PREFIX=$out - wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin + makeFlags = [ + "PREFIX=${placeholder ''out''}" + "ENABLE_MAN=yes" + "DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl" + ]; + + postFixup = '' + wrapProgram $out/bin/git-crypt --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index a129e0f7527..6866418f3e3 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "subgit-3.3.6"; + name = "subgit-3.3.7"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://subgit.com/download/${name}.zip"; - sha256 = "1zfhl583lx7xdw9jwskv25p6m385wm3s5a311y0hnxxqwkjbgq1j"; + sha256 = "1cpssmvp961kw8s3b9s9bv9jmsm1gk3napggw5810c4rnnihjvrn"; }; } diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 7a8b66d2d28..1c625de0dbc 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pkgconfig, zlib }: stdenv.mkDerivation rec { - version = "0.7.1"; + version = "0.8.0"; name = "gpac-${version}"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "197c5968p5bzvk0ga347fwgkqh4j1v3z65wlx65c5m9gwfxz2k2q"; + sha256 = "1w1dyrn6900yi8ngchfzy5hvxr6yc60blvdq8y8mczimmmq8khb5"; }; # this is the bare minimum configuration, as I'm only interested in MP4Box diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 7c9fc83e0f1..4e19b244f3c 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bazel, cacert, enableNixHacks ? true }: +{ stdenv, bazel, cacert }: args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }: @@ -37,7 +37,15 @@ in stdenv.mkDerivation (fBuildAttrs // { # We disable multithreading for the fetching phase since it can lead to timeouts with many dependencies/threads: # https://github.com/bazelbuild/bazel/issues/6502 - BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch --loading_phase_threads=1 $bazelFlags $bazelTarget + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ + USER=homeless-shelter \ + bazel \ + --output_base="$bazelOut" \ + --output_user_root="$bazelUserRoot" \ + fetch \ + --loading_phase_threads=1 \ + $bazelFlags \ + $bazelTarget runHook postBuild ''; @@ -74,12 +82,14 @@ in stdenv.mkDerivation (fBuildAttrs // { ''; dontFixup = true; + allowedRequisites = []; + outputHashMode = "recursive"; outputHashAlgo = "sha256"; outputHash = fetchAttrs.sha256; }); - nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (if enableNixHacks then (bazel.override { enableNixHacks = true; }) else bazel) ]; + nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (bazel.override { enableNixHacks = true; }) ]; preHook = fBuildAttrs.preHook or "" + '' export bazelOut="$NIX_BUILD_TOP/output" @@ -99,29 +109,6 @@ in stdenv.mkDerivation (fBuildAttrs // { buildPhase = fBuildAttrs.buildPhase or '' runHook preBuild - # Bazel sandboxes the execution of the tools it invokes, so even though we are - # calling the correct nix wrappers, the values of the environment variables - # the wrappers are expecting will not be set. So instead of relying on the - # wrappers picking them up, pass them in explicitly via `--copt`, `--linkopt` - # and related flags. - # - copts=() - host_copts=() - for flag in $NIX_CFLAGS_COMPILE; do - copts+=( "--copt=$flag" ) - host_copts+=( "--host_copt=$flag" ) - done - for flag in $NIX_CXXSTDLIB_COMPILE; do - copts+=( "--copt=$flag" ) - host_copts+=( "--host_copt=$flag" ) - done - linkopts=() - host_linkopts=() - for flag in $NIX_LD_FLAGS; do - linkopts+=( "--linkopt=$flag" ) - host_linkopts+=( "--host_linkopt=$flag" ) - done - BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ USER=homeless-shelter \ bazel \ @@ -129,10 +116,6 @@ in stdenv.mkDerivation (fBuildAttrs // { --output_user_root="$bazelUserRoot" \ build \ -j $NIX_BUILD_CORES \ - "''${copts[@]}" \ - "''${host_copts[@]}" \ - "''${linkopts[@]}" \ - "''${host_linkopts[@]}" \ $bazelFlags \ $bazelTarget diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 5706a98f600..0bfe14a8539 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -94,17 +94,21 @@ rec { /* * Writes a text file to nix store in a specific directory with no - * optional parameters available. Name passed is the destination. + * optional parameters available. * * Example: - * # Writes contents of file to /nix/store// + * # Writes contents of file to /nix/store//share/my-file * writeTextDir "share/my-file" * '' * Contents of File * ''; * */ - writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";}; + writeTextDir = path: text: writeTextFile { + inherit text; + name = builtins.baseNameOf path; + destination = "/${path}"; + }; /* * Writes a text file to /nix/store/ and marks the file as diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix new file mode 100644 index 00000000000..d83e412267a --- /dev/null +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub }: + +let + pname = "victor-mono"; + version = "1.2.1"; +in fetchFromGitHub { + name = "${pname}-${version}"; + + owner = "rubjo"; + repo = pname; + rev = "v${version}"; + + postFetch = '' + tar xf $downloadedFile --strip=1 + unzip public/VictorMonoAll.zip TTF/\* + mkdir -p $out/share/fonts/truetype/${pname} + cp TTF/*.ttf $out/share/fonts/truetype/${pname} + ''; + + sha256 = "0gisjcywmn3kjgwfmzcv8ibxqd126s93id2w0zjly0c7m3ckamh8"; + + meta = with lib; { + homepage = https://rubjo.github.io/victor-mono; + description = "A free programming font with cursive italics and ligatures"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ jpotier ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 3b68bec7585..2a308a2da45 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -2,7 +2,7 @@ , glib, gobject-introspection, libxml2, gtk3, gtk-vnc, freerdp, libvirt, spice-gtk, python3 , spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils -, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret +, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, libsecret , libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}") + gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio ]}") ''; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 77a630261fb..c9f5229f870 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus , gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala -, desktop-file-utils, itstool, wrapGAppsHook }: +, desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool which libxml2 vala desktop-file-utils wrapGAppsHook + hicolor-icon-theme # for setup-hook ]; # Silly ./configure, it looks for dbus file from gnome-shell in the diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index d3319c4522e..15417d4ddbb 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "totem-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12iykwslvnpgmrm4bcchx5rzn2g4rl5r9s86n2001djn58yw6m6r"; + sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v"; }; doCheck = true; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 4d624479bbf..eae425b1892 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-user-guide-${version}"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "02zlfdhrvamd299pbf5s19pr90y8yah84g12shwihlxff7d3hxvs"; + sha256 = "01kcszsjiriqp4hf1k4fhazi2yfqlkn415sfgx0jw0p821bzqf2h"; }; nativeBuildInputs = [ itstool intltool libxml2 ]; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 52d53478da1..f152515d60e 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-user-share-${version}"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "14bhr6fv6gj3ka3sf13q64ck4svx8f4x8kzbppxv0jygpjp48w7h"; + sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 23fb8445838..d8fa143686e 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "icons"; - version = "5.0.3"; + version = "5.0.4"; name = "elementary-icon-theme-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "0wpv7yirf44bfqfmyshzfw9605j1idm7c9jqg68k3nmymmd6iqzf"; + sha256 = "0ha7biqvmkv68x1gi9bfcn5z0ld067pa5czx0pyf053pa86lg3hx"; }; passthru = { diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-13/xfdesktop/default.nix deleted file mode 100644 index 2d87c6ac987..00000000000 --- a/pkgs/desktops/xfce4-13/xfdesktop/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }: - -mkXfceDerivation rec { - category = "xfce"; - pname = "xfdesktop"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; - - sha256 = "1mni8gzgglhwicaw093i2vpk8q2vilmgg5qbr3izbb8ighhr09jl"; - - buildInputs = [ - exo - gtk3 - libxfce4ui - libxfce4util - libwnck3 - xfconf - ]; - - meta = { - description = "Xfce's desktop manager"; - }; -} diff --git a/pkgs/desktops/xfce4-13/automakeAddFlags.sh b/pkgs/desktops/xfce4-14/automakeAddFlags.sh similarity index 100% rename from pkgs/desktops/xfce4-13/automakeAddFlags.sh rename to pkgs/desktops/xfce4-14/automakeAddFlags.sh diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-14/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/default.nix rename to pkgs/desktops/xfce4-14/default.nix diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-14/exo/default.nix similarity index 66% rename from pkgs/desktops/xfce4-13/exo/default.nix rename to pkgs/desktops/xfce4-14/exo/default.nix index fa66b5c08e7..933fa595aad 100644 --- a/pkgs/desktops/xfce4-13/exo/default.nix +++ b/pkgs/desktops/xfce4-14/exo/default.nix @@ -4,15 +4,19 @@ mkXfceDerivation rec { category = "xfce"; pname = "exo"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "1gf9fb48nkafb4jj0hmm2s00mpl32dp5iqxfaxm5i1nc6884hipw"; + sha256 = "0s91fv4yzafmdi25c63yin15sa25cfcyarpvavr4q3mmmiamzpi0"; nativeBuildInputs = [ libxslt perlPackages.URI ]; buildInputs = [ gtk3 libxfce4ui libxfce4util ]; postPatch = '' + substituteInPlace exo-helper/Makefile.am \ + --replace 'exo_helper_2_CFLAGS =' \ + 'exo_helper_2_CFLAGS = $(GIO_UNIX_CFLAGS)' + substituteInPlace docs/reference/Makefile.am \ --replace http://docbook.sourceforge.net/release/xsl/current \ ${docbook_xsl}/share/xml/docbook-xsl diff --git a/pkgs/desktops/xfce4-13/garcon/default.nix b/pkgs/desktops/xfce4-14/garcon/default.nix similarity index 60% rename from pkgs/desktops/xfce4-13/garcon/default.nix rename to pkgs/desktops/xfce4-14/garcon/default.nix index 487e384358a..a63ddeb52ea 100644 --- a/pkgs/desktops/xfce4-13/garcon/default.nix +++ b/pkgs/desktops/xfce4-14/garcon/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "garcon"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "0gmvi6m3iww7m3xxx5wiqd8vsi18igzhcpjfzknfc8z741vc38yj"; + sha256 = "0d2fir4vbfdmng9k70nf5zv3fjwgr6g0czrp458x6qswih2gv2ik"; buildInputs = [ gtk3 libxfce4ui libxfce4util ]; } diff --git a/pkgs/desktops/xfce4-13/gigolo/default.nix b/pkgs/desktops/xfce4-14/gigolo/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/gigolo/default.nix rename to pkgs/desktops/xfce4-14/gigolo/default.nix diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix similarity index 80% rename from pkgs/desktops/xfce4-13/libxfce4ui/default.nix rename to pkgs/desktops/xfce4-14/libxfce4ui/default.nix index d760ed8bc71..77083fabbd3 100644 --- a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix @@ -4,10 +4,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "libxfce4ui"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "0z4sadqwp71b3qmxlbms26d8vnxd9cks84mr2f1qaiww6rp7v69y"; + sha256 = "0kvqzf91ygxxkcy4drjminby4c3c42c54a3if8jwx0zmgbml7l8q"; buildInputs = [ gobject-introspection gtk2 gtk3 libstartup_notification xfconf ]; propagatedBuildInputs = [ libxfce4util libICE libSM ]; diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-14/libxfce4util/default.nix similarity index 71% rename from pkgs/desktops/xfce4-13/libxfce4util/default.nix rename to pkgs/desktops/xfce4-14/libxfce4util/default.nix index 1539b3f88d7..e6cafcac8bb 100644 --- a/pkgs/desktops/xfce4-13/libxfce4util/default.nix +++ b/pkgs/desktops/xfce4-14/libxfce4util/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "libxfce4util"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "13cqv4b34rmr9h7nr9gmk3x2mi2y0v91xzwrwhikd1lmz9ir5lkf"; + sha256 = "0s1fh798v86ifg46qn3zaykpwidn23vpqbkxq1fcbxpxb6rpxxwk"; buildInputs = [ gobject-introspection ]; diff --git a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix similarity index 100% rename from pkgs/desktops/xfce4-13/mkXfceDerivation.nix rename to pkgs/desktops/xfce4-14/mkXfceDerivation.nix diff --git a/pkgs/desktops/xfce4-13/mousepad/default.nix b/pkgs/desktops/xfce4-14/mousepad/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/mousepad/default.nix rename to pkgs/desktops/xfce4-14/mousepad/default.nix diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-14/orage/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/orage/default.nix rename to pkgs/desktops/xfce4-14/orage/default.nix diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-14/parole/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/parole/default.nix rename to pkgs/desktops/xfce4-14/parole/default.nix diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-14/ristretto/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/ristretto/default.nix rename to pkgs/desktops/xfce4-14/ristretto/default.nix diff --git a/pkgs/desktops/xfce4-13/thunar-volman/default.nix b/pkgs/desktops/xfce4-14/thunar-volman/default.nix similarity index 66% rename from pkgs/desktops/xfce4-13/thunar-volman/default.nix rename to pkgs/desktops/xfce4-14/thunar-volman/default.nix index 47900f344b3..db7324140c5 100644 --- a/pkgs/desktops/xfce4-13/thunar-volman/default.nix +++ b/pkgs/desktops/xfce4-14/thunar-volman/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "thunar-volman"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; - sha256 = "1g784yjhjacjnkhr8m62xyhnxlfbwk0fwb366p9kkz035k51idrv"; + sha256 = "0jl863z6rxz50vqa31s58dfn429yn5x8scg492bvgl4cnmni6a30"; } diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-14/thunar/default.nix similarity index 83% rename from pkgs/desktops/xfce4-13/thunar/default.nix rename to pkgs/desktops/xfce4-14/thunar/default.nix index 5dbea2146c5..e559505aca6 100644 --- a/pkgs/desktops/xfce4-13/thunar/default.nix +++ b/pkgs/desktops/xfce4-14/thunar/default.nix @@ -4,10 +4,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "thunar"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "13l1nw526jz80p0ynhxqd3a8flp561z0321z7h4rvnidicvdr32n"; + sha256 = "0b17yf8ss8s8xyr65v4zrq15ayr5nskqpxy4wxah33n7lz09dh8r"; postPatch = '' substituteInPlace docs/Makefile.am \ diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-14/tumbler/default.nix similarity index 69% rename from pkgs/desktops/xfce4-13/tumbler/default.nix rename to pkgs/desktops/xfce4-14/tumbler/default.nix index 27f76fbcaab..e67c7f1e298 100644 --- a/pkgs/desktops/xfce4-13/tumbler/default.nix +++ b/pkgs/desktops/xfce4-14/tumbler/default.nix @@ -6,10 +6,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "tumbler"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "1bvcxqs3391dkf36gpfr0hbylsk84nqhv6kf3lf1hq6p7s9f9z3z"; + sha256 = "1k579g8dmcfpw1vakspv6k2qkr1y1axyr8cbd0fqjhqdj4pis81i"; buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ]; } diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-14/xfburn/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfburn/default.nix rename to pkgs/desktops/xfce4-14/xfburn/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix similarity index 68% rename from pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix rename to pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix index d511f76ec1b..22a6b6fedd2 100644 --- a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-appfinder"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "02ds3s7wbpxka7qnliq4c5p428ricdf0jwv01dkfg88gpgqgvswg"; + sha256 = "0vr5lx4fv0kldqvqfnsjp6ss7ciz0b2yjq4fhmrhk8czkf8p7va8"; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix similarity index 83% rename from pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix rename to pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix index 9dedb8674dc..49133b0ba2d 100644 --- a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix @@ -4,9 +4,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-dev-tools"; - version = "4.12.0"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "0bbmlmw2dpm10q2wv3vy592i0vx7b5h1qnd35j0fdzxqb8x2hbw2"; + sha256 = "11g5byxjihgkn0wi7gp8627d04wr59k117lpv53vdbsvv2qgksmg"; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce4-14/xfce4-dev-tools/setup-hook.sh similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh rename to pkgs/desktops/xfce4-14/xfce4-dev-tools/setup-hook.sh diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch b/pkgs/desktops/xfce4-14/xfce4-dict/configure-gio.patch similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch rename to pkgs/desktops/xfce4-14/xfce4-dict/configure-gio.patch diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-14/xfce4-dict/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-dict/default.nix rename to pkgs/desktops/xfce4-14/xfce4-dict/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-mixer/default.nix rename to pkgs/desktops/xfce4-14/xfce4-mixer/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-netload-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix rename to pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix similarity index 90% rename from pkgs/desktops/xfce4-13/xfce4-panel/default.nix rename to pkgs/desktops/xfce4-14/xfce4-panel/default.nix index c7551a7e6da..4f1de32abdf 100644 --- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-panel"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "03jyglimm4wgpmg5a128fshrygzwmpf5wdw26l9azqj8b6iz55al"; + sha256 = "1p0bkbxjh14kgny2lpcjg2q8pm55l8i7qsr5bsvdppw3ab46kz34"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix similarity index 83% rename from pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix rename to pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix index 0307738aee2..a855f2c977e 100644 --- a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix @@ -4,10 +4,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-power-manager"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "1n9i62jh5ldf8g9n64mm6nh1182abbf96444j14dppb82r94q077"; + sha256 = "1x1ssji4v9qp64si38paz15bgsgs1w3hkx080qznnmcxqlg7zpj9"; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-pulseaudio-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix rename to pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-session/default.nix b/pkgs/desktops/xfce4-14/xfce4-session/default.nix similarity index 87% rename from pkgs/desktops/xfce4-13/xfce4-session/default.nix rename to pkgs/desktops/xfce4-14/xfce4-session/default.nix index 6104f632439..a39a70b09a8 100644 --- a/pkgs/desktops/xfce4-13/xfce4-session/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-session/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-session"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "14bn3wn5qrciy2nbhbx634bz0d6lnxb135bx1qglcf35wn6f0hqk"; + sha256 = "1asfy11rp6zmn70a3w5dqssxpxywhpm9ns7zyiaz6pnpcq075dr0"; buildInputs = [ exo dbus-glib dbus gtk3 libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix similarity index 87% rename from pkgs/desktops/xfce4-13/xfce4-settings/default.nix rename to pkgs/desktops/xfce4-14/xfce4-settings/default.nix index 7e885c526d1..a939f5e213c 100644 --- a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix @@ -5,10 +5,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-settings"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "0q6jh3fqw9n9agp018xiwidrld445irnli5jgwpszi9hc435dbpc"; + sha256 = "0agi5flbzbc9q29yh7wbk3giif74finf4shq3q7v2h91w5kvyc9j"; postPatch = '' automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix rename to pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-terminal/default.nix rename to pkgs/desktops/xfce4-14/xfce4-terminal/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix rename to pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-xkb-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-14/xfconf/default.nix similarity index 55% rename from pkgs/desktops/xfce4-13/xfconf/default.nix rename to pkgs/desktops/xfce4-14/xfconf/default.nix index 691fc70644c..8a37aefab41 100644 --- a/pkgs/desktops/xfce4-13/xfconf/default.nix +++ b/pkgs/desktops/xfce4-14/xfconf/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfconf"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "0n9cjiz3mj011p3w4jv0n2ifz38whmykdl888mczc26l1gflxnr3"; + sha256 = "056r2dkkw8hahqin1p5k8rz0r9r0z8piniy855nd1ns0mx2sh47k"; buildInputs = [ libxfce4util ]; } diff --git a/pkgs/desktops/xfce4-14/xfdesktop/default.nix b/pkgs/desktops/xfce4-14/xfdesktop/default.nix new file mode 100644 index 00000000000..6b99b1b6a35 --- /dev/null +++ b/pkgs/desktops/xfce4-14/xfdesktop/default.nix @@ -0,0 +1,25 @@ +{ mkXfceDerivation, exo, wrapGAppsHook, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfdesktop"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; + + sha256 = "14sfcxbwxhhwn9nmiap46nz6idvw5hwr8wyjqrhq4h79x78g18k4"; + + nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system" + + buildInputs = [ + exo + gtk3 + libxfce4ui + libxfce4util + libwnck3 + xfconf + ]; + + meta = { + description = "Xfce's desktop manager"; + }; +} diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-14/xfwm4/default.nix similarity index 79% rename from pkgs/desktops/xfce4-13/xfwm4/default.nix rename to pkgs/desktops/xfce4-14/xfwm4/default.nix index c8106c8ec17..34b5bdae45a 100644 --- a/pkgs/desktops/xfce4-13/xfwm4/default.nix +++ b/pkgs/desktops/xfce4-14/xfwm4/default.nix @@ -5,10 +5,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfwm4"; - version = "4.14pre1"; - rev = "xfce-4.14pre1"; + version = "4.14pre2"; + rev = "xfce-4.14pre2"; - sha256 = "0kdlkpb7phcrsqhyhnw82f03fzmd5xb4w9fdj94frfprfja0b468"; + sha256 = "00nysv5qrv5n4xzyqv4jnsmgljwr2wyynis1gpdbm2kvl5ndxrrd"; nativeBuildInputs = [ exo librsvg ]; diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index abe3c9e5122..d947acc3ea6 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -63,7 +63,7 @@ let export MIX_ENV=prod export MIX_NO_DEPS=1 - mix compile ${debugInfoFlag} + mix compile ${debugInfoFlag} --no-deps-check runHook postBuild '' diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 8ebed6f4b5b..77f051156d1 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }: let - defaultVersion = "84"; + defaultVersion = "86"; # Map from git revs to SHA256 hashes sha256s = { - "version_84" = "189zqc5gp8fm7clsgby9h2s758ijil7ma4liwbf81wnwkb4kqxc0"; + "version_86" = "12h5018rdwg7vjni0mz91vkpdwyqw0nfacig3vg9dvyn4fnfm76z"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; }; in diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index ff4e387f07e..e4d3398476e 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.10.5"; + version = "1.10.6"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.10.5"; - sha256 = "1g7izkjqb5xmp87k2aw0fgkxhcf7b9jn9hi60lwav3yhs50j8qsi"; + rev = "Release-1.10.6"; + sha256 = "1g8g853iq56knlvn1hdsck78by3843vyly9wji5ip41r6i2s0zla"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index b0ca96f23ac..dce46ade459 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -1,32 +1,32 @@ -{ stdenv, fetchurl, darwin }: +{ stdenv, fetchurl }: let - version = "110.85"; + version = "110.91"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; sources = map fetchurl [ - { url = "${baseurl}/config.tgz"; sha256 = "1qlir3q0vi7f1wyz2jyaiqy3z72d0xngsa122ks5g0b7b0hcdgm1"; } - { url = "${baseurl}/cm.tgz"; sha256 = "0330jkmaxgy085hsgajqikm242gms650rks24mfxhgk11r4ks105"; } - { url = "${baseurl}/compiler.tgz"; sha256 = "1zrqqvi9332g3clrh01z19sl06g3zlnp6zzz5z8rvsfwbiqp929m"; } - { url = "${baseurl}/runtime.tgz"; sha256 = "1n9hd99s2i834yihx4n59gl1cnh7hiiz8im735bmifmv50vzfdf4"; } - { url = "${baseurl}/system.tgz"; sha256 = "17samia4lzcz3mk73i330bspap2ks937arx35n9dr7bws0appfm8"; } - { url = "${baseurl}/MLRISC.tgz"; sha256 = "039g6dwxy96bkvw1z19vwn8q150h7s8jlcmsg851bgz3j3h6vs18"; } - { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1wk4w1npipm6qqgwis2xrbdjamwmiwv6ci4y40nzryhb37yxfj6d"; } - { url = "${baseurl}/old-basis.tgz"; sha256 = "0lkhbkkglz7lk1c93hc1y1di5dx20fgfhybvsqjp1bcwz8jsd70y"; } - { url = "${baseurl}/ckit.tgz"; sha256 = "14qxgw2vhq4dfiv5zl2gdhvjp75s10dqw97mqxffmh3vayyad1fi"; } - { url = "${baseurl}/nlffi.tgz"; sha256 = "16l8iszkyh34dqdbplsxycipvbw61yjamgxllcq8axiq4h7spy7w"; } - { url = "${baseurl}/cml.tgz"; sha256 = "05dlqz4r3qa3rpqgjlx91fsfx7j6gk3dkw28zcgg5g32irmd1la3"; } - { url = "${baseurl}/eXene.tgz"; sha256 = "07mahzxns26hkfax9gc8cq4s8sfzj531wwnm47b8qkhd72d3ncn2"; } - { url = "${baseurl}/ml-lpt.tgz"; sha256 = "0073hfn98l61ryshhqw9855fb49vs9qcz9nplbg2pa2f7manqbk0"; } - { url = "${baseurl}/ml-lex.tgz"; sha256 = "106km17f4wyvhzkx62cfq2gp4ihya8l234550laqb50zf8vxyklq"; } - { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1r0k7lz8xnir271pykbs4agadysbs35kkmg1p816kzfyz5bsrrq9"; } - { url = "${baseurl}/ml-burg.tgz"; sha256 = "10jqasplbxp50ryq74aazbnyaz8l492rhdij5mr1kzyfj79fysh9"; } - { url = "${baseurl}/pgraph.tgz"; sha256 = "1pxqddbrb7y9kp89gz8v8vfjmw4wajfy6757gb8c6x499jarxa60"; } - { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0fkalpdzdrm1gmafn33ck4dw8s92p9iwm4fav4m9jcqyha9az3g7"; } - { url = "${baseurl}/heap2asm.tgz"; sha256 = "056gkmrylyrf0q0r3cpx76zx8mc62033jkn1bnjn0f8r31yhbipc"; } - { url = "${baseurl}/smlnj-c.tgz"; sha256 = "04c4jnylj5dnd4sjywzwnqlv9g7dkrilq6d4cy543dw03yhjdykw"; } - { url = "${baseurl}/doc.tgz"; sha256 = "1rpk9g1nhjpc2b4pmzmj8v80knrhljn17ghiwznnljv53hka7jzx"; } - { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "05rh1y74jvp6zs96mb7nkwbgwwbss0zy2iw4gicdkyf6in0nk4la"; } - { url = "${baseurl}/asdl.tgz"; sha256 = "1d465bncgy92ni6430dbq6isvnysfhvykjrxm98dz82iih7a6vqb"; } + { url = "${baseurl}/config.tgz"; sha256 = "00vbg2kpwgkf272m697p5hd35pawficbrifchn7dnd519wpdx436"; } + { url = "${baseurl}/cm.tgz"; sha256 = "0wxb0s2fwh7lbb3z2pfvmvhk5v0gm75kchkv7gg9f895ahyvm6yd"; } + { url = "${baseurl}/compiler.tgz"; sha256 = "0iq06ycivy562i59vvbma9zi575zw1djhdfkcy0bn7m9kfzzbgkh"; } + { url = "${baseurl}/runtime.tgz"; sha256 = "0km8p4vmy3m38xv0rl8d3mh2nlk2mvx010npm34gs374bmmzc7z9"; } + { url = "${baseurl}/system.tgz"; sha256 = "16d5vs1rn7ly6jxjm08222cj0sry73pr57xpc9d6k286b1v0910b"; } + { url = "${baseurl}/MLRISC.tgz"; sha256 = "1c9sw8zm90ykas5nwbhk2wic7sxkjrylb610x37v46m5ips1wlma"; } + { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "09ka20ym7ahrpj4r6vc5phflc8y57dj09qvwk8ambfwb2p2274sw"; } + { url = "${baseurl}/old-basis.tgz"; sha256 = "1bhq9fv6p8diz489h9571g0xrsi8yx7h6gh9410255klxjrw964h"; } + { url = "${baseurl}/ckit.tgz"; sha256 = "1lq9ljai0shc6hszx5v6bqmkz16a3f295mfg7q622apzgzark3vd"; } + { url = "${baseurl}/nlffi.tgz"; sha256 = "1xjmlwiclgckj73z5hz3hnqlavp3ax9sfvgc0rvj3xpy3i3n6axj"; } + { url = "${baseurl}/cml.tgz"; sha256 = "1sjzipxnvr9dgcg16bllfk3b46ac9f8h353nh1ccykwwq4whi9bf"; } + { url = "${baseurl}/eXene.tgz"; sha256 = "04clbchrlqx5v35gkbydbfnpl720i4nqijkshiwn0v592n4xfdf4"; } + { url = "${baseurl}/ml-lpt.tgz"; sha256 = "0max073nzwv7vx13caj7zmlhslvxlgg8rj52278g7f6fqcrwp5cf"; } + { url = "${baseurl}/ml-lex.tgz"; sha256 = "0x2mbg45l71049sgvvkl6bnqc5svz70vh1m1rbf3xk41z5bapcgr"; } + { url = "${baseurl}/ml-yacc.tgz"; sha256 = "0a1pbwpw1y6d1xn9yjarqpmybrxqwp5snp28by36745h1jvb1p1b"; } + { url = "${baseurl}/ml-burg.tgz"; sha256 = "119mq5jrbkn9vf9fgb0wyz483hf26al9hwb91xpmlmfx5qqnfzik"; } + { url = "${baseurl}/pgraph.tgz"; sha256 = "1s7jmh3q88rz29bk02y3gzdqrgvk484j5ji8bn7s6fc78m50nqp8"; } + { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1gzf1pbmw2cn5w6f5qfdm3d6n6069n1nnzz6z4v7mr07x54c6mdv"; } + { url = "${baseurl}/heap2asm.tgz"; sha256 = "09cgj568a9x017awysjdx35mlp5zkdmc2fs67fvnm5ifl7ivfs8j"; } + { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1g4xhcxychs9q25x7a5lvqfamq52c5ljlx84bc5cazvpkhixyg04"; } + { url = "${baseurl}/doc.tgz"; sha256 = "1l0x91dscizk2pyj1lw595r84h1h0shxh0x5hva891717a1hfa51"; } + { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "0f6x4nfhrgm1z4dx862df2yaffdh1sd6zx2lyb2vph5mhp7x9n58"; } + { url = "${baseurl}/asdl.tgz"; sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; } ]; in stdenv.mkDerivation { name = "smlnj-${version}"; @@ -36,15 +36,7 @@ in stdenv.mkDerivation { patchPhase = '' sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl - '' + stdenv.lib.optionalString stdenv.isDarwin (with darwin; '' - sed -i '/^[[:space:]]*\*x86-darwin\*)$/,/^[[:space:]]*\*) ;;/ c\ -\ \*x86-darwin\*)\ -\ INCLFILE=${stdenv.lib.getDev apple_sdk.sdk}/include/unistd.h\ -\ ;;\ -\ \*) ;; -' base/runtime/config/gen-posix-names.sh - sed -i 's|^AS =\([[:space:]]*\)/usr/bin/as|AS =\1as|' base/runtime/objs/mk.x86-darwin - ''); + ''; unpackPhase = '' for s in $sources; do @@ -74,7 +66,7 @@ in stdenv.mkDerivation { description = "Standard ML of New Jersey, a compiler"; homepage = http://smlnj.org; license = licenses.bsd3; - platforms = [ "i686-linux" ] ++ platforms.darwin; + platforms = [ "i686-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 35f56a12560..aebab7b6f04 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -163,6 +163,7 @@ rec { markBroken = drv: overrideCabal drv (drv: { broken = true; hydraPlatforms = []; }); unmarkBroken = drv: overrideCabal drv (drv: { broken = false; }); markBrokenVersion = version: drv: assert drv.version == version; markBroken drv; + markUnbroken = drv: overrideCabal drv (drv: { broken = false; }); enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; }); disableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = false; }); diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 49715bf256b..fce94ecc846 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -12,11 +12,11 @@ (rec { name = "guile-${version}"; - version = "2.2.4"; + version = "2.2.6"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"; + sha256 = "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index f071aab94c7..ceea3932063 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mujs-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; - sha256 = "02cqrfnww2s3ylcvqin1951f2c5nzpby8gxb207p2hbrivbg8f0l"; + sha256 = "1q9w2dcspfp580pzx7sw7x9gbn8j0ak6dvj75wd1ml3f3q3i43df"; }; buildInputs = [ readline ]; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 01cffe93024..5adf41a0f3b 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -3,10 +3,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "picoLisp-${version}"; - version = "18.12"; + version = "19.6"; src = fetchurl { url = "https://www.software-lab.de/${name}.tgz"; - sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk"; + sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq"; }; buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk; patchPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch index ceb6047d31d..243313f7654 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch +++ b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch @@ -83,8 +83,8 @@ _osx_support.customize_compiler(_config_vars) _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' -- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'CFLAGS', - 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') + (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ + get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', @@ -108,7 +108,7 @@ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] + ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] +- cflags = cflags + ' ' + os.environ['CFLAGS'] + cflags = os.environ['CFLAGS'] ldshared = ldshared + ' ' + os.environ['CFLAGS'] + if 'CXXFLAGS' in os.environ: diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index a2ef54cc136..ba33b1fbc1d 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "SDL2_image-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; - sha256 = "1b6f7002bm007y3zpyxb5r6ag0lml51jyvx1pwpj9sq24jfc8kp7"; + sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx"; }; buildInputs = [ SDL2 libpng libjpeg libtiff libungif libwebp libXpm zlib ] diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index e16aee9f5ca..db6793df646 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -97,7 +97,7 @@ , libXv ? null # Xlib support , libXext ? null # Xlib support , lzma ? null # xz-utils -, nvenc ? true, nv-codec-headers ? null # NVIDIA NVENC support +, nvenc ? !stdenv.isDarwin, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder @@ -175,7 +175,7 @@ */ let - inherit (stdenv) isCygwin isFreeBSD isLinux; + inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux; inherit (stdenv.lib) optional optionals optionalString enableFeature; in @@ -189,6 +189,10 @@ assert nonfreeLicensing -> gplLicensing && version3Licensing; */ assert networkBuild -> gnutls != null || opensslExtlib; assert pixelutilsBuild -> avutilLibrary; +/* + * Platform dependencies + */ +assert isDarwin -> !nvenc; /* * Program dependencies */ diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 693fda99759..218a44215c6 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -45,5 +45,17 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; + description = "GNOME crypto services (daemon and tools)"; + homepage = https://gitlab.gnome.org/GNOME/gcr; + license = licenses.gpl2; + + longDescription = '' + GCR is a library for displaying certificates, and crypto UI, accessing + key stores. It also provides the viewer for crypto files on the GNOME + desktop. + + GCK is a library for accessing PKCS#11 modules like smart cards, in a + (G)object oriented way. + ''; }; } diff --git a/pkgs/development/libraries/gdal/001.3_0_1.darwin.patch b/pkgs/development/libraries/gdal/001.3_0_1.darwin.patch new file mode 100644 index 00000000000..3d34f689120 --- /dev/null +++ b/pkgs/development/libraries/gdal/001.3_0_1.darwin.patch @@ -0,0 +1,29 @@ +diff a/swig/python/setup.py b/swig/python/setup.py +--- a/swig/python/setup.py ++++ b/swig/python/setup.py +@@ -268,17 +268,17 @@ class gdal_ext(build_ext): + if ext.name != 'osgeo._gdalconst': + ext.extra_compile_args += [cxx11_flag] + +- # Adding arch flags here if OS X and compiler is clang +- if sys.platform == 'darwin' and [int(x) for x in os.uname()[2].split('.')] >= [11, 0, 0]: +- # since MacOS X 10.9, clang no longer accepts -mno-fused-madd +- # extra_compile_args.append('-Qunused-arguments') +- clang_flag = '-Wno-error=unused-command-line-argument-hard-error-in-future' +- if has_flag(self.compiler, clang_flag): +- ext.extra_compile_args += [clang_flag] +- else: +- clang_flag = '-Wno-error=unused-command-line-argument' +- if has_flag(self.compiler, clang_flag): +- ext.extra_compile_args += [clang_flag] ++ # Adding arch flags here if OS X and compiler is clang ++ if sys.platform == 'darwin' and [int(x) for x in os.uname()[2].split('.')] >= [11, 0, 0]: ++ # since MacOS X 10.9, clang no longer accepts -mno-fused-madd ++ # extra_compile_args.append('-Qunused-arguments') ++ clang_flag = '-Wno-error=unused-command-line-argument-hard-error-in-future' ++ if has_flag(self.compiler, clang_flag): ++ ext.extra_compile_args += [clang_flag] ++ else: ++ clang_flag = '-Wno-error=unused-command-line-argument' ++ if has_flag(self.compiler, clang_flag): ++ ext.extra_compile_args += [clang_flag] diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix new file mode 100644 index 00000000000..14113d8b87e --- /dev/null +++ b/pkgs/development/libraries/gdal/2.4.0.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib +, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl +, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat +, libiconv, libxml2 +, netcdfSupport ? true, netcdf, hdf5, curl +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "gdal-${version}"; + version = "2.4.0"; + + src = fetchurl { + url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; + }; + + buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite + libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] + ++ (with pythonPackages; [ python numpy wrapPython ]) + ++ stdenv.lib.optional stdenv.isDarwin libiconv + ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; + + configureFlags = [ + "--with-expat=${expat.dev}" + "--with-jpeg=${libjpeg.dev}" + "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) + "--with-png=${libpng.dev}" # optional + "--with-poppler=${poppler.dev}" # optional + "--with-libz=${zlib.dev}" # optional + "--with-pg=${postgresql}/bin/pg_config" + "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config" + "--with-geotiff=${libgeotiff.dev}" + "--with-sqlite3=${sqlite.dev}" + "--with-spatialite=${libspatialite}" + "--with-python" # optional + "--with-proj=${proj.dev}" # optional + "--with-geos=${geos}/bin/geos-config"# optional + "--with-hdf4=${hdf4.dev}" # optional + "--with-xml2=${libxml2.dev}/bin/xml2-config" # optional + (if netcdfSupport then "--with-netcdf=${netcdf}" else "") + ]; + + hardeningDisable = [ "format" ]; + + CXXFLAGS = "-fpermissive"; + + postPatch = '' + sed -i '/ifdef bool/i\ + #ifdef swap\ + #undef swap\ + #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h + # poppler 0.73.0 support + patch -lp2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff"; + sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734"; + } + } || true + patch -p2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff"; + sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj"; + } + } + ''; + + # - Unset CC and CXX as they confuse libtool. + # - teach gdal that libdf is the legacy name for libhdf + preConfigure = '' + unset CC CXX + substituteInPlace configure \ + --replace "-lmfhdf -ldf" "-lmfhdf -lhdf" + ''; + + preBuild = '' + substituteInPlace swig/python/GNUmakefile \ + --replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)" + ''; + + postInstall = '' + wrapPythonPrograms + ''; + + enableParallelBuilding = true; + + meta = { + description = "Translator library for raster geospatial data formats"; + homepage = https://www.gdal.org/; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index e7ffdde6cb1..0db16e2efe3 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib +{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat -, libiconv, libxml2 +, libiconv, libxml2, autoreconfHook , netcdfSupport ? true, netcdf, hdf5, curl }: @@ -9,15 +9,23 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gdal-${version}"; - version = "2.4.0"; + version = "3.0.1"; - src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; + src = fetchFromGitHub { + owner = "OSGeo"; + repo = "gdal"; + rev = "v${version}"; + sha256 = "04rraqhygv8b8fy87qvdhkgx87whby9n98p3gxqr7kdrfymwnh8l"; }; + sourceRoot = "source/gdal"; + + patches = [ ./001.3_0_1.darwin.patch ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite - libspatialite poppler hdf4 qhull giflib expat libxml2 ] + libspatialite libgeotiff poppler hdf4 qhull giflib expat libxml2 ] ++ (with pythonPackages; [ python numpy wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; @@ -35,7 +43,7 @@ stdenv.mkDerivation rec { "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" "--with-python" # optional - "--with-proj=${proj}" # optional + "--with-proj=${proj.dev}" # optional "--with-geos=${geos}/bin/geos-config"# optional "--with-hdf4=${hdf4.dev}" # optional "--with-xml2=${libxml2.dev}/bin/xml2-config" # optional @@ -46,31 +54,9 @@ stdenv.mkDerivation rec { CXXFLAGS = "-fpermissive"; - postPatch = '' - sed -i '/ifdef bool/i\ - #ifdef swap\ - #undef swap\ - #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h - - # poppler 0.73.0 support - patch -lp2 <${ - fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff"; - sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734"; - } - } || true - patch -p2 <${ - fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff"; - sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj"; - } - } - ''; - # - Unset CC and CXX as they confuse libtool. # - teach gdal that libdf is the legacy name for libhdf preConfigure = '' - unset CC CXX substituteInPlace configure \ --replace "-lmfhdf -ldf" "-lmfhdf -lhdf" ''; diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 32101221e64..40308a95791 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl"; }; - buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; + buildInputs = [ unzip libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ]; patches = [ # This ensures that the python package is installed into gdal's prefix, @@ -33,12 +33,17 @@ stdenv.mkDerivation rec { "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql57.connector-c}/bin/mysql_config" - "--with-geotiff=${libgeotiff}" + "--with-geotiff=${libgeotiff.dev}" "--with-python" # optional "--with-static-proj4=${proj}" # optional "--with-geos=${geos}/bin/geos-config"# optional ]; + # Allow use of old proj_api.h + NIX_CFLAGS_COMPILE = [ + "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" + ]; + # Prevent this: # # Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 61d39bc9636..703fcb58898 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gst-plugins-base libxml2 ]; + mesonFlags = [ + "-Dgtk_doc=disabled" + ]; + patches = [ ./fix_pkgconfig_includedir.patch ]; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index b69e99e0fb8..1c238a8424c 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg -, pango, pkgconfig, which, vte }: +, glib, gtk3, gtksourceview, libgda, libpeas, pango, pkgconfig, which, vte }: -stdenv.mkDerivation rec { +let + inherit (gst_all_1) gstreamer gst-plugins-base; +in stdenv.mkDerivation rec { name = "gtkd-${version}"; version = "3.8.5"; @@ -13,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dmd pkgconfig which ]; propagatedBuildInputs = [ - atk cairo gdk_pixbuf glib gstreamer gst_plugins_base gtk3 gtksourceview + atk cairo gdk_pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview libgda libpeas librsvg pango vte ]; @@ -57,8 +59,8 @@ stdenv.mkDerivation rec { --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \ --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib substituteInPlace generated/gstreamer/gstinterfaces/c/functions.d \ - --replace libgstvideo-1.0.so.0 ${gst_plugins_base}/lib/libgstvideo-1.0.so.0 \ - --replace libgstvideo-1.0.0.dylib ${gst_plugins_base}/lib/libgstvideo-1.0.0.dylib + --replace libgstvideo-1.0.so.0 ${gst-plugins-base}/lib/libgstvideo-1.0.so.0 \ + --replace libgstvideo-1.0.0.dylib ${gst-plugins-base}/lib/libgstvideo-1.0.0.dylib substituteInPlace generated/sourceview/gsv/c/functions.d \ --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \ --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib @@ -84,11 +86,6 @@ stdenv.mkDerivation rec { installFlags = "prefix=$(out)"; - inherit atk cairo gdk_pixbuf librsvg pango; - inherit (gnome3) glib gtk3 gtksourceview libgda libpeas; - inherit (gst_all_1) gstreamer; - gst_plugins_base = gst_all_1.gst-plugins-base; - meta = with stdenv.lib; { description = "D binding and OO wrapper for GTK+"; homepage = https://gtkd.org; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 0ee66c9050c..e549067b11f 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "intel-media-driver-${version}"; - version = "19.1.0"; + version = "19.2"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "072ry87h1lds14fqb2sfz3n2sssvacamaxv2gj4nd8agnzbwizn7"; + sha256 = "118cg1grzm62lppaygvh7mgxn23bicjkwjwpxhbyqs9g6yhdj3p8"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index e46f22fadfb..322cb486e93 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.6"; + version = "3.9"; name = "commons-lang-${version}"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "0r1wdjw48k2mk2wzyq5c3cx2zmark4q9psw52ma6v2i0sh6a9il0"; + sha256 = "0l0q1hnicvpbjmxl81ig3rwc212x5sdfnlg3cniwbmnx8fxjgbki"; }; installPhase = '' diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index 218eaeea571..c48818972b5 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libcdaudio-0.99.12"; + name = "libcdaudio-0.99.12p2"; src = fetchurl { - url = mirror://sourceforge/libcdaudio/libcdaudio-0.99.12.tar.gz ; - sha256 = "1g3ba1n12g8h7pps0vlxx8di6cmf108mbcvbl6hj8x71ndkglygb" ; + url = mirror://sourceforge/libcdaudio/libcdaudio-0.99.12p2.tar.gz ; + sha256 = "1fsy6dlzxrx177qc877qhajm9l4g28mvh06h2l15rxy4bapzknjz" ; }; meta = { diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 067144ddfa0..86d14fe7974 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.20.3"; + version = "3.20.4"; name = "libdap-${version}"; nativeBuildInputs = [ bison flex ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "0n6ciicaa7sn88gvg5sgcq0438i3vh6xbl9lxgafjqiznli1k5i9"; + sha256 = "0x44igs389b49nb2psd656wpvmbx9bwmla2l5ahfa09vxb314s5i"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 4a051f34b0b..2a87994db5e 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, nettle }: +{ stdenv +, fetchurl + +, gettext +, gnutls +, nettle +, pkgconfig +}: stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.16.0"; + version = "0.17.1"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1fd71vmllzvljff5l5ka5wnzbdsxx4i54dpxpklydmbsqpilnv1v"; + sha256 = "1cnkcl9vif5lz1yx813qrphlpc6gvmzxdmkbd17kh5jqiqdi9vyk"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ nettle ]; + buildInputs = [ gettext gnutls nettle ]; meta = with stdenv.lib; { - homepage = https://lib.filezilla-project.org/; + homepage = "https://lib.filezilla-project.org/"; description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 33b9e7830e7..51520eb0fe3 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -1,18 +1,27 @@ -{ stdenv, fetchurl, libtiff, libjpeg, proj, zlib}: +{ stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.4.3"; + version = "1.5.1"; name = "libgeotiff-${version}"; - src = fetchurl { - url = "https://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz"; - sha256 = "0rbjqixi4c8yz19larlzq6jda0px2gpmpp9c52cyhplbjsdhsldq"; + src = fetchFromGitHub { + owner = "OSGeo"; + repo = "libgeotiff"; + rev = version; + sha256 = "081ag23pn2n5y4fkb2rnh4hmcnq92siqiqv0s20jmx0j3s2nvfxy"; }; + outputs = [ "out" "dev" ]; + + sourceRoot = "source/libgeotiff"; + configureFlags = [ "--with-jpeg=${libjpeg.dev}" "--with-zlib=${zlib.dev}" ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libtiff proj ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 3300e9b1d68..5e35a43fb9d 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.32.1"; + version = "3.32.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1079d26y8d2zaw9w50l9scqjhbrynpdd6kyaa32x4393f7nih8hw"; + sha256 = "00iwbllh8dmnqch0ysng9xhkzzs3ir9jl9f4hp41vbvg1pq5zv98"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 04f0db030bb..b971c8924f3 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null }: @@ -21,6 +21,17 @@ stdenv.mkDerivation rec { patches = [ ./osinfo-db-data-dir.patch + # https://nvd.nist.gov/vuln/detail/CVE-2019-13313 + (fetchpatch { + url = "https://gitlab.com/libosinfo/libosinfo/commit/3654abee6ead9f11f8bb9ba8fc71efd6fa4dabbc.patch"; + name = "CVE-2019-13313-1.patch"; + sha256 = "1lybywfj6b41zfjk33ap90bab5l84lf5y3kif7vd2b6wq5r91rcn"; + }) + (fetchpatch { + url = "https://gitlab.com/libosinfo/libosinfo/commit/08fb8316b4ac42fe74c1fa5ca0ac593222cdf81a.patch"; + name = "CVE-2019-13313-2.patch"; + sha256 = "1f6rhkrgy3j8nmidk97wnz6p35zs1dsd63d3np76q7qs7ra74w9z"; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 1a998c04435..5eb8049437c 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.19.2"; + version = "0.19.3"; src = fetchurl { url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "0i4nhjm5556xgn966x0i503ygk2wafq6z83kg0lisacjjab4f3a0"; + sha256 = "0xs1qb6pcvc4c43fy5xi3nkqxcif77gakkw99irf0fc5iccdd5px"; }; outputs = [ "out" "lib" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 8e7b539527e..7bd22248d87 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -11,12 +11,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 sqlite zlib proj geos libiconv ]; configureFlags = [ "--disable-freexl" ]; enableParallelBuilding = true; + CFLAGS = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; + postInstall = "" + optionalString stdenv.isDarwin '' ln -s $out/lib/mod_spatialite.{so,dylib} ''; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index cce10a761d3..95644e2682e 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre137_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre150_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "91dde5c956b1af491bc6c16ee230daa4b4b66706"; - sha256 = "0rk1ikrn3s6sp3gx7kc4y6msx7yncr3845m67vhk8lxvhd90sgza"; + rev = "93f3e8d511e53133a4367afe04b5f256073082a0"; + sha256 = "14ndx3z0q6gynkmlwiah6775ss0p1xmjgn428gqgbsganiyhkwgp"; }; separateDebugInfo = true; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 7529d69ddde..143555137d7 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,14 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "libyaml"; version = "0.2.2"; - src = fetchurl { - url = "https://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; - sha256 = "1karpcfgacgppa82wm2drcfn2kb6q2wqfykf5nrhy20sci2i2a3q"; + src = fetchFromGitHub { + owner = "yaml"; + repo = "libyaml"; + rev = version; + sha256 = "0839nqcmxjzfgjn39j7740pnlsgmvngpkamiw1lfy1qlcqyc3r4v"; }; + nativeBuildInputs = [ autoreconfHook ]; + meta = with stdenv.lib; { homepage = https://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 849da2e6cad..96444ea4a23 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "movit-${version}"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "https://movit.sesse.net/${name}.tar.gz"; - sha256 = "1q9h086v6h3da4b9qyflcjx73cgnqjhb92rv6g4j90m34dndaa3l"; + sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 51081f25bf2..f920f637960 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { }) ]; + buildFlags = [ "CXXFLAGS=-std=c++03" ]; + # `faac' expects `mp4.h'. postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h"; diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix new file mode 100644 index 00000000000..7117599d15e --- /dev/null +++ b/pkgs/development/libraries/mumlib/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +, boost, openssl, log4cpp, libopus, protobuf }: +with lib; stdenv.mkDerivation rec { + pname = "mumlib"; + version = "unstable-2018-12-12"; + + src = fetchFromGitHub { + owner = "slomkowski"; + repo = "mumlib"; + rev = "f91720de264c0ab5e02bb30deafc5c4b2c245eac"; + sha256 = "0p29z8379dp2ra0420x8xjp4d3r2mf680lj38xmlc8npdzqjqjdp"; + }; + + buildInputs = [ boost openssl libopus protobuf log4cpp ]; + nativeBuildInputs = [ cmake pkgconfig ]; + installPhase = '' + install -Dm555 libmumlib.so $out/lib/libmumlib.so + cp -a ../include $out + ''; + + meta = { + description = "Fairy simple Mumble library written in C++, using boost::asio asynchronous networking framework"; + homepage = "https://github.com/slomkowski/mumlib"; + maintainers = with maintainers; [ das_j ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index f3fc4caf315..b410686865f 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.44"; + version = "3.44.1"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz"; - sha256 = "1zvabgxlyvz3fnv4w89y4a5qkscjmm88naf929dgvvgfnrchwqm5"; + sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 17ad9e53005..760fc3e3232 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -32,7 +32,8 @@ in stdenv.mkDerivation rec { ''; buildInputs = with stdenv; [ gfortran zlib ] - ++ lib.optionals isLinux [ libnl numactl libevent hwloc ] + ++ lib.optionals isLinux [ libnl numactl ] + ++ [ libevent hwloc ] ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 4dffa7486a1..68ddf5c91d1 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "poco-${version}"; - version = "1.9.0"; + version = "1.9.2"; src = fetchurl { url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz"; - sha256 = "11z1i0drbacs7c7d5virc3kz7wh79svd06iffh8j6giikl7vz1q3"; + sha256 = "0jkbxw6z8l7zpr7bh2xcyzk8a5apzyz4ranhl66gxna1ay0gpzvd"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix new file mode 100644 index 00000000000..f1c13e93aec --- /dev/null +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "proj-datumgrid"; + version = "world-1.0"; + + src = fetchFromGitHub { + owner = "OSGeo"; + repo = "proj-datumgrid"; + rev = version; + sha256 = "132wp77fszx33wann0fjkmi1isxvsb0v9iw0gd9sxapa9h6hf3am"; + }; + + sourceRoot = "source/scripts"; + + buildPhase = '' + $CC nad2bin.c -o nad2bin + ''; + + installPhase = '' + mkdir -p $out/bin + cp nad2bin $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Repository for proj datum grids"; + homepage = https://proj4.org; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/proj/5.2.nix b/pkgs/development/libraries/proj/5.2.nix new file mode 100644 index 00000000000..8fb4515e70d --- /dev/null +++ b/pkgs/development/libraries/proj/5.2.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "proj-5.2.0"; + + src = fetchurl { + url = https://download.osgeo.org/proj/proj-5.2.0.tar.gz; + sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg"; + }; + + doCheck = stdenv.is64bit; + + meta = with stdenv.lib; { + description = "Cartographic Projections Library"; + homepage = https://proj4.org; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 8fb4515e70d..ea89dbee0f6 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,13 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }: -stdenv.mkDerivation { - name = "proj-5.2.0"; +stdenv.mkDerivation rec { + name = "proj"; + version = "6.1.1"; - src = fetchurl { - url = https://download.osgeo.org/proj/proj-5.2.0.tar.gz; - sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg"; + src = fetchFromGitHub { + owner = "OSGeo"; + repo = "PROJ"; + rev = version; + sha256 = "0w2v2l22kv0xzq5hwl7n8ki6an8vfsr0lg0cdbkwcl4xv889ysma"; }; + outputs = [ "out" "dev"]; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + buildInputs = [ sqlite ]; + doCheck = stdenv.is64bit; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix new file mode 100644 index 00000000000..716f3d313b4 --- /dev/null +++ b/pkgs/development/libraries/tdlib/default.nix @@ -0,0 +1,24 @@ +{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }: + +stdenv.mkDerivation rec { + version = "1.4.0"; + pname = "tdlib"; + + src = fetchFromGitHub { + owner = "tdlib"; + repo = "td"; + rev = "v${version}"; + sha256 = "1ijyn14rjb87rqm39hg7md8ab33yiy8cgzw3p0m37scn58gabpp7"; + }; + + buildInputs = [ gperf openssl readline zlib ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Cross-platform library for building Telegram clients"; + homepage = "https://core.telegram.org/tdlib/"; + license = [ licenses.boost ]; + platforms = platforms.linux; + maintainers = [ maintainers.vyorkin ]; + }; +} diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 9eb3254001d..adfce3ea50b 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv }: +{ stdenv, fetchurl, libiconv, fetchpatch }: stdenv.mkDerivation rec { name = "wavpack-${version}"; @@ -13,6 +13,54 @@ stdenv.mkDerivation rec { sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r"; }; + patches = [ + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/26cb47f99d481ad9b93eeff80d26e6b63bbd7e15.patch"; + name = "CVE-2018-10536-CVE-2018-10537.patch"; + sha256 = "0s0fyycd4x7pw4vl1yp2vp4zrlk04j85idvnxz5h96fj6196anw6"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/6f8bb34c2993a48ab9afbe353e6d0cff7c8d821d.patch"; + name = "CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch"; + sha256 = "03qzmaq9mwiqbzrx1lvkgkhz3cjv7dky1b4lka3d5q2rwdlyw5qk"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/d5bf76b5a88d044a1be1d5656698e3ba737167e5.patch"; + name = "CVE-2018-6767.patch"; + sha256 = "158c60i188kbxl0hzb7g74g21pknz7fk429vnbbx9zk1mlyyyl5b"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/bf408e95f43fafdcef42c3f5f9c9d0e6ab0331b9.patch"; + name = "CVE-2019-11498-1.patch"; + sha256 = "161dw759v1lzbhj7daw2gbmcji8s0njpa65xmqhqw73bwpzb3xkd"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/cd353bccafb1274a525c3536aaff8c48c3a33aa0.patch"; + name = "CVE-2019-11498-2.patch"; + sha256 = "120sb1iqkq2gadh0qydqvca4vwx31zb7gk1d0nm0y5agav2ai0dk"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/4c0faba32fddbd0745cbfaf1e1aeb3da5d35b9fc.patch"; + name = "CVE-2019-11498-3.patch"; + sha256 = "12744yn1035mf7wzgqrkyadw5mwqf9v34ckj2m5sirk97k47k0wa"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/bc6cba3f552c44565f7f1e66dc1580189addb2b4.patch"; + name = "CVE-2019-11498-4.patch"; + sha256 = "0qdw071b14hmxkjw6kn83d8hzq89l3hqh64pl1f1wb8m51w5xfg7"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/070ef6f138956d9ea9612e69586152339dbefe51.patch"; + name = "CVE-2018-19840.patch"; + sha256 = "08y27py8hnki74ad8wbknnd36vj5pzzcm2vk3ngcbsjnj7x5mffz"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/bba5389dc598a92bdf2b297c3ea34620b6679b5b.patch"; + name = "CVE-2018-19841.patch"; + sha256 = "08gx5xx51bi86cqqy7cv1d25k669a7wnkksasjspphwkpwkcxymy"; + }) + ]; + meta = with stdenv.lib; { description = "Hybrid audio compression format"; homepage = http://www.wavpack.com/; diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 187eed6ae83..44e6370e640 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "6.2"; + version = "6.3"; name = "wcslib-${version}"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; - sha256 ="01fqckazhbfqqhyr0wd9vcks1m2afmsh83l981alxg2r54jgwkdv"; + sha256 ="1si272bms58yv1zmymx9ypx1ycka8bfqy8wk03rvl6nmciyz0dsc"; }; prePatch = '' diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index c9d8d52b068..8d316d06fbb 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="asdf"; - version="3.3.2"; + version="3.3.3"; name="${baseName}-${version}"; - hash="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.3.2.tar.gz"; - sha256="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x"; + hash="1167445kmb0dbixc5l2r58cswg5s6jays0l1zxrk3aij0490bkgg"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.3.3.tar.gz"; + sha256="1167445kmb0dbixc5l2r58cswg5s6jays0l1zxrk3aij0490bkgg"; }; buildInputs = [ texinfo texLive perl diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 7b25cd833e8..b7c5859708e 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -96,7 +96,7 @@ nodePackages // { ''; }; - scuttlebot = nodePackages.scuttlebot.override { + ssb-server = nodePackages.ssb-server.override { buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ]; }; diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 58cf2dd1358..49ab6ec9841 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -97,7 +97,6 @@ , "react-native-cli" , "reveal.js" , "s3http" -, "scuttlebot" , "semver" , "serve" , "shout" @@ -106,6 +105,7 @@ , "snyk" , "socket.io" , "speed-test" +, "ssb-server" , "stackdriver-statsd-backend" , "svgo" , "swagger" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index b9ed26bd17e..6f3e3d2ce6a 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,31 +13,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.800.6" = { + "@angular-devkit/architect-0.801.1" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.800.6"; + version = "0.801.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.800.6.tgz"; - sha512 = "946ceRci/1yx09g8iRvULLoVihcB2RW9nhpCCMum4L9wheip8t4FWso3pd3JtPQGJV9dmsnwPzR9s12bncmj3g=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.801.1.tgz"; + sha512 = "Y+4kDpZeh+uIr179gbkpRcyeLizd94sC608TM8XQLM2+sgUB9PoW/KBotuED9Rjlvui4yURQm4UU8LnCsNqWSQ=="; }; }; - "@angular-devkit/core-8.0.6" = { + "@angular-devkit/core-8.1.1" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "8.0.6"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.0.6.tgz"; - sha512 = "gbKEVsQuYqBJPzgaxEitvs0aN9NwmUHhTkum28mRyPbS3witay/q8+3ls48M2W+98Da/PQbfndxFY4OCa+qHEA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.1.1.tgz"; + sha512 = "Wq/6HOkT3gSOQRiSmHijzy/bzEqzI44Ho4S/NIZ192M/m28f46Neu2LV9juniQKnAAZ8RmHnXecxq3KjvCRkNg=="; }; }; - "@angular-devkit/schematics-8.0.6" = { + "@angular-devkit/schematics-8.1.1" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "8.0.6"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.0.6.tgz"; - sha512 = "FGPcVKxNvtdFB0A6oHyxtWeugL83nW+kPATlAimgh1hu7TCP94dDpflCV9o/lgZlH817xTYXrhToXJaMZSnDPw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.1.1.tgz"; + sha512 = "Hzq3eFo33XsWe5q4tFq7kxDAE4ZbTeBySLsgqRd6m3gjGOjYUpAa5dlXdsPtZlOI5/LfR/1j1ALutf/6RG3ugw=="; }; }; "@apollographql/apollo-tools-0.3.7" = { @@ -49,13 +49,13 @@ let sha512 = "+ertvzAwzkYmuUtT8zH3Zi6jPdyxZwOgnYaZHY7iLnMVJDhQKWlkyjLMF8wyzlPiEdDImVUMm5lOIBZo7LkGlg=="; }; }; - "@apollographql/graphql-playground-html-1.6.20" = { + "@apollographql/graphql-playground-html-1.6.24" = { name = "_at_apollographql_slash_graphql-playground-html"; packageName = "@apollographql/graphql-playground-html"; - version = "1.6.20"; + version = "1.6.24"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.20.tgz"; - sha512 = "3LWZa80HcP70Pl+H4KhLDJ7S0px+9/c8GTXdl6SpunRecUaB27g/oOQnAjNHLHdbWuGE0uyqcuGiTfbKB3ilaQ=="; + url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz"; + sha512 = "8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ=="; }; }; "@azu/format-text-1.0.1" = { @@ -94,13 +94,13 @@ let sha512 = "jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA=="; }; }; - "@babel/core-7.4.5" = { + "@babel/core-7.5.4" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.4.5"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.4.5.tgz"; - sha512 = "OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.5.4.tgz"; + sha512 = "+DaeBEpYq6b2+ZmHx3tHspC+ZRflrvLqwfv8E3hNr5LVQoyBnL8RPKSBCg+rK2W2My9PWlujBiqd0ZPsR9Q6zQ=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -121,13 +121,13 @@ let sha512 = "8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg=="; }; }; - "@babel/generator-7.4.4" = { + "@babel/generator-7.5.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.4.4"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz"; - sha512 = "53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.5.0.tgz"; + sha512 = "1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA=="; }; }; "@babel/helper-annotate-as-pure-7.0.0" = { @@ -166,13 +166,13 @@ let sha512 = "l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.4.4" = { + "@babel/helper-create-class-features-plugin-7.5.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.4.4"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz"; - sha512 = "UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.0.tgz"; + sha512 = "EAoMc3hE5vE5LNhMqDOwB1usHvmRjCDAnH8CD4PVkX9/Yr3W/tcz8xE8QvdZxfsFBDICwZnF2UTHIqslRpvxmA=="; }; }; "@babel/helper-define-map-7.4.4" = { @@ -319,22 +319,22 @@ let sha512 = "o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ=="; }; }; - "@babel/helpers-7.4.4" = { + "@babel/helpers-7.5.4" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.4.4"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz"; - sha512 = "igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.4.tgz"; + sha512 = "6LJ6xwUEJP51w0sIgKyfvFMJvIb9mWAfohJp0+m6eHJigkFdcH8duZ1sfhn0ltJRzwUIT/yqqhdSfRpCpL7oow=="; }; }; - "@babel/highlight-7.0.0" = { + "@babel/highlight-7.5.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.0.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz"; - sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz"; + sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ=="; }; }; "@babel/parser-7.3.4" = { @@ -346,13 +346,13 @@ let sha512 = "tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ=="; }; }; - "@babel/parser-7.4.5" = { + "@babel/parser-7.5.0" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.4.5"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz"; - sha512 = "9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.5.0.tgz"; + sha512 = "I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA=="; }; }; "@babel/plugin-external-helpers-7.0.0" = { @@ -373,13 +373,22 @@ let sha512 = "+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.4.4" = { + "@babel/plugin-proposal-class-properties-7.5.0" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.4.4"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz"; - sha512 = "WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.0.tgz"; + sha512 = "9L/JfPCT+kShiiTTzcnBJ8cOwdKVmlC1RcCf9F0F9tERVrM4iWtWnXtjWCRqNm2la2BxO1MPArWNsU9zsSJWSQ=="; + }; + }; + "@babel/plugin-proposal-dynamic-import-7.5.0" = { + name = "_at_babel_slash_plugin-proposal-dynamic-import"; + packageName = "@babel/plugin-proposal-dynamic-import"; + version = "7.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz"; + sha512 = "x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw=="; }; }; "@babel/plugin-proposal-json-strings-7.2.0" = { @@ -391,13 +400,13 @@ let sha512 = "MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.4.4" = { + "@babel/plugin-proposal-object-rest-spread-7.5.4" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.4.4"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz"; - sha512 = "dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.4.tgz"; + sha512 = "KCx0z3y7y8ipZUMAEEJOyNi11lMb/FOPUjjB113tfowgw0c16EGYos7worCKBcUAh2oG+OBnoUhsnTSoLpV9uA=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.2.0" = { @@ -427,6 +436,15 @@ let sha512 = "1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg=="; }; }; + "@babel/plugin-syntax-dynamic-import-7.2.0" = { + name = "_at_babel_slash_plugin-syntax-dynamic-import"; + packageName = "@babel/plugin-syntax-dynamic-import"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz"; + sha512 = "mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w=="; + }; + }; "@babel/plugin-syntax-flow-7.2.0" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; @@ -490,13 +508,13 @@ let sha512 = "ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg=="; }; }; - "@babel/plugin-transform-async-to-generator-7.4.4" = { + "@babel/plugin-transform-async-to-generator-7.5.0" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.4.4"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz"; - sha512 = "YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz"; + sha512 = "mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg=="; }; }; "@babel/plugin-transform-block-scoped-functions-7.2.0" = { @@ -535,13 +553,13 @@ let sha512 = "kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA=="; }; }; - "@babel/plugin-transform-destructuring-7.4.4" = { + "@babel/plugin-transform-destructuring-7.5.0" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.4.4"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz"; - sha512 = "/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz"; + sha512 = "YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ=="; }; }; "@babel/plugin-transform-dotall-regex-7.4.4" = { @@ -553,13 +571,13 @@ let sha512 = "P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.2.0" = { + "@babel/plugin-transform-duplicate-keys-7.5.0" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.2.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz"; - sha512 = "q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz"; + sha512 = "igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ=="; }; }; "@babel/plugin-transform-exponentiation-operator-7.2.0" = { @@ -625,13 +643,13 @@ let sha512 = "HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA=="; }; }; - "@babel/plugin-transform-modules-amd-7.2.0" = { + "@babel/plugin-transform-modules-amd-7.5.0" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.2.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz"; - sha512 = "mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz"; + sha512 = "n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg=="; }; }; "@babel/plugin-transform-modules-commonjs-7.2.0" = { @@ -643,22 +661,22 @@ let sha512 = "V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.4.4" = { + "@babel/plugin-transform-modules-commonjs-7.5.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.4.4"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz"; - sha512 = "4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz"; + sha512 = "xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.4.4" = { + "@babel/plugin-transform-modules-systemjs-7.5.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.4.4"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz"; - sha512 = "MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz"; + sha512 = "Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg=="; }; }; "@babel/plugin-transform-modules-umd-7.2.0" = { @@ -742,13 +760,13 @@ let sha512 = "fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw=="; }; }; - "@babel/plugin-transform-runtime-7.4.4" = { + "@babel/plugin-transform-runtime-7.5.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.4.4"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.4.tgz"; - sha512 = "aMVojEjPszvau3NRg+TIH14ynZLvPewH4xhlCW1w6A3rkxTS1m4uwzRclYR9oS+rl/dr+kT+pzbfHuAWP/lc7Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.0.tgz"; + sha512 = "LmPIZOAgTLl+86gR9KjLXex6P/lRz1fWEjTz6V6QZMmKie51ja3tvzdwORqhHc4RWR8TcZ5pClpRWs0mlaA2ng=="; }; }; "@babel/plugin-transform-shorthand-properties-7.2.0" = { @@ -796,13 +814,13 @@ let sha512 = "2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw=="; }; }; - "@babel/plugin-transform-typescript-7.4.5" = { + "@babel/plugin-transform-typescript-7.5.2" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.4.5"; + version = "7.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz"; - sha512 = "RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.2.tgz"; + sha512 = "r4zJOMbKY5puETm8+cIpaa0RQZG/sSASW1u0pj8qYklcERgVIbxVbP2wyJA7zI1//h7lEagQmXi9IL9iI5rfsA=="; }; }; "@babel/plugin-transform-unicode-regex-7.4.4" = { @@ -832,13 +850,13 @@ let sha512 = "2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA=="; }; }; - "@babel/preset-env-7.4.5" = { + "@babel/preset-env-7.5.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.4.5"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.5.tgz"; - sha512 = "f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.4.tgz"; + sha512 = "hFnFnouyRNiH1rL8YkX1ANCNAUVC8Djwdqfev8i1415tnAG+7hlA5zhZ0Q/3Q5gkop4HioIPbCEWAalqcbxRoQ=="; }; }; "@babel/preset-flow-7.0.0" = { @@ -895,13 +913,22 @@ let sha512 = "TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ=="; }; }; - "@babel/runtime-corejs2-7.4.5" = { + "@babel/runtime-7.5.4" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.4.tgz"; + sha512 = "Na84uwyImZZc3FKf4aUF1tysApzwf3p2yuFBIyBfbzT5glzKTdvYI4KVW4kcgjrzoGUjC7w3YyCHcJKaRxsr2Q=="; + }; + }; + "@babel/runtime-corejs2-7.5.4" = { name = "_at_babel_slash_runtime-corejs2"; packageName = "@babel/runtime-corejs2"; - version = "7.4.5"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.4.5.tgz"; - sha512 = "5yLuwzvIDecKwYMzJtiarky4Fb5643H3Ao5jwX0HrMR5oM5mn2iHH9wSZonxwNK0oAjAFUQAiOd4jT7/9Y2jMQ=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.5.4.tgz"; + sha512 = "sHv74OzyZ18d6tjHU0HmlVES3+l+lydkOMTiKsJSTGWcTBpIMfXLEgduahlJrQjknW9RCQAqLIEdLOHjBmq/hg=="; }; }; "@babel/template-7.2.2" = { @@ -931,13 +958,13 @@ let sha512 = "TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ=="; }; }; - "@babel/traverse-7.4.5" = { + "@babel/traverse-7.5.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.4.5"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz"; - sha512 = "Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.0.tgz"; + sha512 = "SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -958,13 +985,13 @@ let sha512 = "WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ=="; }; }; - "@babel/types-7.4.4" = { + "@babel/types-7.5.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.4.4"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz"; - sha512 = "dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.5.0.tgz"; + sha512 = "UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ=="; }; }; "@calebboyd/semaphore-1.3.1" = { @@ -1192,13 +1219,13 @@ let sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; }; }; - "@ionic/cli-framework-2.1.1" = { + "@ionic/cli-framework-2.1.2" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.1.tgz"; - sha512 = "2CMTAgX9Xu8SBdp72mZkgHGbmqdYrX7yL1R37V6FRzjjeVqF13/m7OMGbDz4PugJ5FDI48y/O97bL4PpKhQV4Q=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.2.tgz"; + sha512 = "PQZ5+T2ccVHTA3tnuGOarQhjB6lkeU9SaVzbkgyUHzBxadfenLFffEyLz7WHaLVQfR2po19NIJ2Hy8dIFKepig=="; }; }; "@ionic/discover-2.0.2" = { @@ -1831,58 +1858,58 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@node-red/editor-api-0.20.6" = { + "@node-red/editor-api-0.20.7" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "0.20.6"; + version = "0.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-0.20.6.tgz"; - sha512 = "uJH2KBHolrST4rxPsxAbRLtU/Em/ZBZQ7Ukqd8373Mn3ujo9RzdyvUvrVQZKzw5SAbE4y9HIHe21Tuuthx8rKQ=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-0.20.7.tgz"; + sha512 = "wGuJJ9eyFwHT1PHFOzp+VvXm3MhwKUfxB2uoc6668aKSHILcoOTnOc+i+JUlXxPe2zVu9zulgRiSkrWhDAO2Qw=="; }; }; - "@node-red/editor-client-0.20.6" = { + "@node-red/editor-client-0.20.7" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "0.20.6"; + version = "0.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-0.20.6.tgz"; - sha512 = "5PANZPrVfwlmDGwD6XmASfF0Pxht+XsumVgp/P7Ml0RQch0JT1F0Fl+BW60EleYpQY1Rh/mA5Wk/jnMacy0lRQ=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-0.20.7.tgz"; + sha512 = "svF01v6Mn1MYv5bSg/zL86ToCG2yZW3/7SqWTe4cJ1MRCRvllAb1IVCFnWm8sQcgfOGmaLT9q4Jsgb5HAF8M/w=="; }; }; - "@node-red/nodes-0.20.6" = { + "@node-red/nodes-0.20.7" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "0.20.6"; + version = "0.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-0.20.6.tgz"; - sha512 = "r/j3+m19zQ+52mtySLGKILc2ac6bRjMj+JjLYyrC1JAdwEBFMLbfl5fRWTRCs2h1Bjp8uRGay1Hgik689Qyv/w=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-0.20.7.tgz"; + sha512 = "ZDokAULh6Y+d+8WbjQoYXikinXrV/KVv/q2UGculSgDuDWNIju0A8hQyGBQ3fSBe7PIahl/G4B7Znc4ds1HtEg=="; }; }; - "@node-red/registry-0.20.6" = { + "@node-red/registry-0.20.7" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "0.20.6"; + version = "0.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-0.20.6.tgz"; - sha512 = "8jMk6BksooxbWf7p1Otei6NZgv/e5zW4CG0R5RxeodFhR15bzvFY6GrYAS9IToVv11EZHo0e+y9NHOnBAwJwaw=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-0.20.7.tgz"; + sha512 = "TdZVO7DSe21FcF/97zJWVVVaZ7M/z1bbai2vNDIyJA4BFKRadUsCVCkRjgOfJTrmcrvwTqhLKI2yZ53Ovty4HQ=="; }; }; - "@node-red/runtime-0.20.6" = { + "@node-red/runtime-0.20.7" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "0.20.6"; + version = "0.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-0.20.6.tgz"; - sha512 = "NAAuttS3FZ7XmE+WPu9lDeHyXEORRgr8X3hpj0L1U7rSzzHK5g3MG/wDLonZgcCRfB843FQmdiAe7jXGxCAHfg=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-0.20.7.tgz"; + sha512 = "q5VNbwPJfSlBMvY4M31Q0EFvCbM85r28lFBQVqY6Qqqh7QgxFKzJWGfkvqg9GBjUo+Wx1QfdMYJxBZlTmYMARg=="; }; }; - "@node-red/util-0.20.6" = { + "@node-red/util-0.20.7" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "0.20.6"; + version = "0.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-0.20.6.tgz"; - sha512 = "pMQwsaSg7jVZl6hkhQpx5xxqJN/lu4BO7Lz4rmq+Z3qE0OGpSypremAWJn7zrmkpmLplkO3w3MKmDHYTD/NLUQ=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-0.20.7.tgz"; + sha512 = "LWFC7wFgm0mZJhv+oSELnmRnFawgAByJA6GCdAOnMSLEHJfqcprSHEIYj+S4/rUnS0xjRgL8FO9D+kOWsgVK0A=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -1894,13 +1921,13 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@octokit/endpoint-5.2.0" = { + "@octokit/endpoint-5.2.2" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "5.2.0"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.2.0.tgz"; - sha512 = "g4r1MKr8GJ8qubJQp3HP3JrxDY+ZeVqjYBTgtu1lPEDLhfQDY6rOhyZOoHKOw+gaIF6aAcmuvPPNZUro2OwmOg=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.2.2.tgz"; + sha512 = "VhKxM4CQanIUZDffExqpdpgqu3heF51qbY1wazoNtvIKXAAVoFjqLq2BOhesXkTqxXMO1Ze1XbS8DkIjUxAB+g=="; }; }; "@octokit/plugin-enterprise-rest-2.2.2" = { @@ -1912,13 +1939,13 @@ let sha512 = "CTZr64jZYhGWNTDGlSJ2mvIlFsm9OEO3LqWn9I/gmoHI4jRBp4kpHoFYNemG4oA75zUAcmbuWblb7jjP877YZw=="; }; }; - "@octokit/request-4.1.1" = { + "@octokit/request-5.0.1" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "4.1.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-4.1.1.tgz"; - sha512 = "LOyL0i3oxRo418EXRSJNk/3Q4I0/NKawTn6H/CQp+wnrG1UFLGu080gSsgnWobhPo5BpUNgSQ5BRk5FOOJhD1Q=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.0.1.tgz"; + sha512 = "SHOk/APYpfrzV1RNf7Ux8SZi+vZXhMIB2dBr4TQR6ExMX8R4jcy/0gHw26HLe1dWV7Wxe9WzYyDSEC0XwnoCSQ=="; }; }; "@octokit/request-error-1.0.4" = { @@ -1930,13 +1957,13 @@ let sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig=="; }; }; - "@octokit/rest-16.28.2" = { + "@octokit/rest-16.28.4" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.28.2"; + version = "16.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.2.tgz"; - sha512 = "csuYiHvJ1P/GFDadVn0QhwO83R1+YREjcwCY7ZIezB6aJTRIEidJZj+R7gAkUhT687cqYb4cXTZsDVu9F+Fmug=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.4.tgz"; + sha512 = "ZBsfD46t3VNkwealxm5zloVgQta8d8o4KYBR/hMAZ582IgjmSDKZdkjyv5w37IUCM3tcPZWKUT+kml9pEIC2GA=="; }; }; "@parcel/fs-1.11.0" = { @@ -2074,22 +2101,22 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@schematics/angular-8.0.6" = { + "@schematics/angular-8.1.1" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "8.0.6"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.0.6.tgz"; - sha512 = "F0/MrbvrJQJIjt0GwEkmf9PZUX0xQlCjlDcH6U7yBni0/+R5Gd5g3G0f12fsSa2iAwpwrLkKpiQluj29eFituQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.1.1.tgz"; + sha512 = "3zyVLV/PbkRjaqBE3gOJbwFkpQ62TKKFDgxm41OPakyy0XeC9Zc+2i3UIWDDfOd6chs+NMJRXjDfvO+gkmp6FQ=="; }; }; - "@schematics/update-0.800.6" = { + "@schematics/update-0.801.1" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.800.6"; + version = "0.801.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.800.6.tgz"; - sha512 = "vrzGIJtMiwLWl96+aJXMYrPgPtktLRpY8ZiNnlLm3pMDmeg08uButRh/pQGt02HuO/apTNJ5g0bmG8K5wS4I5A=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.801.1.tgz"; + sha512 = "bVIgNMt3vDYNmit7KUSmjUbTEcGNpARlKpyv6lHhlBhWLh8YeXNizD9yGJ0B6hxXVdwF+JKoaVMc1xADgDbT7w=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -2110,13 +2137,13 @@ let sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; - "@snyk/composer-lockfile-parser-1.0.2" = { + "@snyk/composer-lockfile-parser-1.0.3" = { name = "_at_snyk_slash_composer-lockfile-parser"; packageName = "@snyk/composer-lockfile-parser"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.0.2.tgz"; - sha512 = "kFzMajJLgWYsRTD+j1B79RckP1nYolM3UU9wJAo6VjvaBJ1R8E6IXmz0lEJBwK2zXM4EPrgk41ZqmoQS3hselQ=="; + url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.0.3.tgz"; + sha512 = "hb+6E7kMzWlcwfe//ILDoktBPKL2a3+RnJT/CXnzRXaiLQpsdkf5li4q2v0fmvd+4v7L3tTN8KM+//lJyviEkg=="; }; }; "@snyk/dep-graph-1.8.1" = { @@ -2263,13 +2290,13 @@ let sha512 = "59RaAmdsMB3e32PD04N0YOJI2L3ljWR8fEk9FDLbOJAZeu7c+TqgETHDiVnkrh8gM+m8RL0h4wWq1jbB1kj0Xw=="; }; }; - "@textlint/fixer-formatter-3.1.5" = { + "@textlint/fixer-formatter-3.1.6" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.5.tgz"; - sha512 = "Ef+6smERp3Meic3ob96PCr1Gv688fJKPhCWLuRf0n2pM+leiE5mkwJAlFJU75f5ZwY+a8V8wPRotBRFDUNA+7w=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.6.tgz"; + sha512 = "bCNQpoo5jyjNBTMrTETzIIjfwe4bAQyqLfDxe+CeclKdpOnoRRAy5oj4p0aOuCaRVlpp3HxqBfVl3a5yCnCj/w=="; }; }; "@textlint/kernel-3.1.6" = { @@ -2479,22 +2506,22 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-10.14.10" = { + "@types/node-10.14.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.14.10"; + version = "10.14.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.14.10.tgz"; - sha512 = "V8wj+w2YMNvGuhgl/MA5fmTxgjmVHVoasfIaxMMZJV6Y8Kk+Ydpi1z2whoShDCJ2BuNVoqH/h1hrygnBxkrw/Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.14.12.tgz"; + sha512 = "QcAKpaO6nhHLlxWBvpc4WeLrTvPqlHOvaj0s5GriKkA1zq+bsFBPpfYCvQhLqLgYlIko8A9YrPdaMHCo5mBcpg=="; }; }; - "@types/node-12.0.10" = { + "@types/node-12.6.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.0.10"; + version = "12.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.0.10.tgz"; - sha512 = "LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.6.2.tgz"; + sha512 = "gojym4tX0FWeV2gsW4Xmzo5wxGjXGm550oVUII7f7G5o4BV6c7DBdiG1RRQd+y1bvqRyYtPfMK85UM95vsapqQ=="; }; }; "@types/node-6.14.6" = { @@ -2506,13 +2533,13 @@ let sha512 = "rFs9zCFtSHuseiNXxYxFlun8ibu+jtZPgRM+2ILCmeLiGeGLiIGxuOzD+cNyHegI1GD+da3R/cIbs9+xCLp13w=="; }; }; - "@types/node-8.10.49" = { + "@types/node-8.10.50" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.49"; + version = "8.10.50"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.49.tgz"; - sha512 = "YX30JVx0PvSmJ3Eqr74fYLGeBxD+C7vIL20ek+GGGLJeUbVYRUW3EzyAXpIRA0K8c8o0UWqR/GwEFYiFoz1T8w=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.50.tgz"; + sha512 = "+ZbcUwJdaBgOZpwXeT0v+gHC/jQbEfzoc9s4d0rN0JIKeQbuTrT+A2n1aQY6LpZjrLXJT7avVUqiCecCJeeZxA=="; }; }; "@types/q-1.5.2" = { @@ -2542,15 +2569,6 @@ let sha512 = "/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q=="; }; }; - "@types/sinon-7.0.11" = { - name = "_at_types_slash_sinon"; - packageName = "@types/sinon"; - version = "7.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sinon/-/sinon-7.0.11.tgz"; - sha512 = "6ee09Ugx6GyEr0opUIakmxIWFNmqYPjkqa3/BuxCBokA0klsOLPgMD5K4q40lH7/yZVuJVzOfQpd7pipwjngkQ=="; - }; - }; "@types/superagent-3.8.2" = { name = "_at_types_slash_superagent"; packageName = "@types/superagent"; @@ -2605,40 +2623,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.8.0" = { + "@vue/cli-shared-utils-3.9.0" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.8.0"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.8.0.tgz"; - sha512 = "wn1L8pmQnotfftHOYm0VeXs2+cQTySd73uhWXwyO6pT0ehjqlY5c2RTipClmFF3Q+YCYjwlNpsV650F3l1tV8w=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.9.0.tgz"; + sha512 = "wumeMZTz5aQ+1Y6uxTKegIsgOXEWT3hT8f9sW2mj5SwNDVyQ+AHZTgSynYExTUJg3dH81uKgFDUpPdAvGxzh8g=="; }; }; - "@vue/cli-ui-3.8.4" = { + "@vue/cli-ui-3.9.2" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.8.4"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.8.4.tgz"; - sha512 = "1l85jynu5883zxhdQP8Or34Ltfiq0IZKUjYS0kkPpaScyjYpXlsRp4z397gxJ4ueeU5GKChJdHluFjfKnDgiiA=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.9.2.tgz"; + sha512 = "jEDd+QnY8xcRflJcHjbHAPmeC8uvxHip+RRlBvvLRzLJy04Wka7r6LPO5JMD/BwTgh8NS/DUYxYCNaO35ghdCA=="; }; }; - "@vue/cli-ui-addon-webpack-3.8.4" = { + "@vue/cli-ui-addon-webpack-3.9.2" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.8.4"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.8.4.tgz"; - sha512 = "YqWZxlwkSaKPNEkc0KpGq+pV9ywx5cCnzx8duQ3tYHelcPs4aKjO0qzuKJnKB6q0+goEXXVZwYi9P2WQ2YDOEA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.9.2.tgz"; + sha512 = "YMeERzmWjrXd3JgH3ybDs5YOBDGJnTQ5+vz1/zeuYt5PAek63Zw+37Zu1qf6Z13gJZTSInD1XVo/MhAREI+9/Q=="; }; }; - "@vue/cli-ui-addon-widgets-3.8.4" = { + "@vue/cli-ui-addon-widgets-3.9.2" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.8.4"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.8.4.tgz"; - sha512 = "aCuaEnSY6qvRJh9pOLIX5gCvJ96jbHWqsGY02NZkXLW2kqShuIm+YYenSx0dCi8cH+Mlh4McCX1LeBRKBDpO6A=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.9.2.tgz"; + sha512 = "nehd1JqV/1mLrMLv+7wGZj+Lj2/q1lVOVGF12skcfknkwLRDfBN4BQyegvgmNRlxVYyt8Q13Ni8TsE8UibrUnA=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -3145,15 +3163,6 @@ let sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; }; }; - "abstract-leveldown-5.0.0" = { - name = "abstract-leveldown"; - packageName = "abstract-leveldown"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz"; - sha512 = "5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A=="; - }; - }; "abstract-leveldown-6.0.3" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; @@ -3244,13 +3253,13 @@ let sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; - "acorn-6.1.1" = { + "acorn-6.2.0" = { name = "acorn"; packageName = "acorn"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz"; - sha512 = "jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz"; + sha512 = "8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw=="; }; }; "acorn-dynamic-import-4.0.0" = { @@ -3298,13 +3307,13 @@ let sha512 = "HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg=="; }; }; - "acorn-loose-6.0.0" = { + "acorn-loose-6.1.0" = { name = "acorn-loose"; packageName = "acorn-loose"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-loose/-/acorn-loose-6.0.0.tgz"; - sha512 = "gJff4bSdy882CwS6toeHixdBn9+IP8ojffjCW9hXnb2Ly7uVyAMaH2pLehtwS10wj2FIQ9Iw564MTDSsaQW9ng=="; + url = "https://registry.npmjs.org/acorn-loose/-/acorn-loose-6.1.0.tgz"; + sha512 = "FHhXoiF0Uch3IqsrnPpWwCtiv5PYvipTpT1k9lDMgQVVYc9iDuSl5zdJV358aI8twfHCYMFBRVYvAVki9wC/ng=="; }; }; "acorn-node-1.7.0" = { @@ -3316,13 +3325,13 @@ let sha512 = "XhahLSsCB6X6CJbe+uNu3Mn9sJBNFxtBN9NLgAOQovfS6Kh0lDUtmlclhjn9CvEK7A7YyRU13PXlNcpSiLI9Yw=="; }; }; - "acorn-walk-6.1.1" = { + "acorn-walk-6.2.0" = { name = "acorn-walk"; packageName = "acorn-walk"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz"; - sha512 = "OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw=="; + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz"; + sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="; }; }; "adbkit-2.11.1" = { @@ -3532,6 +3541,15 @@ let sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; + "ajv-6.10.1" = { + name = "ajv"; + packageName = "ajv"; + version = "6.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz"; + sha512 = "w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ=="; + }; + }; "ajv-6.5.3" = { name = "ajv"; packageName = "ajv"; @@ -3568,13 +3586,13 @@ let sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; - "ajv-keywords-3.4.0" = { + "ajv-keywords-3.4.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz"; - sha512 = "aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw=="; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; + sha512 = "RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="; }; }; "ajv-merge-patch-4.1.0" = { @@ -3694,6 +3712,15 @@ let sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; }; }; + "ansi-colors-4.1.0" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.0.tgz"; + sha512 = "3NkLpm6I6kEgC8J0I9EZ0fouXc/mm5J9zqJFCgA2jGqmsL0O64I7Uvi3AmUMnnRqc6u7uLgVVnY4pyBQ03nCiw=="; + }; + }; "ansi-cyan-0.1.1" = { name = "ansi-cyan"; packageName = "ansi-cyan"; @@ -3919,13 +3946,13 @@ let sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; - "anymatch-3.0.2" = { + "anymatch-3.0.3" = { name = "anymatch"; packageName = "anymatch"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.0.2.tgz"; - sha512 = "rUe9SxpRQlVg4EM8It7JMNWWYHAirTPpbTuvaSKybb5IejNgWB3PGBBX9rrPKDx2pM/p3Wh+7+ASaWRyyAbxmQ=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz"; + sha512 = "c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g=="; }; }; "ap-0.1.0" = { @@ -3964,13 +3991,13 @@ let sha512 = "+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg=="; }; }; - "apollo-cache-control-0.7.4" = { + "apollo-cache-control-0.7.5" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.7.4.tgz"; - sha512 = "TVACHwcEF4wfHo5H9FLnoNjo0SLDo2jPW+bXs9aw0Y4Z2UisskSAPnIYOqUPnU8SoeNvs7zWgbLizq11SRTJtg=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.7.5.tgz"; + sha512 = "zCPwHjbo/VlmXl0sclZfBq/MlVVeGUAg02Q259OIXSgHBvn9BbExyz+EkO/DJvZfGMquxqS1X1BFO3VKuLUTdw=="; }; }; "apollo-cache-inmemory-1.6.2" = { @@ -4072,13 +4099,13 @@ let sha512 = "SVXxJyKlWguuDjxkY/WGlC/ykdsTmPxSF0z8FenagcQ91aPURXzXP1ZDz5PbamY+0iiCRubazkxtTQw4GWTFPg=="; }; }; - "apollo-engine-reporting-1.3.5" = { + "apollo-engine-reporting-1.3.6" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.3.5.tgz"; - sha512 = "pSwjPgXK/elFsR22LXALtT3jI4fpEpeTNTHgNwLVLohaolusMYgBc/9FnVyFWFfMFS9k+3RmfeQdHhZ6T7WKFQ=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.3.6.tgz"; + sha512 = "oCoFAUBGveg1i1Sao/2gNsf1kirJBT6vw6Zan9BCNUkyh68ewDts+xRg32VnD9lDhaHpXVJ3tVtuaV44HmdSEw=="; }; }; "apollo-engine-reporting-protobuf-0.3.1" = { @@ -4171,13 +4198,13 @@ let sha512 = "GTOZdbLhrSOKYNWMYgaqX5cVNSMT0bGUTZKV8/tYlyYmsB6ey7l6iId3Q7UpHS6F6OR2lstz5XaKZ+T3fDfPzQ=="; }; }; - "apollo-server-core-2.6.7" = { + "apollo-server-core-2.6.9" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.6.7"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.6.7.tgz"; - sha512 = "HfOGLvEwPgDWTvd3ZKRPEkEnICKb7xadn1Mci4+auMTsL/NVkfpjPa8cdzubi/kS2/MvioIn7Bg74gmiSLghGQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.6.9.tgz"; + sha512 = "r2/Kjm1UmxoTViUt5EcExWXkWl0riXsuGyS1q5LpHKKnA+6b+t4LQKECkRU4EWNpuuzJQn7aF7MmMdvURxoEig=="; }; }; "apollo-server-env-2.4.0" = { @@ -4189,40 +4216,40 @@ let sha512 = "7ispR68lv92viFeu5zsRUVGP+oxsVI3WeeBNniM22Cx619maBUwcYTIC3+Y3LpXILhLZCzA1FASZwusgSlyN9w=="; }; }; - "apollo-server-errors-2.3.0" = { + "apollo-server-errors-2.3.1" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.0.tgz"; - sha512 = "rUvzwMo2ZQgzzPh2kcJyfbRSfVKRMhfIlhY7BzUfM4x6ZT0aijlgsf714Ll3Mbf5Fxii32kD0A/DmKsTecpccw=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.1.tgz"; + sha512 = "errZvnh0vUQChecT7M4A/h94dnBSRL213dNxpM5ueMypaLYgnp4hiCTWIEaooo9E4yMGd1qA6WaNbLDG2+bjcg=="; }; }; - "apollo-server-express-2.6.7" = { + "apollo-server-express-2.6.9" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.6.7"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.6.7.tgz"; - sha512 = "qbCQM+8LxXpwPNN5Sdvcb+Sne8zuCORFt25HJtPJRkHlyBUzOd7JA7SEnUn5e2geTiiGoVIU5leh+++C51udTw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.6.9.tgz"; + sha512 = "iTkdIdX7m9EAlmL/ZPkKR+x/xuFk1HYZWuJIJG57hHUhcOxj50u7F1E5+5fDwl5RFIdepQ61azF31hhNZuNi4g=="; }; }; - "apollo-server-plugin-base-0.5.6" = { + "apollo-server-plugin-base-0.5.8" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.5.6"; + version = "0.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.6.tgz"; - sha512 = "wJvcPqfm/kiBwY5JZT85t2A4pcHv24xdQIpWMNt1zsnx77lIZqJmhsc22eSUSrlnYqUMXC4XMVgSUfAO4oI9wg=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.8.tgz"; + sha512 = "ICbaXr0ycQZL5llbtZhg8zyHbxuZ4khdAJsJgiZaUXXP6+F47XfDQ5uwnl/4Sq9fvkpwS0ctvfZ1D+Ks4NvUzA=="; }; }; - "apollo-tracing-0.7.3" = { + "apollo-tracing-0.7.4" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.7.3.tgz"; - sha512 = "H6fSC+awQGnfDyYdGIB0UQUhcUC3n5Vy+ujacJ0bY6R+vwWeZOQvu7wRHNjk/rbOSTLCo9A0OcVX7huRyu9SZg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.7.4.tgz"; + sha512 = "vA0FJCBkFpwdWyVF5UtCqN+enShejyiqSGqq8NxXHU1+GEYTngWa56x9OGsyhX+z4aoDIa3HPKPnP3pjzA0qpg=="; }; }; "apollo-upload-client-10.0.1" = { @@ -4414,13 +4441,13 @@ let sha512 = "XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w=="; }; }; - "arg-4.1.0" = { + "arg-4.1.1" = { name = "arg"; packageName = "arg"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz"; - sha512 = "ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg=="; + url = "https://registry.npmjs.org/arg/-/arg-4.1.1.tgz"; + sha512 = "SlmP3fEA88MBv0PypnXZ8ZfJhwmDeIE3SP71j37AiXQBXYosPV0x6uISAaHYSlSVhmHOVkomen0tbGk6Anlebw=="; }; }; "argparse-0.1.15" = { @@ -5278,13 +5305,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.486.0" = { + "aws-sdk-2.493.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.486.0"; + version = "2.493.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.486.0.tgz"; - sha512 = "Gd5IB3HPG+fBE7sh16ATwEuHLv7DcpRLmG381i+0UwrWmka+0t6Dc7/yHKkLOXQKVBDI5FvRdlsWAsP/LFpOxw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.493.0.tgz"; + sha512 = "xLNpjiNgLZoXqwmLQ+czP3UQzeRgsutpG1KGfVUaj/3giqEElpn0wYkwhkJt4Glm9xf3jgzAdbFEDYM7u+Llxg=="; }; }; "aws-sign2-0.6.0" = { @@ -5476,6 +5503,15 @@ let sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; }; }; + "babel-plugin-dynamic-import-node-2.3.0" = { + name = "babel-plugin-dynamic-import-node"; + packageName = "babel-plugin-dynamic-import-node"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; + sha512 = "o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ=="; + }; + }; "babel-plugin-istanbul-4.1.6" = { name = "babel-plugin-istanbul"; packageName = "babel-plugin-istanbul"; @@ -6052,13 +6088,13 @@ let sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; }; }; - "bcrypt-3.0.5" = { + "bcrypt-3.0.6" = { name = "bcrypt"; packageName = "bcrypt"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.5.tgz"; - sha512 = "m4o91nB+Ce8696Ao4R3B/WtVWTc1Lszgd098/OIjU9D/URmdYwT3ooBs9uv1b97J5YhZweTq9lldPefTYZ0TwA=="; + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.6.tgz"; + sha512 = "taA5bCTfXe7FUjKroKky9EXpdhkVvhE5owfxfLYodbrAR1Ul3juLmIQmIQBK4L9a5BuUcE6cqmwT+Da20lF9tg=="; }; }; "bcrypt-nodejs-0.0.3" = { @@ -6097,13 +6133,13 @@ let sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; - "before-after-hook-1.4.0" = { + "before-after-hook-2.1.0" = { name = "before-after-hook"; packageName = "before-after-hook"; - version = "1.4.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-1.4.0.tgz"; - sha512 = "l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg=="; + url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz"; + sha512 = "IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A=="; }; }; "bencode-0.7.0" = { @@ -6268,15 +6304,6 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "bindings-1.3.1" = { - name = "bindings"; - packageName = "bindings"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.3.1.tgz"; - sha512 = "i47mqjF9UbjxJhxGf+pZ6kSxrnI3wBLlnGI2ArWJ4r0VrvDS7ZYXkprq/pLaBWYq4GM0r4zdHY+NNRqEMU7uew=="; - }; - }; "bindings-1.5.0" = { name = "bindings"; packageName = "bindings"; @@ -6853,13 +6880,13 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; - "browserify-16.2.3" = { + "browserify-16.3.0" = { name = "browserify"; packageName = "browserify"; - version = "16.2.3"; + version = "16.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.2.3.tgz"; - sha512 = "zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ=="; + url = "https://registry.npmjs.org/browserify/-/browserify-16.3.0.tgz"; + sha512 = "BWaaD7alyGZVEBBwSTYx4iJF5DswIGzK17o8ai9w4iKRbYpk3EOiprRHMRRA8DCZFmFeOdx7A385w2XdFvxWmg=="; }; }; "browserify-aes-1.2.0" = { @@ -6943,13 +6970,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.6.3" = { + "browserslist-4.6.4" = { name = "browserslist"; packageName = "browserslist"; - version = "4.6.3"; + version = "4.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.6.3.tgz"; - sha512 = "CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.6.4.tgz"; + sha512 = "ErJT8qGfRt/VWHSr1HeqZzz50DvxHtr1fVL1m5wf20aGrG8e1ce8fpZ2EjZEfs09DDZYSvtRaDlMpWslBf8Low=="; }; }; "btoa-lite-1.0.0" = { @@ -7582,13 +7609,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30000979" = { + "caniuse-lite-1.0.30000984" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000979"; + version = "1.0.30000984"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000979.tgz"; - sha512 = "gcu45yfq3B7Y+WB05fOMfr0EiSlq+1u+m6rPHyJli/Wy3PVQNGaU7VA4bZE5qw+AU2UVOBR/N5g1bzADUqdvFw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz"; + sha512 = "n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA=="; }; }; "capture-stack-trace-1.0.1" = { @@ -7960,6 +7987,15 @@ let sha512 = "ebzWopcacB2J19Jsb5RPtMrzmjUZ5VAQnsL0Ztrix3lswozHbiDp+1Lg3AWSKHdwsps/W2vtshA/x3I827F78g=="; }; }; + "chokidar-3.0.2" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz"; + sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; + }; + }; "chownr-0.0.2" = { name = "chownr"; packageName = "chownr"; @@ -7969,13 +8005,13 @@ let sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485"; }; }; - "chownr-1.1.1" = { + "chownr-1.1.2" = { name = "chownr"; packageName = "chownr"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz"; - sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz"; + sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="; }; }; "chrome-remote-interface-0.26.1" = { @@ -8626,6 +8662,15 @@ let sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA=="; }; }; + "codecs-2.0.0" = { + name = "codecs"; + packageName = "codecs"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codecs/-/codecs-2.0.0.tgz"; + sha512 = "WXvpJRAgc693oqYvZte9uYEiL5YHtfrxyEq12uVny9oBJ1k37zSva5vVz7trsnt6R9Y15hEgOSC7VFZT2pfYnA=="; + }; + }; "codepage-1.4.0" = { name = "codepage"; packageName = "codepage"; @@ -9877,15 +9922,6 @@ let sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0"; }; }; - "cosmiconfig-4.0.0" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz"; - sha512 = "6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ=="; - }; - }; "cosmiconfig-5.2.1" = { name = "cosmiconfig"; packageName = "cosmiconfig"; @@ -10327,6 +10363,15 @@ let sha512 = "MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="; }; }; + "cssesc-3.0.0" = { + name = "cssesc"; + packageName = "cssesc"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"; + sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; + }; + }; "csslint-1.0.5" = { name = "csslint"; packageName = "csslint"; @@ -10399,13 +10444,13 @@ let sha512 = "vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg=="; }; }; - "cssom-0.3.6" = { + "cssom-0.3.8" = { name = "cssom"; packageName = "cssom"; - version = "0.3.6"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz"; - sha512 = "DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A=="; + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz"; + sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; }; }; "cssstyle-0.2.37" = { @@ -10813,6 +10858,15 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; + "de-indent-1.0.2" = { + name = "de-indent"; + packageName = "de-indent"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; + sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; + }; + }; "deasync-0.1.15" = { name = "deasync"; packageName = "deasync"; @@ -11209,6 +11263,15 @@ let sha512 = "GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA=="; }; }; + "deepmerge-4.0.0" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.0.0.tgz"; + sha512 = "YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww=="; + }; + }; "default-browser-id-1.0.4" = { name = "default-browser-id"; packageName = "default-browser-id"; @@ -11281,15 +11344,6 @@ let sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; }; }; - "deferred-leveldown-4.0.2" = { - name = "deferred-leveldown"; - packageName = "deferred-leveldown"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz"; - sha512 = "5fMC8ek8alH16QiV0lTCis610D1Zt1+LA4MS4d63JgS32lrCjTFDUFz2ao09/j2I4Bqb5jL4FZYwu7Jz0XO1ww=="; - }; - }; "deferred-leveldown-5.1.0" = { name = "deferred-leveldown"; packageName = "deferred-leveldown"; @@ -11542,6 +11596,15 @@ let sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; }; }; + "detect-indent-6.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz"; + sha512 = "oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA=="; + }; + }; "detect-libc-1.0.3" = { name = "detect-libc"; packageName = "detect-libc"; @@ -12415,13 +12478,13 @@ let sha512 = "PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="; }; }; - "electron-to-chromium-1.3.182" = { + "electron-to-chromium-1.3.191" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.182"; + version = "1.3.191"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.182.tgz"; - sha512 = "uqKh3J1/s4LkmtbrVi2cPpd5g2u7efYJdnRXApQLVhZlLjzaJZakafp+JFSUZNYrBDJNIqQChcJTCDZXqQOBYg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.191.tgz"; + sha512 = "jasjtY5RUy/TOyiUYM2fb4BDaPZfm6CXRFeJDMfFsXYADGxUN49RBqtgB7EL2RmJXeIRUk9lM1U6A5yk2YJMPQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -12596,15 +12659,6 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; - "encoding-down-5.0.4" = { - name = "encoding-down"; - packageName = "encoding-down"; - version = "5.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding-down/-/encoding-down-5.0.4.tgz"; - sha512 = "8CIZLDcSKxgzT+zX8ZVfgNbu8Md2wq/iqa1Y7zyVR18QBEAc0Nmzuvj/N5ykSKpfGzjM8qxbaFntLPwnVoUhZw=="; - }; - }; "encoding-down-6.1.0" = { name = "encoding-down"; packageName = "encoding-down"; @@ -13874,15 +13928,6 @@ let sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; }; }; - "express-session-1.16.1" = { - name = "express-session"; - packageName = "express-session"; - version = "1.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.16.1.tgz"; - sha512 = "pWvUL8Tl5jUy1MLH7DhgUlpoKeVPUTe+y6WQD9YhcN0C5qAhsh4a8feVjiUXo3TFhIy191YGZ4tewW9edbl2xQ=="; - }; - }; "express-session-1.16.2" = { name = "express-session"; packageName = "express-session"; @@ -14009,13 +14054,13 @@ let sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A=="; }; }; - "external-editor-3.0.3" = { + "external-editor-3.1.0" = { name = "external-editor"; packageName = "external-editor"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz"; - sha512 = "bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA=="; + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; }; }; "extglob-0.3.2" = { @@ -14171,15 +14216,6 @@ let sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; - "fast-future-1.0.2" = { - name = "fast-future"; - packageName = "fast-future"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-future/-/fast-future-1.0.2.tgz"; - sha1 = "8435a9aaa02d79248d17d704e76259301d99280a"; - }; - }; "fast-glob-2.2.7" = { name = "fast-glob"; packageName = "fast-glob"; @@ -14639,13 +14675,13 @@ let sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; }; - "find-up-4.0.0" = { + "find-up-4.1.0" = { name = "find-up"; packageName = "find-up"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-4.0.0.tgz"; - sha512 = "zoH7ZWPkRdgwYCDVoQTzqjG8JSPANhtvLhh4KVUHyKnaUJJrNeFmWIkTcNuJmR3GLMEmGYEf2S2bjgx26JTF+Q=="; + url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; }; "find-versions-2.0.0" = { @@ -14954,13 +14990,13 @@ let sha512 = "8QBannTFLICARmflhHpXNeR5hh6IzIyJz4XhKTofzmxq/hXEn1un7aF6P6dRQkOwthENDTbSB07eWKqwnYDKtw=="; }; }; - "flumeview-query-7.2.0" = { + "flumeview-query-7.2.1" = { name = "flumeview-query"; packageName = "flumeview-query"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-7.2.0.tgz"; - sha512 = "3kf99BAA/zKEjYPjwoCuQaOQQXnNaMsBuzGqznLXcwmG8+JkzDqQ13rx/+nQFSpd6D5GvAsQAWze/ILIbh/jrQ=="; + url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-7.2.1.tgz"; + sha512 = "iLr5S+BrGJIls30jR42L0g/gehSrJmAlYIQhcu0fNpUW5dOq7sfa8rOmJo0lpC2Ns5EIgGogR6uO8ze7qWFvLQ=="; }; }; "flumeview-reduce-1.3.16" = { @@ -15134,13 +15170,13 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; - "form-data-2.4.0" = { + "form-data-2.5.0" = { name = "form-data"; packageName = "form-data"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.4.0.tgz"; - sha512 = "4FinE8RfqYnNim20xDwZZE0V2kOs/AuElIjFUbPuegQSaoZM+vUT5FnwSl10KPugH4voTg1bEQlcbCG9ka75TA=="; + url = "https://registry.npmjs.org/form-data/-/form-data-2.5.0.tgz"; + sha512 = "WXieX3G/8side6VIqx44ablyULoGruSde5PNTxoUyo5CeyAMX6nVWUd0rgist/EuX655cjhUhTo1Fo3tRYqbcA=="; }; }; "format-0.2.2" = { @@ -15395,15 +15431,6 @@ let sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; }; }; - "fs-extra-8.0.1" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz"; - sha512 = "W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A=="; - }; - }; "fs-extra-8.1.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -16350,6 +16377,15 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; + "gossip-query-2.0.2" = { + name = "gossip-query"; + packageName = "gossip-query"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gossip-query/-/gossip-query-2.0.2.tgz"; + sha512 = "17MflOq79BYcK01RrqHhtG5Dl88ztSu7gfD+4i1GrpzkbvLDKkJ7LoKiFKzBWzzd+Jd5VhIiLtQRvjRiKa6PUg=="; + }; + }; "got-1.2.2" = { name = "got"; packageName = "got"; @@ -16494,13 +16530,13 @@ let sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog=="; }; }; - "graphql-14.4.1" = { + "graphql-14.4.2" = { name = "graphql"; packageName = "graphql"; - version = "14.4.1"; + version = "14.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-14.4.1.tgz"; - sha512 = "g4HUH26CohlMjaHneXMAtvG3QtO6peJIUTFxrPW4g5LNnXkUuFoBI6Bk1c14Q5kW8+FyjM/tTbePTgpiVB/2hQ=="; + url = "https://registry.npmjs.org/graphql/-/graphql-14.4.2.tgz"; + sha512 = "6uQadiRgnpnSS56hdZUSvFrVcQ6OF9y6wkxJfKquFtHlnl7+KSuWwSJsdwiK1vybm1HgcdbpGkCpvhvsVQ0UZQ=="; }; }; "graphql-anywhere-4.2.4" = { @@ -16548,22 +16584,13 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.7.4" = { + "graphql-extensions-0.7.7" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.7.4"; + version = "0.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.7.4.tgz"; - sha512 = "Ly+DiTDU+UtlfPGQkqmBX2SWMr9OT3JxMRwpB9K86rDNDBTJtG6AE2kliQKKE+hg1+945KAimO7Ep+YAvS7ywg=="; - }; - }; - "graphql-extensions-0.7.6" = { - name = "graphql-extensions"; - packageName = "graphql-extensions"; - version = "0.7.6"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.7.6.tgz"; - sha512 = "RV00O3YFD1diehvdja180BlKOGWgeigr/8/Wzr6lXwLcFtk6FecQC/7nf6oW1qhuXczHyNjt/uCr0WWbWq6mYg=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.7.7.tgz"; + sha512 = "xiTbVGPUpLbF86Bc+zxI/v/axRkwZx3s+y2/kUb2c2MxNZeNhMZEw1dSutuhY2f2JkRkYFJii0ucjIVqPAQ/Lg=="; }; }; "graphql-import-0.4.5" = { @@ -16611,13 +16638,13 @@ let sha512 = "dDX2M+VMsxXFCmUX0Vo0TopIZIX4ggzOtiCsThgtrKR4niiaagsGTDIHj3fsOMFETpa064vzovI+4YV4QnMbcg=="; }; }; - "graphql-schema-linter-0.2.0" = { + "graphql-schema-linter-0.2.1" = { name = "graphql-schema-linter"; packageName = "graphql-schema-linter"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-schema-linter/-/graphql-schema-linter-0.2.0.tgz"; - sha512 = "IXldy6nCmzAZgweBzQUGPLVO1aRLRy/n/jEm8h8pQHmMYoHv2hQgUcRQRaCbjcdNKYKToN1cfHvdgtGJ+DWSNQ=="; + url = "https://registry.npmjs.org/graphql-schema-linter/-/graphql-schema-linter-0.2.1.tgz"; + sha512 = "Z0rKFkxvIXqktkd/4luMYgBXWZeVCp8VJysOKz3RtbcpqbiIpdwtH0J678xOQ+hJLwEfrdCrhKNxxvRpt6mCSg=="; }; }; "graphql-static-binding-0.9.3" = { @@ -17115,13 +17142,13 @@ let sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; }; }; - "hash-sum-1.0.2" = { + "hash-sum-2.0.0" = { name = "hash-sum"; packageName = "hash-sum"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; - sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; + url = "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz"; + sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; }; }; "hash.js-1.1.7" = { @@ -17493,13 +17520,13 @@ let sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "htmlnano-0.2.3" = { + "htmlnano-0.2.4" = { name = "htmlnano"; packageName = "htmlnano"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.3.tgz"; - sha512 = "iS6T3J5gk2wInodbtMUyAU8sLYJOhuWDnIEd8lFRoHTypVGgawPHFEx2ZIK/XTErtDfwHBsrXeCwHAP8bdoSWw=="; + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.4.tgz"; + sha512 = "wsg7+Hjyi1gHpMUixkeOjeRUNhBBTnEDB//kzvVHR+LUK4p+/31DAyE+pEACT0SQk3W0KE7Xdylk9+uNxdHXLg=="; }; }; "htmlparser2-3.10.1" = { @@ -17691,6 +17718,15 @@ let sha512 = "HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ=="; }; }; + "https-proxy-agent-2.2.2" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz"; + sha512 = "c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg=="; + }; + }; "hue-sdk-0.1.0" = { name = "hue-sdk"; packageName = "hue-sdk"; @@ -17727,13 +17763,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-6.26.0" = { + "hypercore-7.5.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.26.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.26.0.tgz"; - sha512 = "su/bucp958SyFWWF5uzeLT05N0k7gTbktvLCo0TaloXWSSs2OiFyj3Ka7v93yaD9u0vBT3i0foPoZnj1yC/dog=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-7.5.0.tgz"; + sha512 = "Uuk0xmc73YzkqRCcLtAUTm5dmtdvg6yG3sMytIJuf/bu+9SB5pej0tILEBgnI+TmWRdJrxd242j1C4ND96V0xg=="; }; }; "hypercore-crypto-1.0.0" = { @@ -17754,13 +17790,13 @@ let sha512 = "V/0Vru8gavoO++K2QFOAXu7xgBuXcBAjURQ9BQ48DnQ/p4hK4Jy76ulRnppDHpbDthxRziMWLZfmYXncwD63Aw=="; }; }; - "hyperdrive-9.14.5" = { + "hyperdrive-9.15.0" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "9.14.5"; + version = "9.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.14.5.tgz"; - sha512 = "uSu6eYprXJhIYaZ7PSODNaozddTrVscZpfkHZwmOg0CKYyX03UovfLyfkhH8/QMew6n0iTg+iiyvp2zhnUapnQ=="; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.15.0.tgz"; + sha512 = "FXEU/f0B0zIODkllE2eqk6S2Gmd0fcR7vwsbbA+OBRWXARALoCkJedOHBX6ervkkBPi3uQ/wXPTb7wee2j2PiA=="; }; }; "hyperdrive-http-4.4.0" = { @@ -17853,6 +17889,15 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; + "iconv-lite-0.5.0" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz"; + sha512 = "NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw=="; + }; + }; "icss-replace-symbols-1.1.0" = { name = "icss-replace-symbols"; packageName = "icss-replace-symbols"; @@ -18114,6 +18159,15 @@ let sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; }; }; + "indent-string-4.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + }; "indexes-of-1.0.1" = { name = "indexes-of"; packageName = "indexes-of"; @@ -18330,15 +18384,6 @@ let sha512 = "Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA=="; }; }; - "inquirer-6.3.1" = { - name = "inquirer"; - packageName = "inquirer"; - version = "6.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz"; - sha512 = "MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA=="; - }; - }; "inquirer-6.4.1" = { name = "inquirer"; packageName = "inquirer"; @@ -18348,6 +18393,15 @@ let sha512 = "/Jw+qPZx4EDYsaT6uz7F4GJRNFMRdKNeUZw3ZnKV8lyuUgz/YWRCSUAJMZSVhSq4Ec0R2oYnyi6b3d4JXcL5Nw=="; }; }; + "inquirer-6.5.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz"; + sha512 = "scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA=="; + }; + }; "inquirer-autocomplete-prompt-1.0.1" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -18690,6 +18744,15 @@ let sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; }; }; + "is-absolute-url-3.0.0" = { + name = "is-absolute-url"; + packageName = "is-absolute-url"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.0.tgz"; + sha512 = "3OkP8XrM2Xq4/IxsJnClfMp3OaM3TAatLPLKPeWcxLBTrpe6hihwtX+XZfJTcXg/FTRi4qjy0y/C5qiyNxY24g=="; + }; + }; "is-accessor-descriptor-0.1.6" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; @@ -19680,13 +19743,13 @@ let sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; }; - "isbinaryfile-4.0.1" = { + "isbinaryfile-4.0.2" = { name = "isbinaryfile"; packageName = "isbinaryfile"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.1.tgz"; - sha512 = "bvJxbNWm72dy/1+qeBm9F8wUM4siDnlzid7NN5Ib4nQcc0tNIx/YWgEih1ZRHXr8xVbpGk1ccLlA9gOSlyx3gw=="; + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.2.tgz"; + sha512 = "C3FSxJdNrEr2F4z6uFtNzECDM5hXk+46fxaa+cwBe5/XrWSmzdG8DDgyjfX6/NRdBB21q2JXuRAzPCUs+fclnQ=="; }; }; "isemail-3.2.0" = { @@ -20076,6 +20139,15 @@ let sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw=="; }; }; + "jsdom-15.1.1" = { + name = "jsdom"; + packageName = "jsdom"; + version = "15.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-15.1.1.tgz"; + sha512 = "cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ=="; + }; + }; "jsdom-7.2.2" = { name = "jsdom"; packageName = "jsdom"; @@ -20328,13 +20400,13 @@ let sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ=="; }; }; - "jsonata-1.6.4" = { + "jsonata-1.6.5" = { name = "jsonata"; packageName = "jsonata"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.6.4.tgz"; - sha512 = "3MWTH77OHLf3muMknZJS4GnDhGPMITyF9D84hpRQrjt1Hk3pBtTiyZcqodHUDSaDq8VDy9YyIbanRI+3RoW3FA=="; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.6.5.tgz"; + sha512 = "iRx9U6AkvsjrRdFf9MMbQmGVAL3bXVANR12vbVxjgXouMPU9VJQEcFnLWUCaW8IDmOzdxsaxK4Xe7SGlBYr5Bg=="; }; }; "jsonc-parser-1.0.3" = { @@ -20499,13 +20571,13 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.2.1" = { + "jszip-3.2.2" = { name = "jszip"; packageName = "jszip"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.2.1.tgz"; - sha512 = "iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.2.2.tgz"; + sha512 = "NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA=="; }; }; "jszip-git://github.com/anmonteiro/jszip#patch-1" = { @@ -20995,15 +21067,6 @@ let sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ=="; }; }; - "level-4.0.0" = { - name = "level"; - packageName = "level"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level/-/level-4.0.0.tgz"; - sha512 = "4epzCOlEcJ529NOdlAYiuiakS/kZTDdiKSBNJmE1B8bsmA+zEVwcpxyH86qJSQTpOu7SODrlaD9WgPRHLkGutA=="; - }; - }; "level-5.0.1" = { name = "level"; packageName = "level"; @@ -21049,15 +21112,6 @@ let sha512 = "UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw=="; }; }; - "level-iterator-stream-3.0.1" = { - name = "level-iterator-stream"; - packageName = "level-iterator-stream"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-3.0.1.tgz"; - sha512 = "nEIQvxEED9yRThxvOrq8Aqziy4EGzrxSZK+QzEFAVuJvQ8glfyZ96GB6BoI4sBbLfjMXm2w4vu3Tkcm9obcY0g=="; - }; - }; "level-iterator-stream-4.0.1" = { name = "level-iterator-stream"; packageName = "level-iterator-stream"; @@ -21076,15 +21130,6 @@ let sha512 = "m5JRIyHZn5VnCCFeRegJkn5bQd3MJK5qZX12zg3Oivc8+BUIS2yFS6ANMMeHX2ieGxucNvEn6/ZnyjmZQLLUWw=="; }; }; - "level-packager-3.1.0" = { - name = "level-packager"; - packageName = "level-packager"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level-packager/-/level-packager-3.1.0.tgz"; - sha512 = "UxVEfK5WH0u0InR3WxTCSAroiorAGKzXWZT6i+nBjambmvINuXFUsFx2Ai3UIjUUtnyWhluv42jMlzUZCsAk9A=="; - }; - }; "level-packager-5.0.2" = { name = "level-packager"; packageName = "level-packager"; @@ -21112,15 +21157,6 @@ let sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA=="; }; }; - "leveldown-4.0.2" = { - name = "leveldown"; - packageName = "leveldown"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/leveldown/-/leveldown-4.0.2.tgz"; - sha512 = "SUgSRTWFh3eeiTdIt2a4Fi9TZO5oWzE9uC/Iw8+fVr1sk8x1S2l151UWwSmrMFZB3GxJhZIf4bQ0n+051Cctpw=="; - }; - }; "leveldown-5.1.1" = { name = "leveldown"; packageName = "leveldown"; @@ -21139,15 +21175,6 @@ let sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; - "levelup-3.1.1" = { - name = "levelup"; - packageName = "levelup"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-3.1.1.tgz"; - sha512 = "9N10xRkUU4dShSRRFTBdNaBxofz+PGaIZO962ckboJZiNmLuhVT6FZ6ZKAsICKfUBO76ySaYU6fJWX/jnj3Lcg=="; - }; - }; "levelup-4.1.0" = { name = "levelup"; packageName = "levelup"; @@ -21310,6 +21337,15 @@ let sha512 = "4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg=="; }; }; + "linkify-it-2.2.0" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz"; + sha512 = "GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw=="; + }; + }; "listenercount-1.0.1" = { name = "listenercount"; packageName = "listenercount"; @@ -21472,6 +21508,15 @@ let sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; + "lodash-4.17.14" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.14"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz"; + sha512 = "mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="; + }; + }; "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; @@ -21499,13 +21544,13 @@ let sha1 = "c6940128a9d30f8e902cd2cf99fd0cba4ecfc183"; }; }; - "lodash-es-4.17.11" = { + "lodash-es-4.17.14" = { name = "lodash-es"; packageName = "lodash-es"; - version = "4.17.11"; + version = "4.17.14"; src = fetchurl { - url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.11.tgz"; - sha512 = "DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q=="; + url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.14.tgz"; + sha512 = "7zchRrGa8UZXjD/4ivUWP1867jDkhzTG2c/uj739utSd7O/pFFdxspCemIFKEEjErbcqRzn8nKnGsi7mvTgRPA=="; }; }; "lodash-id-0.14.0" = { @@ -22228,13 +22273,13 @@ let sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; }; }; - "lodash.merge-4.6.1" = { + "lodash.merge-4.6.2" = { name = "lodash.merge"; packageName = "lodash.merge"; - version = "4.6.1"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz"; - sha512 = "AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ=="; + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; "lodash.noop-2.4.1" = { @@ -22390,13 +22435,13 @@ let sha1 = "f8cdecc6169a255be9098ae8b0c53d378931d14f"; }; }; - "lodash.template-4.4.0" = { + "lodash.template-4.5.0" = { name = "lodash.template"; packageName = "lodash.template"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz"; - sha1 = "e73a0385c8355591746e020b99679c690e68fba0"; + url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"; + sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="; }; }; "lodash.templatesettings-3.1.1" = { @@ -22408,13 +22453,13 @@ let sha1 = "fb307844753b66b9f1afa54e262c745307dba8e5"; }; }; - "lodash.templatesettings-4.1.0" = { + "lodash.templatesettings-4.2.0" = { name = "lodash.templatesettings"; packageName = "lodash.templatesettings"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz"; - sha1 = "2b4d4e95ba440d915ff08bc899e4553666713316"; + url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"; + sha512 = "stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ=="; }; }; "lodash.throttle-4.1.1" = { @@ -22516,13 +22561,13 @@ let sha512 = "KJ6zAPIHWo7Xg1jYror6IUDFJBq1bQ4Bi4wAEp2y/0ScjBBVi/g0thr0sUVhuvuXauWzczt7T2QHghPDNnKBuw=="; }; }; - "log4js-4.4.0" = { + "log4js-4.5.1" = { name = "log4js"; packageName = "log4js"; - version = "4.4.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-4.4.0.tgz"; - sha512 = "xwRvmxFsq8Hb7YeS+XKfvCrsH114bXex6mIwJ2+KmYVi23pB3+hlzyGq1JPycSFTJWNLhD/7PCtM0RfPy6/2yg=="; + url = "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz"; + sha512 = "EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw=="; }; }; "logform-2.1.2" = { @@ -22867,15 +22912,6 @@ let sha512 = "oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w=="; }; }; - "magic-string-0.25.2" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.25.2"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz"; - sha512 = "iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg=="; - }; - }; "magic-string-0.25.3" = { name = "magic-string"; packageName = "magic-string"; @@ -22984,13 +23020,13 @@ let sha1 = "df0388fcd0b37816dff0a5fb8108939777dcbc9d"; }; }; - "make-fetch-happen-4.0.1" = { + "make-fetch-happen-4.0.2" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz"; - sha512 = "7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.2.tgz"; + sha512 = "YMJrAjHSb/BordlsDEcVcPyTbiJKkzqMf48N8dAJZT9Zjctrkb6Yg4TY9Sq2AwSIQJFn5qBBKVTYt3vP5FMIHA=="; }; }; "make-iterator-1.0.1" = { @@ -24091,13 +24127,13 @@ let sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; }; }; - "moment-timezone-0.5.25" = { + "moment-timezone-0.5.26" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.25"; + version = "0.5.26"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.25.tgz"; - sha512 = "DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz"; + sha512 = "sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g=="; }; }; "monotonic-timestamp-0.0.9" = { @@ -24307,13 +24343,13 @@ let sha512 = "2uv89W7I5brTx6ETpE7kXv0dGC3iA+xrAxNtwjwb3lwBTXIYrJ4jhhVX5UyNaRWHdmfLe0dJeEvJm9uoekkmag=="; }; }; - "multiblob-http-0.4.2" = { + "multiblob-http-1.0.0" = { name = "multiblob-http"; packageName = "multiblob-http"; - version = "0.4.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-0.4.2.tgz"; - sha512 = "hVaXryaqJ3vvKjRNcOCEadzgO99nR+haxlptswr3vRvgavbK/Y/I7/Nat12WIQno2/A8+nkbE+ZcrsN3UDbtQw=="; + url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.0.0.tgz"; + sha512 = "wKsVFCi3lSR75peYpFMRDbWeGm86qgYfBe9Otm8j73rs+a1OltSLcg8fsTCO+pJTbYyIV92Iw5lnVYYTs7zMvg=="; }; }; "multicast-dns-4.0.1" = { @@ -24550,22 +24586,31 @@ let sha512 = "1wRnouHgHO3JYN3xbyzQGTFsd/wo12/zaikmQusP8ma+lmL+ewNvuvuwKSEJasKQTRnbTwbzh/OPdt9N76CA4g=="; }; }; - "muxrpc-validation-2.0.1" = { - name = "muxrpc-validation"; - packageName = "muxrpc-validation"; - version = "2.0.1"; + "muxrpc-usage-2.1.0" = { + name = "muxrpc-usage"; + packageName = "muxrpc-usage"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpc-validation/-/muxrpc-validation-2.0.1.tgz"; - sha1 = "cd650d172025fe9d064230aab38ca6328dd16f2f"; + url = "https://registry.npmjs.org/muxrpc-usage/-/muxrpc-usage-2.1.0.tgz"; + sha512 = "ZspYQd4n4pLy86Gu/yrEdHvg5NBrg4p2NayQ2NFelN1QyLZRLTKPlTyaa6DyztsCG7mjLzxFBw9jw9LReB8Azw=="; }; }; - "muxrpcli-1.1.0" = { + "muxrpc-validation-3.0.2" = { + name = "muxrpc-validation"; + packageName = "muxrpc-validation"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/muxrpc-validation/-/muxrpc-validation-3.0.2.tgz"; + sha512 = "iWo/23xFnl+IGeX+LlfwoVKtyY4volPSodf3nwPScPgxjws4k2ZUozPG98OouMA0yn0JamqApjRw7eqLrzyV2A=="; + }; + }; + "muxrpcli-3.1.1" = { name = "muxrpcli"; packageName = "muxrpcli"; - version = "1.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpcli/-/muxrpcli-1.1.0.tgz"; - sha1 = "4ae9ba986ab825c4a5c12fcb71c6daa81eab5158"; + url = "https://registry.npmjs.org/muxrpcli/-/muxrpcli-3.1.1.tgz"; + sha512 = "DSBXkmbfZgUrM9Y54Saeb2RySmuDMo5jAnMnBo0JHempIlHIXmnrIASdC0co0TQATq8kECF6SYcTFbJLKZUfJw=="; }; }; "mv-2.1.1" = { @@ -24604,22 +24649,13 @@ let sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; }; }; - "nan-2.12.1" = { + "nan-2.13.2" = { name = "nan"; packageName = "nan"; - version = "2.12.1"; + version = "2.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz"; - sha512 = "JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="; - }; - }; - "nan-2.13.1" = { - name = "nan"; - packageName = "nan"; - version = "2.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.13.1.tgz"; - sha512 = "I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA=="; + url = "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz"; + sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; }; }; "nan-2.14.0" = { @@ -25500,13 +25536,13 @@ let sha512 = "8V4tLL0nM1DOUgEtTOBSTZcLbtZ4Gg4CPFVHiPmLCo2QYTMQ0JdBIYj4pg95LbJbYkV721fqsw1RDsitBfYuCQ=="; }; }; - "node-releases-1.1.24" = { + "node-releases-1.1.25" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.24"; + version = "1.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.24.tgz"; - sha512 = "wym2jptfuKowMmkZsfCSTsn8qAVo8zm+UiQA6l5dNqUcpfChZSnS/vbbpOeXczf+VdPhutxh+99lWHhdd6xKzg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.25.tgz"; + sha512 = "fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -25689,13 +25725,13 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "normalize-html-whitespace-0.2.0" = { + "normalize-html-whitespace-1.0.0" = { name = "normalize-html-whitespace"; packageName = "normalize-html-whitespace"; - version = "0.2.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-0.2.0.tgz"; - sha1 = "101722f6423551c75cdb8f9d104ff850daf1e10e"; + url = "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-1.0.0.tgz"; + sha512 = "9ui7CGtOOlehQu0t/OhhlmDyc71mKVlv+4vF+me4iZLPrNtRL2xoquEdfZxasC/bdQi/Hr3iTrpyRKIG+ocabA=="; }; }; "normalize-package-data-2.5.0" = { @@ -25896,13 +25932,13 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-3.9.0" = { + "npm-registry-fetch-3.9.1" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz"; - sha512 = "srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.1.tgz"; + sha512 = "VQCEZlydXw4AwLROAXWUR7QDfe2Y8Id/vpAgp6TI1/H78a4SiQ1kQrKZALm5/zxM5n4HIi+aYb+idUAV/RuY0Q=="; }; }; "npm-run-4.1.2" = { @@ -26536,15 +26572,6 @@ let sha512 = "Vqch7NFb/WsMujhqfq+B3u0xkssRjZlxh+NSsBSphpcgaFD7gfB0SUBfR91E9ygBlyNGNogXR2cUB8rRfoo2kQ=="; }; }; - "open-6.2.0" = { - name = "open"; - packageName = "open"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-6.2.0.tgz"; - sha512 = "Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw=="; - }; - }; "open-6.4.0" = { name = "open"; packageName = "open"; @@ -26779,15 +26806,6 @@ let sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; - "os-homedir-2.0.0" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-2.0.0.tgz"; - sha512 = "saRNz0DSC5C/I++gFIaJTXoFJMRwiP5zHar5vV3xQ2TkgEw6hDCcU5F272JjUylpiVgBrZNQHnfjkLabTfb92Q=="; - }; - }; "os-locale-1.4.0" = { name = "os-locale"; packageName = "os-locale"; @@ -27166,15 +27184,6 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; - "pacote-9.5.0" = { - name = "pacote"; - packageName = "pacote"; - version = "9.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.5.0.tgz"; - sha512 = "aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg=="; - }; - }; "pacote-9.5.1" = { name = "pacote"; packageName = "pacote"; @@ -27184,6 +27193,15 @@ let sha512 = "Zqvczvf/zZ7QNosdE9uTC7SRuvSs9tFqRkF6cJl+2HH7COBnx4BRAGpeXJlrbN+mM0CMHpbi620xdEHhCflghA=="; }; }; + "pacote-9.5.2" = { + name = "pacote"; + packageName = "pacote"; + version = "9.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pacote/-/pacote-9.5.2.tgz"; + sha512 = "KVxalD57jaHnWIBQKPeU/eFU4UoMqUOj3h5AXvVMp9oJd8BZvIdTm8qmazy4jpYBf7RX9xCFmeFcU3ebvrUSZQ=="; + }; + }; "pad-0.0.5" = { name = "pad"; packageName = "pad"; @@ -27445,13 +27463,13 @@ let sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww=="; }; }; - "parse-torrent-6.1.2" = { + "parse-torrent-7.0.0" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "6.1.2"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.1.2.tgz"; - sha512 = "Z/vig84sHwtrTEbOzisT4xnYTFlOgAaLQccPruMPgRahZUppVE/BUXzAos3jZM7c64o0lfukQdQ4ozWa5lN39w=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-7.0.0.tgz"; + sha512 = "i/Y9CNp2xn+moDrNWApBZ5rW9xRY6x6z4A71Lw886UKx7E/DkVAzuvA7efVtcPgdY3iI9ea0thaoqeMN3GZBOA=="; }; }; "parse-torrent-file-2.1.4" = { @@ -27499,6 +27517,15 @@ let sha512 = "VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="; }; }; + "parse5-5.1.0" = { + name = "parse5"; + packageName = "parse5"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz"; + sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; + }; + }; "parsejson-0.0.1" = { name = "parsejson"; packageName = "parsejson"; @@ -27697,6 +27724,15 @@ let sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; "path-is-absolute-1.0.0" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -28318,13 +28354,13 @@ let sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc"; }; }; - "portfinder-1.0.20" = { + "portfinder-1.0.21" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.20"; + version = "1.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz"; - sha512 = "Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw=="; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.21.tgz"; + sha512 = "ESabpDCzmBS3ekHbmpAIiESq3udRsCBGiBZLsC+HgBKv2ezb0R4oG+7RnYEVZ/ZCfhel5Tx3UzdNWA0Lox2QCA=="; }; }; "posix-character-classes-0.1.1" = { @@ -28661,6 +28697,15 @@ let sha512 = "w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ=="; }; }; + "postcss-selector-parser-6.0.2" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; + sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; + }; + }; "postcss-svgo-4.0.2" = { name = "postcss-svgo"; packageName = "postcss-svgo"; @@ -28715,15 +28760,6 @@ let sha512 = "yvt54j0zCBHQVEFAuR+yHld8CZrCa/E1Z/OcFNCV1IEWTLVxT8O7nYnM4IIw1CD4r8kaRd3lc42+0lgCKgm87w=="; }; }; - "prebuild-install-5.2.5" = { - name = "prebuild-install"; - packageName = "prebuild-install"; - version = "5.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.5.tgz"; - sha512 = "6uZgMVg7yDfqlP5CPurVhtq3hUKBFNufiar4J5hZrlHTo59DDBEtyxw01xCdFss9j0Zb9+qzFVf/s4niayba3w=="; - }; - }; "prebuild-install-5.3.0" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -29750,15 +29786,6 @@ let sha512 = "enbnbnO+czsPuCq9s9HTTzDzzVQD5TSe60aO3nBioeJ9mevh8RzE4Hxbujo9TReg1fJlmNEL8uyQTUgn8+rSHg=="; }; }; - "pull-stringify-2.0.0" = { - name = "pull-stringify"; - packageName = "pull-stringify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-stringify/-/pull-stringify-2.0.0.tgz"; - sha1 = "22ba31da95af0888e0fb559238b1fa915a6a5b64"; - }; - }; "pull-through-1.0.18" = { name = "pull-through"; packageName = "pull-through"; @@ -30398,13 +30425,13 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "rc-config-loader-2.0.3" = { + "rc-config-loader-2.0.4" = { name = "rc-config-loader"; packageName = "rc-config-loader"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.3.tgz"; - sha512 = "CN9BmvV9Kcl6c4WEZ8w13JFazLYtKnqxxKGKuiCS8yZpUtJFa/nd7PdjVnRBJJ89U3OZfR6DmqOqMvmZ5ZFNMw=="; + url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.4.tgz"; + sha512 = "k06UzRbYDWgF4Mc/YrsZsmzSpDLuHoThJxep+vq5H09hiX8rbA5Ue/Ra0dwWm5MQvWYW4YBXgA186inNxuxidQ=="; }; }; "re-emitter-1.1.4" = { @@ -30488,15 +30515,6 @@ let sha512 = "/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg=="; }; }; - "read-package-tree-5.2.2" = { - name = "read-package-tree"; - packageName = "read-package-tree"; - version = "5.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.2.2.tgz"; - sha512 = "rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA=="; - }; - }; "read-package-tree-5.3.1" = { name = "read-package-tree"; packageName = "read-package-tree"; @@ -30650,13 +30668,13 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "readdirp-3.0.2" = { + "readdirp-3.1.1" = { name = "readdirp"; packageName = "readdirp"; - version = "3.0.2"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.0.2.tgz"; - sha512 = "LbyJYv48eywrhOlScq16H/VkCiGKGPC2TpOdZCJ7QXnYEjn3NN/Oblh8QEU3vqfSRBB7OGvh5x45NKiVeNujIQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.1.tgz"; + sha512 = "XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ=="; }; }; "readline2-0.1.1" = { @@ -30875,13 +30893,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp-tree-0.1.10" = { + "regexp-tree-0.1.11" = { name = "regexp-tree"; packageName = "regexp-tree"; - version = "0.1.10"; + version = "0.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.10.tgz"; - sha512 = "K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ=="; + url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz"; + sha512 = "7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg=="; }; }; "regexp.prototype.flags-1.2.0" = { @@ -30947,6 +30965,15 @@ let sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; }; }; + "registry-auth-token-4.0.0" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.0.0.tgz"; + sha512 = "lpQkHxd9UL6tb3k/aHAVfnVtn+Bcs9ob5InuFLLEDqSqeq+AljB8GZW9xY0x7F+xYwEcjKe07nyoxzEYz6yvkw=="; + }; + }; "registry-url-3.1.0" = { name = "registry-url"; packageName = "registry-url"; @@ -31766,6 +31793,15 @@ let sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; }; }; + "right-pad-1.0.1" = { + name = "right-pad"; + packageName = "right-pad"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz"; + sha1 = "8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"; + }; + }; "rimraf-2.1.4" = { name = "rimraf"; packageName = "rimraf"; @@ -31937,13 +31973,13 @@ let sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; - "rss-parser-3.7.1" = { + "rss-parser-3.7.2" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.1.tgz"; - sha512 = "1JKFzLHeteNandmlVBUWgLPmipFEllhdUQlmNvkXd6ju4VFOlGr0VmtlQaxzZoVysG2nbGb8eAtzNqQTxzQ+AQ=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.2.tgz"; + sha512 = "kx0VIFelgwBk5qA4n32U6cx40anAU7TwlRXjyxLDFgMlg8/UcJ64x+Hj5oRX1Kjos+OeFGOmnd5YXH5ES+bmzg=="; }; }; "rsvp-3.6.2" = { @@ -32153,6 +32189,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.0" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; + }; + }; "safe-json-stringify-1.2.0" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; @@ -32252,6 +32297,15 @@ let sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; + "saxes-3.1.11" = { + name = "saxes"; + packageName = "saxes"; + version = "3.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz"; + sha512 = "Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g=="; + }; + }; "schema-utils-1.0.0" = { name = "schema-utils"; packageName = "schema-utils"; @@ -32297,13 +32351,13 @@ let sha512 = "sDtmZDpibGH2ixj3FOmsC3Z/b08eaB2/KAvy2oSp4qvcGdhatBSfb1RdVpwjQl5c3J83WbBo1HSZ7DBtMu43lA=="; }; }; - "secret-stack-5.1.1" = { + "secret-stack-6.2.1" = { name = "secret-stack"; packageName = "secret-stack"; - version = "5.1.1"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/secret-stack/-/secret-stack-5.1.1.tgz"; - sha512 = "EHOmkh/CWTOXOtOgqfG1k3ziYJ7bg4zMy52UG7sIwNcoF0scHTt8cZg1tbJfMCDlx+VdYbRfsBZ/aq4v8F+IFw=="; + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.2.1.tgz"; + sha512 = "7hw13S77Et4yC23uVXOFDRyullxAvFuoN3XW6PvHlAVkYMirLkyeglPOwPTk5JhYwIKPdpIz6vQ7DM0zSlOUHA=="; }; }; "secure-keys-1.0.0" = { @@ -32693,13 +32747,13 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; - "serve-handler-6.0.2" = { + "serve-handler-6.1.0" = { name = "serve-handler"; packageName = "serve-handler"; - version = "6.0.2"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-handler/-/serve-handler-6.0.2.tgz"; - sha512 = "D1zgDpvx9Rgjip6rzY2QBjlZwfr/oiDSg66HipOWkEw1appHn7/mXdVRL6F8+bd1KD117Wch4+4x78OTXQVwDg=="; + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.0.tgz"; + sha512 = "63N075Tn3PsFYcu0NVV7tb367UbiW3gnC+/50ohL4oqOhAG6bmbaWqiRcXQgbzqc0ALBjSAzg7VTfa0Qw4E3hA=="; }; }; "serve-index-1.7.3" = { @@ -33062,13 +33116,13 @@ let sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; }; }; - "simple-git-1.117.0" = { + "simple-git-1.120.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.117.0"; + version = "1.120.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.117.0.tgz"; - sha512 = "2hqTQFkWwU7+d6rWdxDpKnYih430Dek3LzJ3kUzimxOflpBclZUstI9b+Y4x4rSWvqKe698LyZGFAW02/Ja8kA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.120.0.tgz"; + sha512 = "caF3eLrUSrL6d5fBVU85bmY0lpbMpbkWze1W2Tg946kN75s/WWvKqpc4Agn3DLHyzXEeiWfv8yPULiCKumuIQg=="; }; }; "simple-markdown-0.4.4" = { @@ -33161,13 +33215,13 @@ let sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA=="; }; }; - "sisteransi-1.0.0" = { + "sisteransi-1.0.2" = { name = "sisteransi"; packageName = "sisteransi"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.0.tgz"; - sha512 = "N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ=="; + url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.2.tgz"; + sha512 = "ZcYcZcT69nSLAR2oLN2JwNmLkJEKGooFMCdvOkFrToUt/WfcRWqhIg4P4KwY4dmLbuyXIx4o4YmPsvMRJYJd/w=="; }; }; "skin-tone-1.0.0" = { @@ -33377,13 +33431,13 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-1.186.0" = { + "snyk-1.193.1" = { name = "snyk"; packageName = "snyk"; - version = "1.186.0"; + version = "1.193.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.186.0.tgz"; - sha512 = "yMoX4x6NlWTmY9JTGeWU6+BM7cHdZey4fBDJmNYITndMa50lZ4nk9cJg52ZAN300CraOzlgt3FKd56GNT+eiVQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.193.1.tgz"; + sha512 = "bwxrpR8T5tOQgLGwBMq7BYKDvLQRVsB3znMJpdZpYnMCY34MpmkuDhU+546TA8kmp5cLPCg+0BlaO7Yrj3Ouag=="; }; }; "snyk-config-2.2.1" = { @@ -33440,13 +33494,13 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.3.0" = { + "snyk-mvn-plugin-2.3.1" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.3.0.tgz"; - sha512 = "LOSiJu+XUPVqKCXcnQPLhlyTGm3ikDwjvYw5fpiEnvjMWkMDd8IfzZqulqreebJDmadUpP7Cn0fabfx7TszqxA=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.3.1.tgz"; + sha512 = "2RgBnYe3Upc7SL+sL7MmnoCoJV/TZZ7q2L0J1BAbjoD/4cca4q0TCR6QVLzytHf4fSqc6QjSMjTUfmAo0kgsBg=="; }; }; "snyk-nodejs-lockfile-parser-1.13.0" = { @@ -33476,13 +33530,13 @@ let sha512 = "6m736zGVoeT/zS9KEtlmqTSPEPjAfLe8iYoQ3AwbyxDhzuLY49lTaV67MyZtGwjhi1x4KBe+XOgeWwyf6Avf/A=="; }; }; - "snyk-php-plugin-1.6.2" = { + "snyk-php-plugin-1.6.3" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.6.2.tgz"; - sha512 = "6QM7HCmdfhuXSNGFgNOVC+GVT1Y2UfBoO+TAeV1uM1CdRGPJziz12F79a1Qyc9YGuiAwmm5DtdatUgKraC8gdA=="; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.6.3.tgz"; + sha512 = "S9GAVnL2ieaS/wvhq+ywUDrOlt477+em//XkqIqdJEFNUgFyxwrXjQgB0paehP8PBQQ+RySIV/MMgIFb3+6IwA=="; }; }; "snyk-policy-1.13.5" = { @@ -33521,13 +33575,13 @@ let sha512 = "GP3VBrkz1iDDw2q8ftTqppHqzIAxmsUIoXR+FRWDKcipkKHXHJyUmtEo11QVT5fNRV0D0RCsssk2S5CTxTCu6A=="; }; }; - "snyk-sbt-plugin-2.4.2" = { + "snyk-sbt-plugin-2.5.6" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "2.4.2"; + version = "2.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.4.2.tgz"; - sha512 = "2H49mB31cLYgZRikf0lM3c8L/0rVx5W0umTpE9kjBxCRoO1cnXDipU5Kf+/U73B1hb+g6YDUP9c4zUa/s4nX1A=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.5.6.tgz"; + sha512 = "ioZW6WxN0lYnVkUHxSXR+6DBeA1Jlah/r3mMwEhnCwp1um2pE9O9F+piQzbuQi1+q64ZDb7EzBnvmL/aqJdwdA=="; }; }; "snyk-tree-1.0.0" = { @@ -33989,13 +34043,13 @@ let sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; }; }; - "sourcemap-codec-1.4.4" = { + "sourcemap-codec-1.4.6" = { name = "sourcemap-codec"; packageName = "sourcemap-codec"; - version = "1.4.4"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz"; - sha512 = "CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg=="; + url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz"; + sha512 = "1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg=="; }; }; "space-separated-tokens-1.1.4" = { @@ -34088,13 +34142,13 @@ let sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; - "spdx-license-ids-3.0.4" = { + "spdx-license-ids-3.0.5" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz"; - sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; }; }; "spdy-1.32.5" = { @@ -34295,13 +34349,13 @@ let sha512 = "3x21LBIo/TDdUVw3IPnMYyh3T31+i6Xw2v0WftiuY0djPkq3dfwQV11+t3AY6LBtKsN1jS1bpxaDZcM/npF9dA=="; }; }; - "ssb-caps-1.0.1" = { + "ssb-caps-1.1.0" = { name = "ssb-caps"; packageName = "ssb-caps"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-caps/-/ssb-caps-1.0.1.tgz"; - sha512 = "ULJhokqDW4a9l7xXKPHwbhLQgRZmEjwdrrXMsPGoVYnvKb9sJuJ8ki9ilBZIs+NmYuAV+H1ffbB2Z4uioBtFYQ=="; + url = "https://registry.npmjs.org/ssb-caps/-/ssb-caps-1.1.0.tgz"; + sha512 = "qe3qpvchJ+gnH8M/ge4rpL+7eRbSmsEAzNwHkDdrW06OBcziQ6/KuAdmcR6joxCbNeoAXAZF+inkefgE16okXA=="; }; }; "ssb-client-4.7.7" = { @@ -34331,13 +34385,13 @@ let sha512 = "HipnCSEwj/Urjq4KIVVwf1bpaYgvz+4Wn2pi+d1403JMZ2pU+LzjW6Taf2td5XE1Nu/wgnunAIq5UUqPJ7mx6g=="; }; }; - "ssb-db-18.6.5" = { + "ssb-db-19.2.0" = { name = "ssb-db"; packageName = "ssb-db"; - version = "18.6.5"; + version = "19.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db/-/ssb-db-18.6.5.tgz"; - sha512 = "/4nFP7yj1JD5jrwX9bHG2nipBefl++xXXbNWD14eL+Ohs3X8kdmJeBKnHgiIF7Je4HQOI31OmEIdyyLKum5niQ=="; + url = "https://registry.npmjs.org/ssb-db/-/ssb-db-19.2.0.tgz"; + sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; "ssb-ebt-5.6.7" = { @@ -34349,13 +34403,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-3.1.13" = { + "ssb-friends-4.1.4" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "3.1.13"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-3.1.13.tgz"; - sha512 = "VsQzyhOc4k8JmnWTvwlmfb/Xv+CQZ02W6WQaPFx2BqCXHwLF6nKNFNXDZBZSUaKp5JSVBMbe39UkNjpOig2BJw=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.1.4.tgz"; + sha512 = "rjQP2rLocqnUoiI+SSUehLQwMB4H5TKD13hfnweGVIgAWw4mylbl9bPOuXtTU23ubPkdbSNadlp3uivsCkWLxw=="; }; }; "ssb-git-0.5.0" = { @@ -34376,6 +34430,24 @@ let sha512 = "7GVq5Ael/get+3Ot5exLdRWU8psSQNv/SkyO0KUhjoc4VfTdz8XuN1K195LKiyL/7u31A50KmkG9U9twb+1rGQ=="; }; }; + "ssb-gossip-1.1.0" = { + name = "ssb-gossip"; + packageName = "ssb-gossip"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-gossip/-/ssb-gossip-1.1.0.tgz"; + sha512 = "z4DBUtGJ+/k6z67EjavmPYAKz9BLF7zWcSDwUwLKZZT3AJp/5J6iPxHkilz2UfJ9LdGT4gF5CUe2xyIt1QFguA=="; + }; + }; + "ssb-invite-2.1.3" = { + name = "ssb-invite"; + packageName = "ssb-invite"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-invite/-/ssb-invite-2.1.3.tgz"; + sha512 = "hHLsmlTqk6ecxpWlHiwpFNwXDfMY8gO6OdXrU2lkoqLStPrriPgzlCJnfZA06Gdi2ZL5Az4+M2fyWvnza9x/kg=="; + }; + }; "ssb-issues-1.0.0" = { name = "ssb-issues"; packageName = "ssb-issues"; @@ -34403,6 +34475,24 @@ let sha512 = "7b1PGn9Pmaf5FfW0xDNc+4w2uOR7JwIJSsbKA/DDP0ejMzBlc9H38iVaMrf4927X5Cdn73o82D6cv8vXGqC4AQ=="; }; }; + "ssb-local-1.0.0" = { + name = "ssb-local"; + packageName = "ssb-local"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-local/-/ssb-local-1.0.0.tgz"; + sha512 = "aIkz+tDsAQFLbcN5d9itipHG71EG62UdIwojz78BQBxD7kGTwMezZofkMplURp9/njwdqMiqxYEUMvOh8Emh/w=="; + }; + }; + "ssb-logging-1.0.0" = { + name = "ssb-logging"; + packageName = "ssb-logging"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-logging/-/ssb-logging-1.0.0.tgz"; + sha512 = "6apTG47+VgLAD3MYkpRTbO27DMDh0YLJIvWfcJUEo5FdrjnLsqDl1kkzQ4B5MbH08z5Vklx5907t4by9rhlROQ=="; + }; + }; "ssb-marked-0.5.4" = { name = "ssb-marked"; packageName = "ssb-marked"; @@ -34421,6 +34511,15 @@ let sha1 = "8171472058673e4e76ec187c40c88c1e484bc544"; }; }; + "ssb-master-1.0.3" = { + name = "ssb-master"; + packageName = "ssb-master"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-master/-/ssb-master-1.0.3.tgz"; + sha512 = "N1Cxm9WscGD9VEZrWbF2amyQai2U2g9gtq57W5zTqbhlQTLUUvl84U9A6fg6GPkECnUXadulnTw+mMYVkLLHjQ=="; + }; + }; "ssb-mentions-0.1.2" = { name = "ssb-mentions"; packageName = "ssb-mentions"; @@ -34448,6 +34547,42 @@ let sha1 = "c681da5cd70c574c922dca4f03c521538135c243"; }; }; + "ssb-no-auth-1.0.0" = { + name = "ssb-no-auth"; + packageName = "ssb-no-auth"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-no-auth/-/ssb-no-auth-1.0.0.tgz"; + sha512 = "+o9WnY566shLyiJp6l21+SHZfgv40SEr35PtoF3uuFYI24vFhgcfv77pXvWpDINVyX2uQ152o2eQHg1amlp6lQ=="; + }; + }; + "ssb-onion-1.0.0" = { + name = "ssb-onion"; + packageName = "ssb-onion"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-onion/-/ssb-onion-1.0.0.tgz"; + sha512 = "iRXjeI0sbRbgMwaKg+poqhHSH7GvUVgJ+8ysi8q7Hjj4wHkczLGAOyVjnyhjF+ErPDFn9kXN+46joneKqSgEDg=="; + }; + }; + "ssb-ooo-1.3.1" = { + name = "ssb-ooo"; + packageName = "ssb-ooo"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-ooo/-/ssb-ooo-1.3.1.tgz"; + sha512 = "Ztx1qSHCIS4lcLwynSG8XKhzCZ1ejsUi5UAHBG+Hzkf91sqA38q5pnkLW/VVrtBz6yM5xv1AqYcr3KB8WWBXnQ=="; + }; + }; + "ssb-plugins-1.0.0" = { + name = "ssb-plugins"; + packageName = "ssb-plugins"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-plugins/-/ssb-plugins-1.0.0.tgz"; + sha512 = "eM8vid+K8MhwZwzk/CDUhSNhUoS6wYgq9clJrrKaP0/Otdd3zZzcBQw54Xvm0olMcOgpTSlY3m2rT4iqjZPIBw=="; + }; + }; "ssb-pull-requests-1.0.0" = { name = "ssb-pull-requests"; packageName = "ssb-pull-requests"; @@ -34457,13 +34592,13 @@ let sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118"; }; }; - "ssb-query-2.4.2" = { + "ssb-query-2.4.3" = { name = "ssb-query"; packageName = "ssb-query"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.4.2.tgz"; - sha512 = "w1iQ6DAyY7tvB31WjNRY05+QN9JCa0pZZL287HPpI+/WZQAsNOHc96mSSXH5KRyqm+dp/W/Me/For5kvItoSCA=="; + url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.4.3.tgz"; + sha512 = "Ktuk6Bl3s70gueDH7FBXzI8KHsf+h+n82J6Id33NTwP80u5iSDV5vXK2f7/He/cmP3uUVUI5ogJda7ShmrDIug=="; }; }; "ssb-ref-2.13.9" = { @@ -34475,6 +34610,24 @@ let sha512 = "TfatNqLvoP+eW/pMIbCmNcaoDq4R2k8jCtWkwDKx4AtluN/LwtyP931d5Mh+2gmzA04W7kxkr6f5ENGgdadMYg=="; }; }; + "ssb-replicate-1.3.0" = { + name = "ssb-replicate"; + packageName = "ssb-replicate"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-replicate/-/ssb-replicate-1.3.0.tgz"; + sha512 = "FLizJ+eHtGrySb61v3asIKpZkje77a6Cl7ZotUjD3YjNUOC7y+HN0AWaupbiiFiQXDGrIZ0ti0Mr8bHkMOJurQ=="; + }; + }; + "ssb-unix-socket-1.0.0" = { + name = "ssb-unix-socket"; + packageName = "ssb-unix-socket"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-unix-socket/-/ssb-unix-socket-1.0.0.tgz"; + sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; + }; + }; "ssb-validate-4.0.4" = { name = "ssb-validate"; packageName = "ssb-validate"; @@ -34484,13 +34637,13 @@ let sha512 = "MojZCR1qgZHdO4pnh4Loiqxj7fxP3w+MrA/4smXoKD46ReEnOjt/8Vm2sq3qpqPmUBU2GbEoDlgw7OKy0mWJBw=="; }; }; - "ssb-ws-5.1.1" = { + "ssb-ws-6.2.3" = { name = "ssb-ws"; packageName = "ssb-ws"; - version = "5.1.1"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ws/-/ssb-ws-5.1.1.tgz"; - sha512 = "Wbttwlr+wVqcoxGsn+WoiBbSI9UMqgL/DZU6Pjm/KQ61LO7jaxV4hGw3+H4uRBtgtOE4pidvHeCk7jUuoXWZfQ=="; + url = "https://registry.npmjs.org/ssb-ws/-/ssb-ws-6.2.3.tgz"; + sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; "ssh-config-1.1.6" = { @@ -34907,13 +35060,13 @@ let sha512 = "4Wi2v47HMkNdRWrlFJNlIsrhV6z6nCyVKVAIiq14MAnc7wILEAINmn96IiPWTcXzT8y2S6yfBoX++MUxqiovag=="; }; }; - "streamroller-1.0.5" = { + "streamroller-1.0.6" = { name = "streamroller"; packageName = "streamroller"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-1.0.5.tgz"; - sha512 = "iGVaMcyF5PcUY0cPbW3xFQUXnr9O4RZXNBBjhuLZgrjLO4XCLLGfx4T2sGqygSeylUjwgWRsnNbT9aV0Zb8AYw=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz"; + sha512 = "3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg=="; }; }; "streamsearch-0.1.2" = { @@ -34970,13 +35123,13 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; - "string-kit-0.9.7" = { + "string-kit-0.9.9" = { name = "string-kit"; packageName = "string-kit"; - version = "0.9.7"; + version = "0.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/string-kit/-/string-kit-0.9.7.tgz"; - sha512 = "SD/417OxqGuZanf7GvbDo7P7SjM0sM7v7BWTbDvy8WECb1/KMMryzSeBa764DqW4zCfP3BQTxOrK6FjWttlFew=="; + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.9.9.tgz"; + sha512 = "YwLqI6rV7reNnUZA/xTwEhIsLGiziOO5KbJUQzLiolamQD/iplTOIjtKdRblCZORQSzrFvldULK7LE/q+VG4gw=="; }; }; "string-length-2.0.0" = { @@ -36042,13 +36195,13 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "terminal-kit-1.28.2" = { + "terminal-kit-1.28.7" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.28.2"; + version = "1.28.7"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.28.2.tgz"; - sha512 = "j5ve5LRRM2c1sF4qpYvKwtKTS6kxQWZD1cI7r0S0hQkjsSHs3nE4Um5Ig+i15ikVdfgY+vXfJmfhgWmyY49D5Q=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.28.7.tgz"; + sha512 = "ouEiquaNQyiwvS2WBMji17rFZAzEr+0L0N7TkloeywAb04sJ7NSFo8af7qSVJj+9rqhs9WBlO3AjD41+FGMoPg=="; }; }; "terser-3.17.0" = { @@ -36060,13 +36213,13 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.0.2" = { + "terser-4.1.2" = { name = "terser"; packageName = "terser"; - version = "4.0.2"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.0.2.tgz"; - sha512 = "IWLuJqTvx97KP3uTYkFVn93cXO+EtlzJu8TdJylq+H0VBDlPMIfQA9MBS5Vc5t3xTEUG1q0hIfHMpAP2R+gWTw=="; + url = "https://registry.npmjs.org/terser/-/terser-4.1.2.tgz"; + sha512 = "jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw=="; }; }; "terser-webpack-plugin-1.3.0" = { @@ -37356,13 +37509,13 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.5.2" = { + "typescript-3.5.3" = { name = "typescript"; packageName = "typescript"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz"; - sha512 = "7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz"; + sha512 = "ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -37599,13 +37752,13 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; - "uncss-0.16.2" = { + "uncss-0.17.0" = { name = "uncss"; packageName = "uncss"; - version = "0.16.2"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/uncss/-/uncss-0.16.2.tgz"; - sha1 = "3b2269c59012da7c66cbe98fbedddeef94f0649c"; + url = "https://registry.npmjs.org/uncss/-/uncss-0.17.0.tgz"; + sha512 = "ZFFHCpAUEC0kJkuJelLYjrr0/bHBlgrN8XRDQN+wt9VVqap8Avj4fxt2WDJJZi0aSzYVaWCQoX19ZM+JZ5lqnw=="; }; }; "undeclared-identifiers-1.1.3" = { @@ -38058,13 +38211,13 @@ let sha512 = "gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw=="; }; }; - "universal-user-agent-2.1.0" = { + "universal-user-agent-3.0.0" = { name = "universal-user-agent"; packageName = "universal-user-agent"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-2.1.0.tgz"; - sha512 = "8itiX7G05Tu3mGDTdNY2fB4KJ8MgZLS54RdG6PkkfwMAavrXu1mV/lls/GABx9O3Rw4PnTtasxrvbMQoBYY92Q=="; + url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-3.0.0.tgz"; + sha512 = "T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA=="; }; }; "universalify-0.1.2" = { @@ -38247,6 +38400,15 @@ let sha512 = "6Xe3oF2bvuoj4YECUc52yxVs94yWrxwqHbzyveDktTS1WhnlTRpNcQMxUshcB7nRVGi1jEXiqL5cW1S5WSyzKg=="; }; }; + "update-notifier-3.0.1" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-3.0.1.tgz"; + sha512 = "grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ=="; + }; + }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -38355,6 +38517,15 @@ let sha1 = "4d3340e807d3773bda9991f8305acdcc2a665d2a"; }; }; + "url-join-4.0.1" = { + name = "url-join"; + packageName = "url-join"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz"; + sha512 = "jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="; + }; + }; "url-parse-1.4.3" = { name = "url-parse"; packageName = "url-parse"; @@ -38652,13 +38823,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.1.3" = { + "utp-native-2.1.4" = { name = "utp-native"; packageName = "utp-native"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.3.tgz"; - sha512 = "lXjmAJxlaz58GDFlEqKYkNzO5rqttA+/TVHl7UUAs8Saj1QJq/3D4IckuVpsmCsjjZod5N7sE8QMUCYScVHDpg=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.4.tgz"; + sha512 = "FYjr3bHBnJpw8yD0CmFCh5USyDgr6VtuncEIun100GqCUdgqnkAx9irSY3tA4UrzRH56qmiocP2fs1QjQ7ZDZA=="; }; }; "uuid-3.3.2" = { @@ -39444,6 +39615,15 @@ let sha512 = "GYsDsDWwKaGtnkW4nGUxr01wqIO2FB9/QHQTW1Gl5SUr5OyQvpnR90/D+Gq2cIxURX7aJ7+VyD+37Yx9eFwTgw=="; }; }; + "vue-jscodeshift-adapter-2.0.2" = { + name = "vue-jscodeshift-adapter"; + packageName = "vue-jscodeshift-adapter"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-jscodeshift-adapter/-/vue-jscodeshift-adapter-2.0.2.tgz"; + sha512 = "EnRKDgQXGHnNbHpHdTEqBfDMxRPFSUc/hlDNLd9ucgdfpJ3S6o/V6og+CfNYgGPO2GKD6AQOsd+lltRuoM/SVA=="; + }; + }; "vue-onsenui-helper-json-1.0.2" = { name = "vue-onsenui-helper-json"; packageName = "vue-onsenui-helper-json"; @@ -39453,6 +39633,24 @@ let sha512 = "ikg8ruE17tIXF9mrVvKoOR3oyM9nk0TcmUHyeBWod5ILEH9DRN0+seX4gwsSbjdxMYlIIvmnCFPQeMdlcJqPJQ=="; }; }; + "vue-sfc-descriptor-to-string-1.0.0" = { + name = "vue-sfc-descriptor-to-string"; + packageName = "vue-sfc-descriptor-to-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-sfc-descriptor-to-string/-/vue-sfc-descriptor-to-string-1.0.0.tgz"; + sha512 = "VYNMsrIPZQZau5Gk8IVtgonN1quOznP9/pLIF5m2c4R30KCDDe3NwthrsM7lSUY2K4lezcb8j3Wu8cQhBuZEMQ=="; + }; + }; + "vue-template-compiler-2.6.10" = { + name = "vue-template-compiler"; + packageName = "vue-template-compiler"; + version = "2.6.10"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz"; + sha512 = "jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg=="; + }; + }; "vuetify-helper-json-1.0.0" = { name = "vuetify-helper-json"; packageName = "vuetify-helper-json"; @@ -39471,6 +39669,15 @@ let sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; }; }; + "w3c-xmlserializer-1.1.2" = { + name = "w3c-xmlserializer"; + packageName = "w3c-xmlserializer"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz"; + sha512 = "p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg=="; + }; + }; "walk-2.3.14" = { name = "walk"; packageName = "walk"; @@ -39552,13 +39759,13 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.35.2" = { + "webpack-4.35.3" = { name = "webpack"; packageName = "webpack"; - version = "4.35.2"; + version = "4.35.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.35.2.tgz"; - sha512 = "TZAmorNymV4q66gAM/h90cEjG+N3627Q2MnkSgKlX/z3DlNVKUtqy57lz1WmZU2+FUZwzM+qm7cGaO95PyrX5A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.35.3.tgz"; + sha512 = "xggQPwr9ILlXzz61lHzjvgoqGU08v5+Wnut19Uv3GaTtzN4xBTcwnobodrXE142EL1tOiS5WVEButooGzcQzTA=="; }; }; "webpack-cli-3.3.5" = { @@ -39615,13 +39822,13 @@ let sha512 = "EXy/zXb9kNHI07TIMz1oIUIrPZxQRA8aeJ5XYg5ihV8K4kD1DuA+FY6R96HfdIHzlSzS8HiISAfrm+vVQkZBug=="; }; }; - "webtorrent-0.104.0" = { + "webtorrent-0.105.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.104.0"; + version = "0.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.104.0.tgz"; - sha512 = "5/SXilp8xcs89Ep5TPjC/cF8I5F9sC8KlzhQQrO3i2OrWM88r43Hl8bcK/RT/6tn/BLf2SrOl7C3bYuUgTb90w=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.105.0.tgz"; + sha512 = "htk9dyFxBiOsz5UsbWZ5qlX0kdwkcOF9i3SD3F+QNX4GOzgjZt+eU3W6PRNPuxF3kt8VdIjhDCWpOHz3qqIlTg=="; }; }; "whatwg-encoding-1.0.5" = { @@ -40182,13 +40389,13 @@ let sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; - "ws-7.0.1" = { + "ws-7.1.0" = { name = "ws"; packageName = "ws"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.0.1.tgz"; - sha512 = "ILHfMbuqLJvnSgYXLgy4kMntroJpe8hT41dOVWM8bxRuw6TK4mgMp9VJUNsZTEc5Bh+Mbs0DJT4M0N+wBG9l9A=="; + url = "https://registry.npmjs.org/ws/-/ws-7.1.0.tgz"; + sha512 = "Swie2C4fs7CkwlHu1glMePLYJJsWjzhl1vm3ZaLplD0h7OMkZyZ6kLTB/OagiU923bZrPFXuDTeEqaEN4NWG4g=="; }; }; "wtf-8-1.0.0" = { @@ -40353,6 +40560,15 @@ let sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; }; + "xmlchars-2.1.1" = { + name = "xmlchars"; + packageName = "xmlchars"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz"; + sha512 = "7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w=="; + }; + }; "xmlcreate-2.0.1" = { name = "xmlcreate"; packageName = "xmlcreate"; @@ -40471,13 +40687,13 @@ let sha1 = "5cce7407baf642cba7becda568111c493f59665a"; }; }; - "xtend-4.0.1" = { + "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; "y18n-3.2.1" = { @@ -40891,22 +41107,23 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "8.0.6"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-8.0.6.tgz"; - sha512 = "COBpeoXyLt8FiOhsmoEnDfQcm0aTdUSUHsH3zNkVTcyxpRzZVspTDGzxhK0UsCpddXS/MMjJiXph6SJ1el3qaQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-8.1.1.tgz"; + sha512 = "7EXTjS7XXZyWhW4JMuGRRSLmdn8KSWK41xoAiod8P6csJkGgsmFGLs2QkZd/mvGnU9rOKaNkEjHPI9QO+iprxw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.800.6" - sources."@angular-devkit/core-8.0.6" - sources."@angular-devkit/schematics-8.0.6" - sources."@schematics/angular-8.0.6" - sources."@schematics/update-0.800.6" + sources."@angular-devkit/architect-0.801.1" + sources."@angular-devkit/core-8.1.1" + sources."@angular-devkit/schematics-8.1.1" + sources."@schematics/angular-8.1.1" + sources."@schematics/update-0.801.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" sources."ajv-6.10.0" + sources."ansi-colors-4.1.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -40927,7 +41144,7 @@ in sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" sources."color-convert-1.9.3" @@ -40941,6 +41158,7 @@ in sources."dashdash-1.14.1" sources."debug-4.1.1" sources."debuglog-1.0.1" + sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."dezalgo-1.0.3" sources."duplexify-3.7.1" @@ -40948,11 +41166,13 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."err-code-1.1.2" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" @@ -40965,6 +41185,7 @@ in sources."fs-minipass-1.2.6" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."genfun-5.0.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" @@ -40972,7 +41193,9 @@ in sources."graceful-fs-4.2.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" + sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-symbols-1.0.0" sources."hosted-git-info-2.7.1" sources."http-cache-semantics-3.8.1" (sources."http-proxy-agent-2.1.0" // { @@ -40982,7 +41205,7 @@ in ]; }) sources."http-signature-1.2.0" - (sources."https-proxy-agent-2.2.1" // { + (sources."https-proxy-agent-2.2.2" // { dependencies = [ sources."debug-3.2.6" ]; @@ -40995,10 +41218,14 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.3.1" + sources."inquirer-6.4.1" sources."ip-1.1.5" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.1.0" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-wsl-1.1.0" sources."isarray-1.0.0" @@ -41011,15 +41238,10 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lru-cache-5.1.1" - sources."magic-string-0.25.2" - (sources."make-fetch-happen-4.0.1" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) + sources."magic-string-0.25.3" + sources."make-fetch-happen-4.0.2" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-fn-1.2.0" @@ -41050,20 +41272,17 @@ in sources."semver-5.7.0" ]; }) - (sources."npm-registry-fetch-3.9.0" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) + sources."npm-registry-fetch-3.9.1" sources."oauth-sign-0.9.0" + sources."object-keys-1.1.1" + sources."object.getownpropertydescriptors-2.0.3" sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-6.2.0" + sources."open-6.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - (sources."pacote-9.5.0" // { + (sources."pacote-9.5.1" // { dependencies = [ sources."semver-5.7.0" ]; @@ -41076,7 +41295,6 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" sources."protoduck-5.0.1" - sources."pseudomap-1.0.2" sources."psl-1.2.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { @@ -41087,8 +41305,12 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-package-json-2.0.13" - sources."read-package-tree-5.2.2" - sources."readable-stream-2.3.6" + sources."read-package-tree-5.3.1" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."readdir-scoped-modules-1.1.0" sources."request-2.88.0" sources."resolve-1.11.1" @@ -41098,9 +41320,9 @@ in sources."run-async-2.3.0" sources."run-queue-1.0.3" sources."rxjs-6.4.0" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" - sources."semver-6.0.0" + sources."semver-6.2.0" (sources."semver-intersect-1.4.0" // { dependencies = [ sources."semver-5.7.0" @@ -41116,11 +41338,11 @@ in ]; }) sources."source-map-0.7.3" - sources."sourcemap-codec-1.4.4" + sources."sourcemap-codec-1.4.6" 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."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" sources."ssri-6.0.1" sources."stream-each-1.2.3" @@ -41130,7 +41352,11 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) (sources."strip-ansi-5.2.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -41160,13 +41386,14 @@ in }) sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" + sources."util-promisify-2.1.0" sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.0.3" ]; @@ -41229,14 +41456,14 @@ in sha512 = "rVvYFWwCmm65WdXxpkw/A9CIOuX2alccau2Pq97rkEweELN/jfj2hDOUMyheDdMQyywiecrbZG0VDbxr3US2Jw=="; }; dependencies = [ - sources."@types/node-12.0.10" + sources."@types/node-12.6.2" sources."agent-base-4.3.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."ast-types-0.13.2" sources."async-limiter-1.0.0" - sources."aws-sdk-2.486.0" + sources."aws-sdk-2.493.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.0" sources."bluebird-3.5.5" @@ -41266,7 +41493,7 @@ in sources."css-what-2.1.3" (sources."data-uri-to-buffer-2.0.1" // { dependencies = [ - sources."@types/node-8.10.49" + sources."@types/node-8.10.50" ]; }) sources."debug-4.1.1" @@ -41287,7 +41514,7 @@ in sources."esutils-2.0.2" sources."events-1.1.1" sources."extend-3.0.2" - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" (sources."extract-zip-1.6.7" // { dependencies = [ sources."debug-2.6.9" @@ -41317,7 +41544,7 @@ in sources."ms-2.0.0" ]; }) - (sources."https-proxy-agent-2.2.1" // { + (sources."https-proxy-agent-2.2.2" // { dependencies = [ sources."debug-3.2.6" ]; @@ -41327,14 +41554,14 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.4.1" + sources."inquirer-6.5.0" sources."ip-1.1.5" sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.1.0" sources."isarray-1.0.0" sources."jmespath-0.15.0" sources."levn-0.3.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lru-cache-4.1.5" sources."mime-2.4.4" sources."mimic-fn-1.2.0" @@ -41517,11 +41744,11 @@ in sources."acorn-5.7.3" (sources."acorn-globals-4.3.2" // { dependencies = [ - sources."acorn-6.1.1" + sources."acorn-6.2.0" ]; }) - sources."acorn-walk-6.1.1" - sources."ajv-6.10.0" + sources."acorn-walk-6.2.0" + sources."ajv-6.10.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -41541,13 +41768,13 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" sources."caseless-0.12.0" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" 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."cssom-0.3.8" sources."cssstyle-1.3.0" sources."dashdash-1.14.1" (sources."data-urls-1.1.0" // { @@ -41603,7 +41830,7 @@ in sources."jsprim-1.4.1" sources."left-pad-1.3.0" sources."levn-0.3.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.sortby-4.7.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" @@ -41639,11 +41866,15 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) 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."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.7.0" @@ -41655,7 +41886,11 @@ in sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" sources."string-width-1.0.2" - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."symbol-tree-3.2.4" @@ -41699,7 +41934,7 @@ in sources."wrappy-1.0.2" sources."ws-5.2.2" sources."xml-name-validator-3.0.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -41841,7 +42076,7 @@ in 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."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -41867,17 +42102,17 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.2.3"; + version = "16.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.2.3.tgz"; - sha512 = "zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ=="; + url = "https://registry.npmjs.org/browserify/-/browserify-16.3.0.tgz"; + sha512 = "BWaaD7alyGZVEBBwSTYx4iJF5DswIGzK17o8ai9w4iKRbYpk3EOiprRHMRRA8DCZFmFeOdx7A385w2XdFvxWmg=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-6.1.1" + sources."acorn-6.2.0" sources."acorn-dynamic-import-4.0.0" sources."acorn-node-1.7.0" - sources."acorn-walk-6.1.1" + sources."acorn-walk-6.2.0" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" @@ -41990,12 +42225,13 @@ in sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { dependencies = [ + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."resolve-1.11.1" sources."ripemd160-2.0.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" @@ -42005,7 +42241,11 @@ in sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" sources."stream-splicer-2.0.1" - sources."string_decoder-1.2.0" + (sources."string_decoder-1.2.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" @@ -42033,7 +42273,7 @@ in sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.0" sources."wrappy-1.0.2" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -42056,7 +42296,7 @@ in dependencies = [ sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -42117,6 +42357,7 @@ in (sources."concat-stream-2.0.0" // { dependencies = [ sources."readable-stream-3.4.0" + sources."safe-buffer-5.1.2" sources."string_decoder-1.2.0" ]; }) @@ -42340,7 +42581,7 @@ in sources."run-series-1.1.8" sources."rusha-0.8.13" sources."rx-2.5.3" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.7.0" @@ -42351,6 +42592,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -42359,16 +42601,20 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" - sources."safe-buffer-5.0.1" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" - sources."ws-2.3.1" + (sources."ws-2.3.1" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) ]; }) sources."single-line-log-0.4.1" 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."spdx-license-ids-3.0.5" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" @@ -42429,7 +42675,7 @@ in sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" sources."xspfr-0.3.1" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -42564,7 +42810,7 @@ in sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."kuler-1.0.1" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."logform-2.1.2" sources."lynx-0.2.0" sources."mersenne-0.0.4" @@ -42614,10 +42860,10 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.0.10" + sources."@types/node-12.6.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -42791,7 +43037,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -42871,7 +43117,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."init-package-json-1.10.3" - (sources."inquirer-6.4.1" // { + (sources."inquirer-6.5.0" // { dependencies = [ sources."mute-stream-0.0.7" ]; @@ -42924,7 +43170,7 @@ in sources."kind-of-6.0.2" sources."latest-version-3.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.debounce-4.0.8" sources."loud-rejection-2.1.0" sources."lowercase-keys-1.0.1" @@ -43115,7 +43361,7 @@ in 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."spdx-license-ids-3.0.5" sources."split-string-3.1.0" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { @@ -43246,7 +43492,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.0.10" + sources."@types/node-12.6.2" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -43455,7 +43701,7 @@ in sources."resolve-1.11.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."semver-5.7.0" (sources."set-value-2.0.1" // { @@ -43499,7 +43745,7 @@ in 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."spdx-license-ids-3.0.5" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -43574,7 +43820,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-12.0.10" + sources."@types/node-12.6.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -43613,7 +43859,7 @@ in sources."extend-3.0.2" sources."external-editor-2.2.0" sources."figures-2.0.0" - sources."form-data-2.4.0" + sources."form-data-2.5.0" sources."formidable-1.2.1" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" @@ -43629,7 +43875,7 @@ in sources."is-promise-2.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" sources."lodash._baseuniq-4.6.0" @@ -43739,7 +43985,7 @@ in sources."duplexer2-0.0.2" sources."envinfo-7.1.0" sources."escape-string-regexp-1.0.5" - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" sources."figures-2.0.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" @@ -43758,7 +44004,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."jsonfile-4.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -43817,7 +44063,7 @@ in sources."validate-npm-package-name-3.0.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -43908,7 +44154,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -44153,9 +44399,9 @@ in }) sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.26.0" // { + (sources."hypercore-7.5.0" // { dependencies = [ - sources."process-nextick-args-1.0.7" + sources."codecs-2.0.0" sources."unordered-set-2.0.1" ]; }) @@ -44165,7 +44411,7 @@ in sources."varint-5.0.0" ]; }) - sources."hyperdrive-9.14.5" + sources."hyperdrive-9.15.0" sources."hyperdrive-http-4.4.0" (sources."hyperdrive-network-speed-2.1.0" // { dependencies = [ @@ -44341,7 +44587,11 @@ in sources."range-parser-1.2.1" sources."rc-1.2.8" sources."read-1.0.7" - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."recursive-watch-1.1.4" sources."regex-not-1.0.2" sources."registry-auth-token-3.4.0" @@ -44356,7 +44606,7 @@ in sources."revalidator-0.1.8" sources."rimraf-2.6.3" sources."rusha-0.8.13" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."semver-5.7.0" @@ -44450,7 +44700,11 @@ in sources."stream-shift-1.0.0" sources."string-width-2.1.1" sources."string.prototype.trim-1.1.2" - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -44515,7 +44769,7 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.1.3" // { + (sources."utp-native-2.1.4" // { dependencies = [ sources."readable-stream-3.4.0" sources."unordered-set-2.0.1" @@ -44538,7 +44792,7 @@ in sources."xdg-basedir-3.0.0" sources."xhr-2.5.0" sources."xsalsa20-1.0.2" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -44674,7 +44928,7 @@ in sources."readable-stream-1.0.27-1" sources."redis-0.12.1" sources."reduce-component-1.0.1" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."send-0.11.1" sources."serve-static-1.8.1" sources."split-0.3.3" @@ -44720,19 +44974,19 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.2.2"; + version = "6.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.2.2.tgz"; - sha512 = "wn6Bu6mHqAWB+TxCGSF95B2/kPIsYaH67KShonesHntjxdQBSIYqbpmDsiNQKCvjbqklIwQb4u6Al5rWwCl/JQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.3.3.tgz"; + sha512 = "Ie0l2UPxw5owgBMT5zhYSZCS4cEXmIqcFiyLoPgArYgb2MNPPYLGFFBq7v8mvKzYAnl8zZcpGoXD4yzNM+lGxA=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.2" sources."asynckit-0.4.0" - sources."aws-sdk-2.486.0" + sources."aws-sdk-2.493.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -44776,10 +45030,10 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.find-4.6.0" sources."lodash.max-4.0.1" - sources."lodash.merge-4.6.1" + sources."lodash.merge-4.6.2" sources."lodash.padstart-4.6.1" sources."lodash.repeat-4.1.0" sources."lossless-json-1.0.3" @@ -44794,7 +45048,11 @@ in sources."punycode-1.3.2" sources."qs-6.5.2" sources."querystring-0.2.0" - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."request-2.88.0" sources."requestretry-4.0.0" sources."s3-stream-upload-2.0.2" @@ -44804,7 +45062,7 @@ in sources."minimist-1.2.0" ]; }) - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."socks5-client-1.2.6" @@ -44812,7 +45070,11 @@ in sources."socks5-https-client-1.2.1" sources."sprintf-js-1.1.0" sources."sshpk-1.16.1" - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."through-2.3.8" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -44856,7 +45118,7 @@ in dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."anymatch-3.0.2" + sources."anymatch-3.0.3" sources."async-each-1.0.3" sources."async-limiter-1.0.0" sources."binary-extensions-2.0.0" @@ -44947,7 +45209,7 @@ in sources."pseudomap-1.0.2" sources."querystringify-2.1.1" sources."range-parser-1.2.1" - sources."readdirp-3.0.2" + sources."readdirp-3.1.1" sources."requires-port-1.0.0" sources."semver-5.7.0" sources."send-0.16.2" @@ -45050,7 +45312,11 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."conf-1.4.0" - sources."convert-source-map-1.6.0" + (sources."convert-source-map-1.6.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."core-js-2.6.9" sources."cross-spawn-5.1.0" sources."currently-unhandled-0.4.1" @@ -45109,7 +45375,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.debounce-4.0.8" sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" @@ -45182,7 +45448,7 @@ in sources."resolve-1.11.1" sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."semver-5.7.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -45194,7 +45460,7 @@ in 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."spdx-license-ids-3.0.5" (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" @@ -45246,10 +45512,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/highlight-7.0.0" - sources."acorn-6.1.1" + sources."@babel/highlight-7.5.0" + sources."acorn-6.2.0" sources."acorn-jsx-5.0.1" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -45280,7 +45546,7 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -45304,7 +45570,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-6.4.1" // { + (sources."inquirer-6.5.0" // { dependencies = [ sources."strip-ansi-5.2.0" ]; @@ -45319,7 +45585,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -45397,10 +45663,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/highlight-7.0.0" - sources."acorn-6.1.1" + sources."@babel/highlight-7.5.0" + sources."acorn-6.2.0" sources."acorn-jsx-5.0.1" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -45433,7 +45699,7 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -45457,7 +45723,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-6.4.1" // { + (sources."inquirer-6.5.0" // { dependencies = [ sources."strip-ansi-5.2.0" ]; @@ -45472,7 +45738,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -45569,7 +45835,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -45713,7 +45979,7 @@ in 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."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -45794,7 +46060,7 @@ in sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" sources."execa-0.10.0" - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" sources."figures-2.0.0" sources."find-up-2.1.0" sources."fkill-5.3.0" @@ -45808,7 +46074,7 @@ in sources."iconv-lite-0.4.24" sources."indent-string-3.2.0" sources."inherits-2.0.4" - (sources."inquirer-6.4.1" // { + (sources."inquirer-6.5.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."strip-ansi-5.2.0" @@ -45828,7 +46094,7 @@ in sources."json-stringify-safe-5.0.1" sources."load-json-file-4.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."loud-rejection-1.6.0" sources."lru-cache-4.1.5" sources."map-obj-2.0.0" @@ -45897,7 +46163,7 @@ in 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."spdx-license-ids-3.0.5" sources."split2-2.2.0" sources."string-width-2.1.1" sources."string_decoder-1.1.1" @@ -45924,7 +46190,7 @@ in sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."yallist-2.1.2" sources."yargs-parser-10.1.0" ]; @@ -46380,12 +46646,12 @@ in dependencies = [ sources."async-2.6.2" sources."debug-4.1.1" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.1.2" - sources."simple-git-1.117.0" + sources."simple-git-1.120.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -46522,7 +46788,7 @@ in sources."relative-url-1.0.2" sources."remove-markdown-0.1.0" sources."ret-0.1.15" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."secret-handshake-1.1.20" sources."semver-5.7.0" sources."separator-escape-0.0.0" @@ -46540,7 +46806,7 @@ in sources."sodium-native-2.4.2" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" - sources."ssb-caps-1.0.1" + sources."ssb-caps-1.1.0" (sources."ssb-client-4.7.7" // { dependencies = [ sources."ssb-config-3.3.1" @@ -46576,7 +46842,7 @@ in sources."tweetnacl-auth-0.3.1" sources."ultron-1.0.2" sources."ws-1.1.5" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -46609,10 +46875,10 @@ in graphql-cli = nodeEnv.buildNodePackage { name = "graphql-cli"; packageName = "graphql-cli"; - version = "3.0.11"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-3.0.11.tgz"; - sha512 = "VK2lehlwL/PAA7aiUIouomV4ITIjjBA/Xxwr0AOvpAS0nE2q0STKBsGZ/ScMeS7Qv0bCyxKWXJ1dti8Hrfzd+Q=="; + url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-3.0.12.tgz"; + sha512 = "+6MxnbXHaAcpF574KTmpkXJmwXQmtP8YVaTY3IKBgqHzL5PMmTrrFgbLUbwDVJDZ5sSr/kMZgZFMiAczMYtykw=="; }; dependencies = [ sources."@babel/generator-7.0.0-beta.38" @@ -46629,7 +46895,7 @@ in }) sources."accepts-1.3.7" sources."agent-base-4.3.0" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -46671,6 +46937,9 @@ in sources."buffer-from-1.1.1" sources."bytes-3.1.0" sources."call-me-maybe-1.0.1" + sources."caller-callsite-2.0.0" + sources."caller-path-2.0.0" + sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" @@ -46678,7 +46947,7 @@ in sources."chalk-2.4.2" sources."change-case-3.1.0" sources."chardet-0.7.0" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" @@ -46703,13 +46972,17 @@ in sources."concat-map-0.0.1" sources."configstore-3.1.2" sources."constant-case-2.0.0" - sources."content-disposition-0.5.3" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-js-2.6.9" sources."core-util-is-1.0.2" - sources."cosmiconfig-4.0.0" + sources."cosmiconfig-5.2.1" sources."create-error-class-3.0.2" sources."creato-1.0.5" (sources."cross-fetch-2.2.2" // { @@ -46767,6 +47040,7 @@ in (sources."express-4.17.1" // { dependencies = [ sources."qs-6.7.0" + sources."safe-buffer-5.1.2" ]; }) (sources."express-request-proxy-2.2.2" // { @@ -46777,7 +47051,7 @@ in ]; }) sources."extend-3.0.2" - (sources."external-editor-3.0.3" // { + (sources."external-editor-3.1.0" // { dependencies = [ sources."tmp-0.0.33" ]; @@ -46818,7 +47092,7 @@ in sources."ms-2.1.2" ]; }) - sources."graphql-14.4.1" + sources."graphql-14.4.2" (sources."graphql-cli-prepare-1.4.19" // { dependencies = [ sources."chalk-2.3.1" @@ -46836,7 +47110,7 @@ in sources."graphql-playground-html-1.6.12" sources."graphql-playground-middleware-express-1.7.12" sources."graphql-request-1.8.2" - sources."graphql-schema-linter-0.2.0" + sources."graphql-schema-linter-0.2.1" sources."graphql-static-binding-0.9.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -46855,13 +47129,18 @@ in ]; }) sources."http-signature-1.2.0" - (sources."https-proxy-agent-2.2.1" // { + (sources."https-proxy-agent-2.2.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" ]; }) sources."iconv-lite-0.4.24" + (sources."import-fresh-2.0.0" // { + dependencies = [ + sources."resolve-from-3.0.0" + ]; + }) sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflected-2.0.4" @@ -46932,7 +47211,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" @@ -47061,6 +47340,7 @@ in (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" + sources."safe-buffer-5.1.2" ]; }) sources."regenerator-runtime-0.11.1" @@ -47071,7 +47351,6 @@ in sources."request-promise-4.2.4" sources."request-promise-core-1.1.2" sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."resolve-1.11.1" sources."resolve-dir-1.0.1" @@ -47080,7 +47359,7 @@ in sources."rimraf-2.6.3" sources."run-async-2.3.0" sources."rxjs-6.5.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."scuid-1.1.0" sources."semver-5.7.0" @@ -47109,7 +47388,7 @@ in 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."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."statuses-1.5.0" @@ -47119,7 +47398,11 @@ in sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-4.0.0" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" @@ -47185,7 +47468,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."y18n-3.2.1" sources."yallist-2.1.2" sources."yaml-ast-parser-0.0.40" @@ -47854,7 +48137,7 @@ in 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."spdx-license-ids-3.0.5" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -47924,7 +48207,7 @@ in sources."which-module-1.0.0" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."y18n-3.2.1" sources."yargs-7.1.0" sources."yargs-parser-5.0.0" @@ -48218,7 +48501,7 @@ in 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."spdx-license-ids-3.0.5" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -48288,7 +48571,7 @@ in sha512 = "uXuRyVhQa0HlNmZg5LJ1BRJvRq5f7IJL/34tItHhZr9re15pwaqAuLUAIcqtwd1bLUCE++7HVPtR+NSReFW0iA=="; }; dependencies = [ - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" @@ -48355,7 +48638,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" @@ -48371,7 +48654,7 @@ in sources."qs-6.5.2" sources."readable-stream-1.1.14" sources."request-2.88.0" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."shelljs-0.3.0" sources."sshpk-1.16.1" @@ -48463,7 +48746,7 @@ in sources."minimist-0.0.10" ]; }) - (sources."portfinder-1.0.20" // { + (sources."portfinder-1.0.21" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -48544,13 +48827,13 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-5.2.1.tgz"; - sha512 = "BEsJ5jraMgeqGiGjBhw4hJ5IK135wS4i3zRDda7OtMDyJKb77LHF3P8jyLgH1Yf+/yt7O8Qb5OE0/6bTRiZJaA=="; + url = "https://registry.npmjs.org/ionic/-/ionic-5.2.2.tgz"; + sha512 = "sTPHEGOp0Od+b3d6vfRshjQm24xwOCK0ZNNfVCobUhFpi1/dosfGK8RRQfWKbWSIW3dLL9QwNgcoW+GymDtcCw=="; }; dependencies = [ - sources."@ionic/cli-framework-2.1.1" + sources."@ionic/cli-framework-2.1.2" sources."@ionic/discover-2.0.2" sources."@ionic/utils-array-1.0.1" sources."@ionic/utils-fs-2.0.3" @@ -48560,7 +48843,7 @@ in sources."@ionic/utils-stream-2.0.0" sources."@ionic/utils-subprocess-1.0.3" sources."@ionic/utils-terminal-1.0.1" - sources."@types/node-8.10.49" + sources."@types/node-8.10.50" sources."agent-base-4.3.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -48574,7 +48857,7 @@ in sources."bytes-3.1.0" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" sources."co-4.6.0" @@ -48615,11 +48898,11 @@ in sources."esutils-2.0.2" sources."execa-1.0.0" sources."extend-3.0.2" - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" - sources."form-data-2.4.0" + sources."form-data-2.5.0" sources."formidable-1.2.1" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.6" @@ -48643,7 +48926,7 @@ in sources."ms-2.0.0" ]; }) - (sources."https-proxy-agent-2.2.1" // { + (sources."https-proxy-agent-2.2.2" // { dependencies = [ sources."debug-3.2.6" ]; @@ -48652,7 +48935,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-6.4.1" // { + (sources."inquirer-6.5.0" // { dependencies = [ (sources."string-width-2.1.1" // { dependencies = [ @@ -48677,7 +48960,7 @@ in ]; }) sources."levn-0.3.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" sources."lodash._bindcallback-3.0.1" @@ -48830,7 +49113,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.0" - sources."ws-7.0.1" + sources."ws-7.1.0" sources."xregexp-2.0.0" sources."yallist-2.1.2" ]; @@ -49030,7 +49313,7 @@ in sources."opentracing-0.13.0" ]; }) - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."long-2.4.0" sources."minimatch-3.0.4" sources."mz-2.7.0" @@ -49060,7 +49343,7 @@ in sources."vscode-uri-1.0.8" sources."wrappy-1.0.2" sources."xorshift-0.2.1" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -49087,11 +49370,11 @@ in sources."acorn-5.7.3" (sources."acorn-globals-4.3.2" // { dependencies = [ - sources."acorn-6.1.1" + sources."acorn-6.2.0" ]; }) - sources."acorn-walk-6.1.1" - sources."ajv-6.10.0" + sources."acorn-walk-6.2.0" + sources."ajv-6.10.1" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" @@ -49132,7 +49415,7 @@ in sources."caseless-0.12.0" sources."chalk-2.4.2" sources."charenc-0.0.2" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."clean-css-4.2.1" sources."cliss-0.0.2" sources."code-point-at-1.1.0" @@ -49149,7 +49432,7 @@ in sources."core-util-is-1.0.2" sources."crypt-0.0.2" sources."css-2.2.4" - sources."cssom-0.3.6" + sources."cssom-0.3.8" sources."cssstyle-1.3.0" sources."cwise-compiler-1.1.3" sources."dashdash-1.14.1" @@ -49202,7 +49485,7 @@ in sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" sources."forever-agent-0.6.1" - sources."form-data-2.4.0" + sources."form-data-2.5.0" sources."format-0.2.2" sources."fs-constants-1.0.0" sources."fs-copy-file-sync-1.1.1" @@ -49303,10 +49586,10 @@ in sources."left-pad-1.3.0" sources."levenshtein-1.0.5" sources."levn-0.3.0" - sources."linkify-it-2.1.0" + sources."linkify-it-2.2.0" sources."locate-path-2.0.0" - sources."lodash-4.17.11" - sources."lodash-es-4.17.11" + sources."lodash-4.17.14" + sources."lodash-es-4.17.14" sources."lodash.padend-4.6.1" sources."lodash.sortby-4.7.0" sources."lodash.toarray-4.4.0" @@ -49405,7 +49688,11 @@ in ]; }) sources."read-chunk-2.1.0" - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."reduce-flatten-1.0.1" sources."redux-3.7.2" sources."relateurl-0.2.7" @@ -49420,7 +49707,7 @@ in sources."resolve-url-0.2.1" sources."retry-0.10.1" sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-6.2.0" @@ -49447,7 +49734,7 @@ in sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-kit-0.9.7" + sources."string-kit-0.9.9" sources."string-padding-1.0.2" sources."string-to-stream-1.1.1" (sources."string-width-1.0.2" // { @@ -49455,7 +49742,11 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) (sources."stringify-parameters-0.0.4" // { dependencies = [ sources."magicli-0.0.5" @@ -49485,7 +49776,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.28.2" + sources."terminal-kit-1.28.7" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -49544,7 +49835,7 @@ in sources."xml-name-validator-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."yallist-3.0.3" sources."yargs-parser-7.0.0" ]; @@ -49567,7 +49858,7 @@ in sha512 = "S2vzg99C5+gb7FWlrK4TVdyzVPGGkdvpDkCEJH1JABi2PKzPeLu5/zZffcJUifgWUJqXWl41Hoc+MmuM2GukIg=="; }; dependencies = [ - sources."@babel/parser-7.4.5" + sources."@babel/parser-7.5.0" sources."argparse-1.0.10" sources."bluebird-3.5.5" sources."catharsis-0.8.10" @@ -49576,8 +49867,8 @@ in sources."graceful-fs-4.2.0" sources."js2xmlparser-4.0.0" sources."klaw-3.0.0" - sources."linkify-it-2.1.0" - sources."lodash-4.17.11" + sources."linkify-it-2.2.0" + sources."lodash-4.17.14" sources."markdown-it-8.4.2" sources."markdown-it-anchor-5.2.4" sources."marked-0.6.3" @@ -49634,7 +49925,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-0.0.1" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -49790,13 +50081,13 @@ in sources."delayed-stream-1.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" - sources."form-data-2.4.0" + sources."form-data-2.5.0" sources."formidable-1.2.1" sources."graphlib-2.1.7" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.13.1" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.40.0" @@ -49838,7 +50129,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."accepts-1.3.7" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-align-3.0.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -49969,7 +50260,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."locate-path-3.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash-id-0.14.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" @@ -50077,7 +50368,7 @@ in sources."type-is-1.6.18" sources."unique-string-1.0.0" sources."unpipe-1.0.0" - sources."update-notifier-3.0.0" + sources."update-notifier-3.0.1" sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" @@ -50138,85 +50429,47 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-4.1.0.tgz"; - sha512 = "xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw=="; + url = "https://registry.npmjs.org/karma/-/karma-4.2.0.tgz"; + sha512 = "fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA=="; }; dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - (sources."anymatch-2.0.0" // { - dependencies = [ - sources."normalize-path-2.1.1" - ]; - }) - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.3.2" + sources."anymatch-3.0.3" sources."arraybuffer.slice-0.0.7" - sources."assign-symbols-1.0.0" sources."async-2.6.2" - sources."async-each-1.0.3" sources."async-limiter-1.0.0" - sources."atob-2.1.2" sources."backo2-1.0.2" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" sources."better-assert-1.0.2" - sources."binary-extensions-1.13.1" + sources."binary-extensions-2.0.0" sources."blob-0.0.5" sources."bluebird-3.5.5" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - sources."braces-2.3.2" + sources."braces-3.0.2" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" sources."bytes-3.1.0" - sources."cache-base-1.0.1" sources."callsite-1.0.0" - sources."chokidar-2.1.6" - sources."class-utils-0.3.6" - sources."collection-visit-1.0.0" + sources."chokidar-3.0.2" sources."colors-1.3.3" sources."component-bind-1.0.0" - sources."component-emitter-1.3.0" + sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" sources."connect-3.7.0" sources."content-type-1.0.4" sources."cookie-0.3.1" - sources."copy-descriptor-0.1.1" - sources."core-js-2.6.9" - sources."core-util-is-1.0.2" + sources."core-js-3.1.4" sources."custom-event-1.0.1" sources."date-format-2.0.0" sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" - (sources."define-property-0.2.5" // { - dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."depd-1.1.2" sources."di-0.0.1" sources."dom-serialize-2.2.1" @@ -50229,7 +50482,6 @@ in }) (sources."engine.io-client-3.2.1" // { dependencies = [ - sources."component-emitter-1.2.1" sources."debug-3.1.0" ]; }) @@ -50237,15 +50489,8 @@ in sources."ent-2.2.0" sources."escape-html-1.0.3" sources."eventemitter3-3.1.2" - sources."expand-brackets-2.1.4" sources."extend-3.0.2" - sources."extend-shallow-2.0.1" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."fill-range-4.0.0" + sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."flatted-2.0.1" (sources."follow-redirects-1.7.0" // { @@ -50254,110 +50499,45 @@ in sources."ms-2.1.2" ]; }) - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" - sources."get-value-2.0.6" + sources."fsevents-2.0.7" sources."glob-7.1.4" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) + sources."glob-parent-5.0.0" sources."graceful-fs-4.2.0" - (sources."has-binary2-1.0.3" // { - dependencies = [ - sources."isarray-2.0.1" - ]; - }) + sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) sources."http-errors-1.7.2" sources."http-proxy-1.17.0" sources."iconv-lite-0.4.24" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-extendable-0.1.1" + sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" - sources."is-number-3.0.0" - sources."is-plain-object-2.0.4" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" + sources."is-number-7.0.0" + sources."isarray-2.0.1" sources."isbinaryfile-3.0.3" - sources."isobject-3.0.1" sources."jsonfile-4.0.0" - sources."kind-of-3.2.2" - sources."lodash-4.17.11" - (sources."log4js-4.4.0" // { + sources."lodash-4.17.14" + (sources."log4js-4.5.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) sources."lru-cache-4.1.5" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" sources."media-typer-0.3.0" - (sources."micromatch-3.1.10" // { - dependencies = [ - sources."define-property-2.0.2" - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - sources."kind-of-6.0.2" - ]; - }) sources."mime-2.4.4" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.10" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."ms-2.0.0" - sources."nan-2.14.0" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."define-property-2.0.2" - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - sources."kind-of-6.0.2" - ]; - }) sources."negotiator-0.6.2" sources."normalize-path-3.0.0" sources."object-component-0.0.3" - sources."object-copy-0.1.0" - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -50365,48 +50545,20 @@ in sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" - sources."posix-character-classes-0.1.1" - sources."process-nextick-args-2.0.1" + sources."picomatch-2.0.7" sources."pseudomap-1.0.2" sources."qjobs-1.2.0" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."readable-stream-2.3.6" - sources."readdirp-2.2.1" - (sources."regex-not-1.0.2" // { - dependencies = [ - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" + sources."readdirp-3.1.1" sources."requires-port-1.0.0" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" sources."rfdc-1.1.4" sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" - sources."set-value-2.0.1" sources."setprototypeof-1.1.1" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."snapdragon-util-3.0.1" (sources."socket.io-2.1.1" // { dependencies = [ sources."debug-3.1.0" @@ -50415,72 +50567,40 @@ in sources."socket.io-adapter-1.1.1" (sources."socket.io-client-2.1.1" // { dependencies = [ - sources."component-emitter-1.2.1" sources."debug-3.1.0" ]; }) (sources."socket.io-parser-3.2.0" // { dependencies = [ - sources."component-emitter-1.2.1" sources."debug-3.1.0" - sources."isarray-2.0.1" ]; }) sources."source-map-0.6.1" - sources."source-map-resolve-0.5.2" - sources."source-map-url-0.4.0" - (sources."split-string-3.1.0" // { - dependencies = [ - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."static-extend-0.1.2" sources."statuses-1.5.0" - (sources."streamroller-1.0.5" // { + (sources."streamroller-1.0.6" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" ]; }) - sources."string_decoder-1.1.1" sources."tmp-0.0.33" sources."to-array-0.1.4" - sources."to-object-path-0.3.0" - (sources."to-regex-3.0.2" // { - dependencies = [ - sources."define-property-2.0.2" - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."to-regex-range-2.1.1" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."type-is-1.6.18" sources."ultron-1.1.1" - sources."union-value-1.0.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."upath-1.1.2" - sources."urix-0.1.0" - sources."use-3.1.1" sources."useragent-2.3.0" - sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."void-elements-2.0.1" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - sources."ws-3.3.3" + (sources."ws-3.3.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."xmlhttprequest-ssl-1.5.5" sources."yallist-2.1.2" sources."yeast-0.1.2" @@ -50577,7 +50697,7 @@ in sources."vinyl-fs-3.0.3" sources."vinyl-sourcemap-1.1.0" sources."wrappy-1.0.2" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -50601,7 +50721,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -50632,7 +50752,7 @@ in sources."cross-spawn-6.0.5" sources."css-select-1.2.0" sources."css-what-2.1.3" - sources."cssom-0.3.6" + sources."cssom-0.3.8" sources."cssstyle-0.2.37" sources."cycle-1.0.3" sources."dashdash-1.14.1" @@ -50698,7 +50818,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."locate-path-3.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" (sources."mem-4.3.0" // { @@ -50767,7 +50887,7 @@ in sources."restore-cursor-2.0.0" sources."revalidator-0.1.8" sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."secure-keys-1.0.0" @@ -50931,26 +51051,26 @@ in 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-5.2.0" // { + (sources."@octokit/endpoint-5.2.2" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" ]; }) sources."@octokit/plugin-enterprise-rest-2.2.2" - (sources."@octokit/request-4.1.1" // { + (sources."@octokit/request-5.0.1" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" ]; }) sources."@octokit/request-error-1.0.4" - sources."@octokit/rest-16.28.2" + sources."@octokit/rest-16.28.4" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -50983,7 +51103,7 @@ in ]; }) sources."bcrypt-pbkdf-1.0.2" - sources."before-after-hook-1.4.0" + sources."before-after-hook-2.1.0" sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -51011,7 +51131,7 @@ in sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -51106,7 +51226,7 @@ in }) sources."decode-uri-component-0.2.0" sources."dedent-0.7.0" - sources."deepmerge-3.3.0" + sources."deepmerge-4.0.0" sources."defaults-1.0.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" @@ -51158,7 +51278,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -51267,7 +51387,7 @@ in sources."http-cache-semantics-3.8.1" sources."http-proxy-agent-2.1.0" sources."http-signature-1.2.0" - sources."https-proxy-agent-2.2.1" + sources."https-proxy-agent-2.2.2" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."iferr-0.1.5" @@ -51285,7 +51405,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."init-package-json-1.10.3" - (sources."inquirer-6.4.1" // { + (sources."inquirer-6.5.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."strip-ansi-5.2.0" @@ -51341,15 +51461,15 @@ in sources."lcid-2.0.0" sources."load-json-file-4.0.0" sources."locate-path-3.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash._reinterpolate-3.0.0" sources."lodash.clonedeep-4.5.0" sources."lodash.get-4.4.2" sources."lodash.ismatch-4.4.0" sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.0" - sources."lodash.template-4.4.0" - sources."lodash.templatesettings-4.1.0" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" sources."loud-rejection-1.6.0" (sources."lru-cache-5.1.1" // { @@ -51359,11 +51479,7 @@ in }) sources."macos-release-2.3.0" sources."make-dir-1.3.0" - (sources."make-fetch-happen-4.0.1" // { - dependencies = [ - sources."lru-cache-4.1.5" - ]; - }) + sources."make-fetch-happen-4.0.2" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-obj-2.0.0" @@ -51524,7 +51640,11 @@ in sources."p-try-1.0.0" ]; }) - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."readdir-scoped-modules-1.1.0" sources."redent-2.0.0" sources."regex-not-1.0.2" @@ -51549,7 +51669,7 @@ in sources."run-async-2.3.0" sources."run-queue-1.0.3" sources."rxjs-6.5.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."semver-5.7.0" @@ -51608,7 +51728,7 @@ in 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."spdx-license-ids-3.0.5" sources."split-1.0.1" sources."split-string-3.1.0" sources."split2-2.2.0" @@ -51640,7 +51760,11 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" @@ -51691,7 +51815,7 @@ in sources."union-value-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - sources."universal-user-agent-2.1.0" + sources."universal-user-agent-3.0.0" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { dependencies = [ @@ -51731,7 +51855,7 @@ in sources."write-file-atomic-2.4.3" sources."write-json-file-2.3.0" sources."write-pkg-3.2.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-2.1.2" sources."yargs-12.0.5" @@ -51756,7 +51880,7 @@ in sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w=="; }; dependencies = [ - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -51804,7 +51928,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."source-map-0.6.1" sources."sshpk-1.16.1" @@ -52187,7 +52311,7 @@ in dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -52392,7 +52516,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."kind-of-3.2.2" - sources."linkify-it-2.1.0" + sources."linkify-it-2.2.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."markdown-it-8.4.2" @@ -52684,12 +52808,12 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/core-7.4.5" - sources."@babel/generator-7.4.4" + sources."@babel/core-7.5.4" + sources."@babel/generator-7.5.0" 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.4" - sources."@babel/helper-create-class-features-plugin-7.4.4" + sources."@babel/helper-create-class-features-plugin-7.5.0" 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" @@ -52706,37 +52830,39 @@ in sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.4.4" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.4.4" - sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.5" + sources."@babel/helpers-7.5.4" + sources."@babel/highlight-7.5.0" + sources."@babel/parser-7.5.0" 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.4" + sources."@babel/plugin-proposal-class-properties-7.5.0" + sources."@babel/plugin-proposal-dynamic-import-7.5.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.4.4" + sources."@babel/plugin-proposal-object-rest-spread-7.5.4" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.4.4" sources."@babel/plugin-syntax-async-generators-7.2.0" + sources."@babel/plugin-syntax-dynamic-import-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.4" + sources."@babel/plugin-transform-async-to-generator-7.5.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" 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.4" + sources."@babel/plugin-transform-destructuring-7.5.0" sources."@babel/plugin-transform-dotall-regex-7.4.4" - sources."@babel/plugin-transform-duplicate-keys-7.2.0" + sources."@babel/plugin-transform-duplicate-keys-7.5.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" 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.4" - sources."@babel/plugin-transform-modules-systemjs-7.4.4" + sources."@babel/plugin-transform-modules-amd-7.5.0" + sources."@babel/plugin-transform-modules-commonjs-7.5.0" + sources."@babel/plugin-transform-modules-systemjs-7.5.0" sources."@babel/plugin-transform-modules-umd-7.2.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" sources."@babel/plugin-transform-new-target-7.4.4" @@ -52745,19 +52871,19 @@ in sources."@babel/plugin-transform-property-literals-7.2.0" sources."@babel/plugin-transform-regenerator-7.4.5" sources."@babel/plugin-transform-reserved-words-7.2.0" - sources."@babel/plugin-transform-runtime-7.4.4" + sources."@babel/plugin-transform-runtime-7.5.0" 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.4.4" sources."@babel/plugin-transform-typeof-symbol-7.2.0" sources."@babel/plugin-transform-unicode-regex-7.4.4" - sources."@babel/preset-env-7.4.5" + sources."@babel/preset-env-7.5.4" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.4.5" + sources."@babel/runtime-7.5.4" sources."@babel/template-7.4.4" - sources."@babel/traverse-7.4.5" - sources."@babel/types-7.4.4" + sources."@babel/traverse-7.5.0" + sources."@babel/types-7.5.0" sources."@calebboyd/semaphore-1.3.1" sources."@comandeer/babel-plugin-banner-4.1.0" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -52768,7 +52894,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.0.10" + sources."@types/node-12.6.2" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -52790,11 +52916,10 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."ace.improved-0.2.1" - sources."acorn-6.1.1" - sources."acorn-dynamic-import-4.0.0" - sources."ajv-6.10.0" + sources."acorn-6.2.0" + sources."ajv-6.10.1" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.4.0" + sources."ajv-keywords-3.4.1" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -52891,6 +53016,7 @@ in ]; }) sources."babel-messages-6.23.0" + sources."babel-plugin-dynamic-import-node-2.3.0" sources."babel-plugin-istanbul-4.1.6" sources."babel-plugin-jest-hoist-23.2.0" sources."babel-plugin-minify-builtins-0.5.0" @@ -52961,7 +53087,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.6.3" + sources."browserslist-4.6.4" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -52984,7 +53110,7 @@ in }) sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30000979" + sources."caniuse-lite-1.0.30000984" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -53011,7 +53137,7 @@ in sources."normalize-path-3.0.0" ]; }) - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { @@ -53117,6 +53243,7 @@ in ]; }) sources."defer-to-connect-1.0.2" + sources."define-properties-1.1.3" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -53142,7 +53269,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.182" + sources."electron-to-chromium-1.3.191" sources."elliptic-6.5.0" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" @@ -53299,6 +53426,7 @@ in sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" sources."fsevents-1.2.9" + sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-proxy-2.1.0" sources."get-stream-3.0.0" @@ -53341,6 +53469,7 @@ in sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" + sources."has-symbols-1.0.0" sources."has-to-string-tag-x-1.4.1" (sources."has-value-1.0.0" // { dependencies = [ @@ -53443,7 +53572,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.isplainobject-4.0.6" sources."lodash.some-4.6.0" sources."log-symbols-2.2.0" @@ -53515,7 +53644,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.24" + sources."node-releases-1.1.25" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" (sources."normalize-url-2.0.1" // { @@ -53543,11 +53672,13 @@ in }) ]; }) + sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" ]; }) + sources."object.assign-4.1.0" sources."object.omit-2.0.1" (sources."object.pick-1.3.0" // { dependencies = [ @@ -53694,7 +53825,7 @@ in sources."regenerator-transform-0.14.0" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp-tree-0.1.10" + sources."regexp-tree-0.1.11" sources."regexpu-core-4.5.4" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -53806,11 +53937,11 @@ in ]; }) sources."source-map-url-0.4.0" - sources."sourcemap-codec-1.4.4" + sources."sourcemap-codec-1.4.6" 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."spdx-license-ids-3.0.5" sources."split-string-3.1.0" sources."ssri-6.0.1" (sources."static-extend-0.1.2" // { @@ -53850,7 +53981,7 @@ in sources."supports-color-2.0.0" sources."tapable-1.1.3" sources."tar-stream-1.6.2" - (sources."terser-4.0.2" // { + (sources."terser-4.1.2" // { dependencies = [ sources."commander-2.20.0" sources."source-map-0.6.1" @@ -53925,7 +54056,7 @@ in sources."vm-browserify-1.1.0" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.35.2" // { + (sources."webpack-4.35.3" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -54000,7 +54131,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.0.3" (sources."yargs-13.2.4" // { @@ -54055,7 +54186,7 @@ in sha512 = "X/HWomzeox5HtkKLupin4affBXHq22r7RNqiSKsxlgZQMSU9n+zpGY0sbzJr1IycB6FXpKUZet1VH3Rs1/8WQg=="; }; dependencies = [ - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -54097,7 +54228,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."link-check-4.4.5" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."markdown-link-extractor-1.2.1" sources."marked-0.6.3" sources."mime-db-1.40.0" @@ -54110,7 +54241,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" sources."supports-color-5.5.0" @@ -54516,7 +54647,7 @@ in }) (sources."gulp-uglify-3.0.1" // { dependencies = [ - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" sources."through2-2.0.5" @@ -54623,7 +54754,7 @@ in sources."lodash.isarguments-3.1.0" sources."lodash.isarray-3.0.4" sources."lodash.keys-3.1.2" - sources."lodash.merge-4.6.1" + sources."lodash.merge-4.6.2" sources."lodash.partialright-4.2.1" sources."lodash.pick-4.4.0" sources."lodash.restparam-3.6.1" @@ -54846,7 +54977,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-1.0.1" - sources."typescript-3.5.2" + sources."typescript-3.5.3" (sources."uglify-js-3.4.9" // { dependencies = [ sources."source-map-0.6.1" @@ -54898,7 +55029,7 @@ in sources."window-size-0.1.0" sources."wordwrap-0.0.2" sources."wrappy-1.0.2" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; @@ -54976,7 +55107,7 @@ in sources."js-yaml-3.13.1" sources."lcid-2.0.0" sources."locate-path-3.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" sources."mem-4.3.0" @@ -55077,7 +55208,7 @@ in sources."delayed-stream-1.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" - sources."form-data-2.4.0" + sources."form-data-2.5.0" sources."formidable-1.2.1" sources."graphlib-2.1.7" sources."inherits-2.0.4" @@ -55088,7 +55219,7 @@ in sources."commander-2.19.0" ]; }) - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.40.0" @@ -55136,7 +55267,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."msgpack-lite-0.1.26" sources."semver-5.7.0" sources."stack-trace-0.0.10" @@ -55186,7 +55317,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -55202,7 +55333,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -55305,12 +55436,16 @@ in sources."psl-1.2.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."request-2.88.0" sources."resolve-1.11.1" sources."retry-0.10.1" sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-6.1.3" sources."set-blocking-2.0.0" @@ -55320,11 +55455,15 @@ in 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."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-3.0.1" sources."tar-4.4.10" sources."temp-0.9.0" @@ -55361,14 +55500,14 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.1.tgz"; - sha512 = "D68549U6EDVJLrAkSOZCWX/nmlYo0eCX2dYZoTOOZJ7bEIFrSE/MQgsgMFBKjByJ323hNzkifw2OuT3A5bR5mA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.2.tgz"; + sha512 = "sNcb5O7eJ9XiNAhWZ/UE2bWsBJn3Jb7rayMqMP4wjenlr1DwzZxUmbtmIrl04EU0p5fN2rU9WIDV+u0EbsI8oQ=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -55381,7 +55520,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -55718,7 +55857,7 @@ in 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."spdx-license-ids-3.0.5" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -55782,7 +55921,7 @@ in ]; }) sources."xmldom-0.1.27" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."y18n-3.2.1" sources."yargs-3.32.0" ]; @@ -55810,7 +55949,7 @@ in sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" @@ -56239,24 +56378,32 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.20.6"; + version = "0.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.20.6.tgz"; - sha512 = "YOtehXlxCtMBXMTEjj4OWrY6MXhpgBPEZGeqhl7Y0Pglg+ZNeDmAqa/9KkFkQ0YlVbcDSTN/mmhevuzE/K8aMA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-0.20.7.tgz"; + sha512 = "klwQup/74kYGLBujQj4txrmpMYUdR88A68xjdycedD9dwMDwWCu8NL5t+O8XMWYxJ332hOIgLS62tm8ChxrkuQ=="; }; dependencies = [ - sources."@babel/runtime-7.4.5" - sources."@node-red/editor-api-0.20.6" - sources."@node-red/editor-client-0.20.6" - (sources."@node-red/nodes-0.20.6" // { + sources."@babel/runtime-7.5.4" + sources."@node-red/editor-api-0.20.7" + sources."@node-red/editor-client-0.20.7" + (sources."@node-red/nodes-0.20.7" // { dependencies = [ sources."cookie-0.4.0" + sources."http-errors-1.7.3" + sources."iconv-lite-0.5.0" + sources."inherits-2.0.4" sources."media-typer-1.1.0" + (sources."raw-body-2.4.1" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) ]; }) - sources."@node-red/registry-0.20.6" - sources."@node-red/runtime-0.20.6" - sources."@node-red/util-0.20.6" + sources."@node-red/registry-0.20.7" + sources."@node-red/runtime-0.20.7" + sources."@node-red/util-0.20.7" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."addressparser-1.0.1" @@ -56283,7 +56430,7 @@ in sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."basic-auth-2.0.1" - sources."bcrypt-3.0.5" + sources."bcrypt-3.0.6" sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" (sources."bl-1.2.2" // { @@ -56312,7 +56459,7 @@ in }) sources."caseless-0.12.0" sources."cheerio-0.22.0" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."clone-2.1.2" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" @@ -56384,7 +56531,7 @@ in sources."cookie-0.4.0" ]; }) - (sources."express-session-1.16.1" // { + (sources."express-session-1.16.2" // { dependencies = [ sources."depd-2.0.0" ]; @@ -56404,7 +56551,7 @@ in sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."fs-extra-8.0.1" + sources."fs-extra-8.1.0" sources."fs-minipass-1.2.6" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" @@ -56422,7 +56569,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" - sources."hash-sum-1.0.2" + sources."hash-sum-2.0.0" sources."he-1.2.0" sources."help-me-1.1.0" sources."html-to-text-5.1.1" @@ -56467,7 +56614,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.6.4" + sources."jsonata-1.6.5" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."leven-2.1.0" @@ -56475,7 +56622,7 @@ in sources."libmime-4.1.1" sources."libqp-1.1.0" sources."linkify-it-2.1.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" @@ -56486,7 +56633,7 @@ in sources."lodash.get-4.4.2" sources."lodash.has-4.5.2" sources."lodash.map-4.6.0" - sources."lodash.merge-4.6.1" + sources."lodash.merge-4.6.2" sources."lodash.pick-4.4.0" sources."lodash.reduce-4.6.0" sources."lodash.reject-4.6.0" @@ -56524,7 +56671,7 @@ in ]; }) sources."moment-2.24.0" - sources."moment-timezone-0.5.25" + sources."moment-timezone-0.5.26" (sources."mqtt-2.18.8" // { dependencies = [ sources."readable-stream-2.3.6" @@ -56536,7 +56683,7 @@ in sources."ms-2.0.0" sources."multer-1.4.1" sources."mustache-3.0.1" - sources."nan-2.13.1" + sources."nan-2.13.2" (sources."needle-2.4.0" // { dependencies = [ sources."debug-3.2.6" @@ -56625,7 +56772,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-6.1.1" + sources."semver-6.2.0" (sources."send-0.17.1" // { dependencies = [ sources."mime-1.6.0" @@ -56709,7 +56856,7 @@ in sources."ws-6.2.1" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -56725,10 +56872,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.9.2"; + version = "6.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.9.2.tgz"; - sha512 = "b0sEGRYrVdcV/DedLrqV4VMpdMHJbvpt9bopivh4K9RisHFMbj+G6RNbB6lRdr9rpYIoqHG9YP9CYmxdI9k81g=="; + url = "https://registry.npmjs.org/npm/-/npm-6.10.1.tgz"; + sha512 = "ejR83c5aPTip5hPhziypqkJu06vb5tDIugCXx1c5+04RbMjtZeMA6BfsuGnV9EBdEwzKoaHkQ9sJWQAq+LjHYw=="; }; buildInputs = globalBuildInputs; meta = { @@ -56751,7 +56898,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -56858,11 +57005,15 @@ in sources."psl-1.2.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."request-2.88.0" sources."retry-0.6.0" sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-4.3.6" sources."set-blocking-2.0.0" @@ -56870,7 +57021,11 @@ in sources."slide-1.1.6" sources."sshpk-1.16.1" sources."string-width-1.0.2" - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-3.0.1" (sources."tar-0.1.17" // { dependencies = [ @@ -56912,10 +57067,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "3.1.13"; + version = "3.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.13.tgz"; - sha512 = "bRFFgs0IUJvBLLUpmbFLMHPflDQoInS9Lh7yGhbevjt64KuA9jd+bbE7vTdE/j1foZRbuf8S5vmHshjEib4d0w=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.18.tgz"; + sha512 = "e4UGOGdFs9+9uRrZrojueT+fjg4uVZzi8fyDdWIS9+JIl4J4xqODh0vp1TdCnedjn8jTPy1dhUtbjQtRWAhV8w=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -56944,7 +57099,7 @@ in }) sources."camelcase-5.3.1" sources."chalk-2.4.2" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."ci-info-2.0.0" sources."cint-8.2.1" sources."cli-boxes-2.2.0" @@ -56993,7 +57148,7 @@ in }) sources."fast-diff-1.2.0" sources."figgy-pudding-3.5.1" - sources."find-up-4.0.0" + sources."find-up-4.1.0" sources."flush-write-stream-1.1.1" sources."from2-2.3.0" sources."fs-minipass-1.2.6" @@ -57012,7 +57167,7 @@ in sources."hosted-git-info-2.7.1" sources."http-cache-semantics-3.8.1" sources."http-proxy-agent-2.1.0" - sources."https-proxy-agent-2.2.1" + sources."https-proxy-agent-2.2.2" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."iferr-0.1.5" @@ -57038,7 +57193,7 @@ in sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-helpfulerror-1.0.3" - (sources."json5-1.0.1" // { + (sources."json5-2.1.0" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -57052,19 +57207,15 @@ in sources."find-up-3.0.0" sources."locate-path-3.0.0" sources."p-locate-3.0.0" + sources."path-exists-3.0.0" ]; }) sources."locate-path-5.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" sources."make-dir-1.3.0" - (sources."make-fetch-happen-4.0.1" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) + sources."make-fetch-happen-4.0.2" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -57101,12 +57252,7 @@ in sources."semver-5.7.0" ]; }) - (sources."npm-registry-fetch-3.9.0" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) + sources."npm-registry-fetch-3.9.1" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."object-keys-1.1.1" @@ -57119,14 +57265,18 @@ in sources."p-limit-2.2.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."package-json-6.4.0" - (sources."pacote-9.5.1" // { + (sources."package-json-6.4.0" // { + dependencies = [ + sources."registry-auth-token-3.4.0" + ]; + }) + (sources."pacote-9.5.2" // { dependencies = [ sources."semver-5.7.0" ]; }) sources."parallel-transform-1.1.0" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -57151,9 +57301,18 @@ in sources."minimist-1.2.0" ]; }) - sources."rc-config-loader-2.0.3" - sources."readable-stream-2.3.6" - sources."registry-auth-token-3.4.0" + (sources."rc-config-loader-2.0.4" // { + dependencies = [ + sources."debug-4.1.1" + sources."path-exists-3.0.0" + ]; + }) + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."registry-auth-token-4.0.0" sources."registry-url-5.1.0" sources."require-from-string-2.0.2" (sources."requireg-0.2.2" // { @@ -57166,7 +57325,7 @@ in sources."retry-0.10.1" sources."rimraf-2.6.3" sources."run-queue-1.0.3" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-6.2.0" (sources."semver-diff-2.1.0" // { @@ -57178,7 +57337,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."sisteransi-1.0.0" + sources."sisteransi-1.0.2" sources."smart-buffer-4.0.2" sources."socks-2.3.2" (sources."socks-proxy-agent-4.0.2" // { @@ -57190,7 +57349,7 @@ in 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."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" sources."ssri-6.0.1" sources."stream-each-1.2.3" @@ -57201,7 +57360,11 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -57216,7 +57379,7 @@ in sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-1.0.0" - sources."update-notifier-3.0.0" + sources."update-notifier-3.0.1" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -57232,7 +57395,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.0.3" ]; @@ -57401,7 +57564,7 @@ in sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" @@ -57533,7 +57696,7 @@ in 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."spdx-license-ids-3.0.5" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -57577,7 +57740,7 @@ in }) sources."xmlbuilder-4.0.0" sources."xmldom-0.1.27" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -57601,7 +57764,7 @@ in sources."accepts-1.2.13" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."archiver-3.0.0" sources."archiver-utils-2.0.0" sources."arraybuffer.slice-0.0.6" @@ -57813,7 +57976,7 @@ in ]; }) sources."lazystream-1.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.assign-4.2.0" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" @@ -58028,7 +58191,7 @@ in sources."ws-1.1.5" sources."wtf-8-1.0.0" sources."xmlhttprequest-ssl-1.5.3" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."yeast-0.1.2" sources."zip-stream-2.0.1" ]; @@ -58045,10 +58208,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.5.3"; + version = "3.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.5.3.tgz"; - sha512 = "4gBUaY+IiuJLmoqP3QEtqxmFzY4yqbpnYx7WFrv0Aoy9zR6oneI4429KEO5G3rX+P3jF/OuYdVZ8E59URgD0ag=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.5.7.tgz"; + sha512 = "RmUJo7V8mSw9Tu8hRhi4tXagjO3+S/qHdDkAtYxZA/v9fvG3ux1aSiKcIeOmN4A1FCRHG7xy/sfFQC1lhSm5uQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -58086,16 +58249,16 @@ in sources."@babel/helper-builder-react-jsx-7.3.0" (sources."@babel/helper-call-delegate-7.4.4" // { dependencies = [ - sources."@babel/generator-7.4.4" - sources."@babel/parser-7.4.5" - sources."@babel/traverse-7.4.5" - sources."@babel/types-7.4.4" + sources."@babel/generator-7.5.0" + sources."@babel/parser-7.5.0" + sources."@babel/traverse-7.5.0" + sources."@babel/types-7.5.0" sources."source-map-0.5.7" ]; }) (sources."@babel/helper-define-map-7.4.4" // { dependencies = [ - sources."@babel/types-7.4.4" + sources."@babel/types-7.5.0" ]; }) sources."@babel/helper-explode-assignable-expression-7.1.0" @@ -58103,16 +58266,16 @@ in sources."@babel/helper-get-function-arity-7.0.0" (sources."@babel/helper-hoist-variables-7.4.4" // { dependencies = [ - sources."@babel/types-7.4.4" + sources."@babel/types-7.5.0" ]; }) sources."@babel/helper-member-expression-to-functions-7.0.0" sources."@babel/helper-module-imports-7.0.0" (sources."@babel/helper-module-transforms-7.4.4" // { dependencies = [ - sources."@babel/parser-7.4.5" + sources."@babel/parser-7.5.0" sources."@babel/template-7.4.4" - sources."@babel/types-7.4.4" + sources."@babel/types-7.5.0" ]; }) sources."@babel/helper-optimise-call-expression-7.0.0" @@ -58121,35 +58284,35 @@ in sources."@babel/helper-remap-async-to-generator-7.1.0" (sources."@babel/helper-replace-supers-7.4.4" // { dependencies = [ - sources."@babel/generator-7.4.4" - sources."@babel/parser-7.4.5" - sources."@babel/traverse-7.4.5" - sources."@babel/types-7.4.4" + sources."@babel/generator-7.5.0" + sources."@babel/parser-7.5.0" + sources."@babel/traverse-7.5.0" + sources."@babel/types-7.5.0" sources."source-map-0.5.7" ]; }) sources."@babel/helper-simple-access-7.1.0" (sources."@babel/helper-split-export-declaration-7.4.4" // { dependencies = [ - sources."@babel/types-7.4.4" + sources."@babel/types-7.5.0" ]; }) sources."@babel/helper-wrap-function-7.2.0" - (sources."@babel/helpers-7.4.4" // { + (sources."@babel/helpers-7.5.4" // { dependencies = [ - sources."@babel/generator-7.4.4" - sources."@babel/parser-7.4.5" + sources."@babel/generator-7.5.0" + sources."@babel/parser-7.5.0" sources."@babel/template-7.4.4" - sources."@babel/traverse-7.4.5" - sources."@babel/types-7.4.4" + sources."@babel/traverse-7.5.0" + sources."@babel/types-7.5.0" sources."source-map-0.5.7" ]; }) - sources."@babel/highlight-7.0.0" + sources."@babel/highlight-7.5.0" 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.4" + sources."@babel/plugin-proposal-object-rest-spread-7.5.4" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.4.4" sources."@babel/plugin-syntax-async-generators-7.2.0" @@ -58159,22 +58322,22 @@ 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.4" + sources."@babel/plugin-transform-async-to-generator-7.5.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" 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.4" + sources."@babel/plugin-transform-destructuring-7.5.0" sources."@babel/plugin-transform-dotall-regex-7.4.4" - sources."@babel/plugin-transform-duplicate-keys-7.2.0" + sources."@babel/plugin-transform-duplicate-keys-7.5.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.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-amd-7.5.0" sources."@babel/plugin-transform-modules-commonjs-7.2.0" - sources."@babel/plugin-transform-modules-systemjs-7.4.4" + sources."@babel/plugin-transform-modules-systemjs-7.5.0" sources."@babel/plugin-transform-modules-umd-7.2.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" sources."@babel/plugin-transform-new-target-7.4.4" @@ -58207,11 +58370,11 @@ in sources."acorn-5.7.3" (sources."acorn-globals-4.3.2" // { dependencies = [ - sources."acorn-6.1.1" + sources."acorn-6.2.0" ]; }) - sources."acorn-walk-6.1.1" - sources."ajv-6.10.0" + sources."acorn-walk-6.2.0" + sources."ajv-6.10.1" sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -58243,6 +58406,7 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" + sources."babel-plugin-dynamic-import-node-2.3.0" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -58281,7 +58445,7 @@ in sources."pako-1.0.10" ]; }) - sources."browserslist-4.6.3" + sources."browserslist-4.6.4" (sources."buffer-4.9.1" // { dependencies = [ sources."isarray-1.0.0" @@ -58297,7 +58461,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30000979" + sources."caniuse-lite-1.0.30000984" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.6" @@ -58381,14 +58545,10 @@ in sources."source-map-0.5.7" ]; }) - sources."cssom-0.3.6" + sources."cssom-0.3.8" sources."cssstyle-1.3.0" sources."dashdash-1.14.1" - (sources."data-urls-1.1.0" // { - dependencies = [ - sources."whatwg-url-7.0.0" - ]; - }) + sources."data-urls-1.1.0" sources."date-now-0.1.4" sources."deasync-0.1.15" sources."debug-4.1.1" @@ -58434,7 +58594,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.182" + sources."electron-to-chromium-1.3.191" sources."elliptic-6.5.0" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -58519,7 +58679,11 @@ in sources."html-comment-regex-1.1.2" sources."html-encoding-sniffer-1.0.2" sources."html-tags-1.2.0" - sources."htmlnano-0.2.3" + (sources."htmlnano-0.2.4" // { + dependencies = [ + sources."terser-4.1.2" + ]; + }) (sources."htmlparser2-3.10.1" // { dependencies = [ sources."readable-stream-3.4.0" @@ -58537,6 +58701,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."invariant-2.2.4" + sources."ip-regex-2.1.0" sources."is-absolute-url-2.1.0" (sources."is-accessor-descriptor-1.0.0" // { dependencies = [ @@ -58588,7 +58753,13 @@ in ]; }) sources."jsbn-0.1.1" - sources."jsdom-11.12.0" + (sources."jsdom-15.1.1" // { + dependencies = [ + sources."acorn-6.2.0" + sources."escodegen-1.11.1" + sources."ws-7.1.0" + ]; + }) sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -58597,9 +58768,8 @@ in sources."json5-1.0.1" sources."jsprim-1.4.1" sources."kind-of-3.2.2" - sources."left-pad-1.3.0" sources."levn-0.3.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.clone-4.5.0" sources."lodash.memoize-4.1.2" sources."lodash.sortby-4.7.0" @@ -58663,9 +58833,9 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.24" + sources."node-releases-1.1.25" sources."nopt-4.0.1" - sources."normalize-html-whitespace-0.2.0" + sources."normalize-html-whitespace-1.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -58676,6 +58846,7 @@ in sources."object-inspect-1.4.1" sources."object-keys-1.1.1" sources."object-visit-1.0.1" + sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.0.3" sources."object.pick-1.3.0" sources."object.values-1.1.0" @@ -58692,7 +58863,7 @@ in sources."pako-0.2.9" sources."parse-asn1-5.1.4" sources."parse-json-4.0.0" - sources."parse5-4.0.0" + sources."parse5-5.1.0" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" @@ -58807,7 +58978,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexp-tree-0.1.10" + sources."regexp-tree-0.1.11" sources."regexpu-core-4.5.4" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -58825,7 +58996,11 @@ in ]; }) sources."request-promise-core-1.1.2" - sources."request-promise-native-1.0.7" + (sources."request-promise-native-1.0.7" // { + dependencies = [ + sources."tough-cookie-2.5.0" + ]; + }) sources."resolve-1.11.1" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" @@ -58840,6 +59015,7 @@ in sources."safer-buffer-2.1.2" sources."safer-eval-1.3.3" sources."sax-1.2.4" + sources."saxes-3.1.11" sources."semver-5.7.0" (sources."send-0.17.1" // { dependencies = [ @@ -58927,7 +59103,7 @@ in }) sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" - sources."tough-cookie-2.5.0" + sources."tough-cookie-3.0.1" sources."tr46-1.0.1" sources."trim-right-1.0.1" sources."tty-browserify-0.0.0" @@ -58935,10 +59111,11 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - (sources."uncss-0.16.2" // { + (sources."uncss-0.17.0" // { dependencies = [ - sources."postcss-6.0.23" - sources."postcss-selector-parser-3.1.1" + sources."cssesc-3.0.0" + sources."is-absolute-url-3.0.0" + sources."postcss-selector-parser-6.0.2" ]; }) sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -58984,17 +59161,19 @@ in sources."vlq-0.2.3" sources."vm-browserify-1.1.0" sources."w3c-hr-time-1.0.1" + sources."w3c-xmlserializer-1.1.2" sources."wcwidth-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."whatwg-url-7.0.0" sources."which-1.3.1" 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" + sources."xmlchars-2.1.1" + sources."xtend-4.0.2" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -59035,10 +59214,10 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-6.1.1" + sources."acorn-6.2.0" sources."acorn-dynamic-import-4.0.0" sources."acorn-node-1.7.0" - sources."acorn-walk-6.1.1" + sources."acorn-walk-6.2.0" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" @@ -59061,7 +59240,7 @@ in sources."resolve-1.1.7" ]; }) - (sources."browserify-16.2.3" // { + (sources."browserify-16.3.0" // { dependencies = [ sources."concat-stream-1.6.2" ]; @@ -59148,7 +59327,7 @@ in sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.5" sources."miller-rabin-4.0.1" @@ -59198,13 +59377,14 @@ in sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { dependencies = [ + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."resolve-1.11.1" sources."rimraf-2.6.3" sources."ripemd160-2.0.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."sander-0.5.1" sources."sha.js-2.4.11" sources."shasum-1.0.2" @@ -59216,12 +59396,16 @@ in ]; }) sources."source-map-0.5.7" - sources."sourcemap-codec-1.4.4" + sources."sourcemap-codec-1.4.6" sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" sources."stream-splicer-2.0.1" - sources."string_decoder-1.2.0" + (sources."string_decoder-1.2.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" @@ -59253,7 +59437,7 @@ in sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -59412,7 +59596,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -59509,7 +59693,7 @@ in sources."raw-body-0.0.3" sources."readable-stream-1.1.14" sources."request-2.9.203" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."send-0.1.4" @@ -59539,846 +59723,6 @@ in bypassCache = true; reconstructLock = true; }; - scuttlebot = nodeEnv.buildNodePackage { - name = "scuttlebot"; - packageName = "scuttlebot"; - version = "13.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-13.2.2.tgz"; - sha512 = "QRBWq6TSK1Tk2lE978avGJyOgh1Glnru5zR/i6RWmaq3n0rYxFxEslGvpu3TupInCaog98DU1n6nDLszQvvtdA=="; - }; - dependencies = [ - sources."abstract-leveldown-6.0.3" - sources."aligned-block-file-1.2.2" - 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.2" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" - sources."arr-diff-2.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.2.1" - sources."arrify-1.0.1" - sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" - sources."async-single-1.0.5" - sources."async-write-2.1.0" - sources."atob-2.1.2" - sources."atomic-file-1.1.5" - sources."attach-ware-1.1.1" - 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."base64-url-2.2.2" - sources."bash-color-0.0.4" - sources."binary-extensions-1.13.1" - sources."binary-search-1.3.5" - sources."bindings-1.3.1" - sources."bl-1.2.2" - sources."blake2s-1.1.0" - sources."brace-expansion-1.1.11" - sources."braces-1.8.5" - sources."broadcast-stream-0.2.2" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" - sources."bytewise-1.1.0" - sources."bytewise-core-1.2.3" - (sources."cache-base-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."camelcase-2.1.1" - sources."ccount-1.0.4" - sources."chalk-1.1.3" - 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" - sources."chokidar-1.7.0" - sources."chownr-1.1.1" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."isobject-3.0.1" - sources."kind-of-5.1.0" - ]; - }) - sources."cli-cursor-1.0.2" - sources."co-3.1.0" - sources."code-point-at-1.1.0" - sources."collapse-white-space-1.0.5" - sources."collection-visit-1.0.0" - sources."commander-2.20.0" - sources."compare-at-paths-1.0.0" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."console-control-strings-1.1.0" - sources."cont-1.0.3" - sources."continuable-1.2.0" - (sources."continuable-hash-0.1.4" // { - dependencies = [ - sources."continuable-1.1.8" - ]; - }) - (sources."continuable-list-0.1.6" // { - dependencies = [ - sources."continuable-1.1.8" - ]; - }) - sources."continuable-para-1.2.0" - sources."continuable-series-1.2.0" - sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" - sources."cross-spawn-6.0.5" - sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" - sources."decompress-response-3.3.0" - sources."deep-equal-1.0.1" - sources."deep-extend-0.6.0" - sources."deferred-leveldown-5.1.0" - sources."define-properties-1.1.3" - (sources."define-property-2.0.2" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."defined-1.0.0" - sources."delegates-1.0.0" - sources."detab-1.0.2" - sources."detect-libc-1.0.3" - sources."discontinuous-range-1.0.0" - sources."dynamic-dijkstra-1.0.2" - sources."ed2curve-0.1.4" - sources."elegant-spinner-1.0.1" - sources."emoji-named-characters-1.0.2" - sources."emoji-server-1.0.0" - sources."encoding-down-6.1.0" - sources."end-of-stream-1.4.1" - sources."epidemic-broadcast-trees-7.0.0" - sources."errno-0.1.7" - sources."es-abstract-1.13.0" - sources."es-to-primitive-1.2.0" - sources."escape-string-regexp-1.0.5" - sources."exit-hook-1.1.1" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - sources."expand-template-2.0.3" - sources."explain-error-1.0.4" - sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."extend.js-0.0.2" - sources."extglob-0.3.2" - sources."fast-future-1.0.2" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" - (sources."flumecodec-0.0.0" // { - dependencies = [ - sources."level-codec-6.2.0" - ]; - }) - sources."flumedb-1.1.0" - (sources."flumelog-offset-3.4.2" // { - dependencies = [ - sources."looper-4.0.0" - ]; - }) - sources."flumeview-hashtable-1.1.1" - sources."flumeview-level-3.0.13" - (sources."flumeview-query-6.3.0" // { - dependencies = [ - sources."map-filter-reduce-3.2.2" - ]; - }) - (sources."flumeview-reduce-1.3.16" // { - dependencies = [ - (sources."atomic-file-2.0.1" // { - dependencies = [ - sources."flumecodec-0.0.1" - ]; - }) - sources."level-codec-6.2.0" - ]; - }) - sources."for-each-0.3.3" - sources."for-in-1.0.2" - sources."for-own-0.1.5" - sources."fragment-cache-0.2.1" - sources."fs-constants-1.0.0" - sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" - sources."function-bind-1.1.1" - sources."gauge-2.7.4" - sources."get-value-2.0.6" - sources."github-from-package-0.0.0" - sources."glob-6.0.4" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" - sources."globby-4.1.0" - sources."graceful-fs-4.2.0" - sources."has-1.0.3" - sources."has-ansi-2.0.0" - sources."has-network-0.0.1" - sources."has-symbols-1.0.0" - sources."has-unicode-2.0.1" - (sources."has-value-1.0.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) - sources."hashlru-2.3.0" - sources."he-0.5.0" - sources."heap-0.2.6" - sources."hoox-0.0.1" - sources."idb-kv-store-4.4.0" - sources."immediate-3.2.3" - sources."increment-buffer-1.0.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.5" - sources."int53-1.0.0" - sources."ip-1.1.5" - sources."irregular-plurals-1.4.0" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-alphabetical-1.0.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" - sources."is-canonical-base64-1.1.1" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-date-object-1.0.1" - sources."is-decimal-1.0.3" - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-dotfile-1.0.3" - sources."is-electron-2.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-1.0.0" - sources."is-glob-2.0.1" - sources."is-hexadecimal-1.0.3" - sources."is-number-2.1.0" - (sources."is-plain-object-2.0.4" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" - sources."is-typedarray-1.0.0" - sources."is-valid-domain-0.0.11" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-2.1.0" - sources."json-buffer-2.0.11" - sources."kind-of-3.2.2" - sources."layered-graph-1.1.3" - sources."level-5.0.1" - sources."level-codec-9.0.1" - sources."level-concat-iterator-2.0.1" - sources."level-errors-2.0.1" - (sources."level-iterator-stream-4.0.1" // { - dependencies = [ - sources."readable-stream-3.4.0" - ]; - }) - sources."level-js-4.0.1" - sources."level-packager-5.0.2" - sources."level-post-1.0.7" - (sources."level-sublevel-6.6.5" // { - dependencies = [ - (sources."abstract-leveldown-0.12.4" // { - dependencies = [ - sources."xtend-3.0.0" - ]; - }) - sources."bl-0.8.2" - sources."deferred-leveldown-0.2.0" - sources."isarray-0.0.1" - (sources."levelup-0.19.1" // { - dependencies = [ - sources."xtend-3.0.0" - ]; - }) - sources."ltgt-2.1.3" - sources."prr-0.0.0" - sources."readable-stream-1.0.34" - sources."semver-5.1.1" - sources."string_decoder-0.10.31" - ]; - }) - (sources."leveldown-5.1.1" // { - dependencies = [ - sources."node-gyp-build-4.1.0" - ]; - }) - sources."levelup-4.1.0" - sources."libnested-1.4.1" - sources."libsodium-0.7.4" - sources."libsodium-wrappers-0.7.4" - sources."lodash.get-4.4.2" - sources."log-symbols-1.0.2" - sources."log-update-1.0.2" - sources."longest-streak-1.0.0" - sources."looper-3.0.0" - sources."lossy-store-1.2.4" - sources."ltgt-2.2.1" - sources."map-cache-0.2.2" - sources."map-filter-reduce-2.2.1" - sources."map-merge-1.1.0" - sources."map-visit-1.0.0" - sources."markdown-table-0.4.0" - sources."math-random-1.0.4" - sources."mdmanifest-1.0.8" - sources."micromatch-2.3.11" - sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.0" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."monotonic-timestamp-0.0.9" - sources."moo-0.4.3" - sources."ms-2.0.0" - sources."multiblob-1.13.4" - sources."multiblob-http-0.4.2" - sources."multicb-1.2.2" - (sources."multiserver-3.3.6" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.2" - ]; - }) - sources."multiserver-address-1.0.1" - sources."multiserver-scopes-1.0.0" - sources."muxrpc-6.4.2" - (sources."muxrpc-validation-2.0.1" // { - dependencies = [ - sources."pull-stream-2.28.4" - ]; - }) - (sources."muxrpcli-1.1.0" // { - dependencies = [ - sources."pull-stream-2.28.4" - ]; - }) - (sources."mv-2.1.1" // { - dependencies = [ - sources."rimraf-2.4.5" - ]; - }) - sources."nan-2.14.0" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."kind-of-6.0.2" - ]; - }) - sources."napi-build-utils-1.0.1" - sources."napi-macros-1.8.2" - sources."ncp-2.0.0" - sources."nearley-2.16.0" - sources."nice-try-1.0.5" - sources."node-abi-2.9.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.2" - sources."npm-prefix-1.2.0" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - ]; - }) - sources."object-inspect-1.6.0" - sources."object-keys-1.1.1" - (sources."object-visit-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."object.omit-2.0.1" - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."observ-0.2.0" - sources."observ-debounce-1.1.1" - sources."obv-0.0.1" - sources."on-change-network-0.0.2" - sources."on-wakeup-1.0.1" - sources."once-1.4.0" - sources."onetime-1.1.0" - sources."opencollective-postinstall-2.0.2" - sources."options-0.0.6" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."packet-stream-2.0.4" - sources."packet-stream-codec-1.1.2" - sources."parse-entities-1.2.2" - sources."parse-glob-3.0.4" - sources."pascalcase-0.1.1" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-parse-1.0.6" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."plur-2.1.2" - sources."posix-character-classes-0.1.1" - sources."prebuild-install-5.2.5" - sources."preserve-0.2.0" - sources."private-box-0.3.0" - sources."process-nextick-args-2.0.1" - sources."promisize-1.1.2" - sources."prr-1.0.1" - sources."pull-abortable-4.0.0" - sources."pull-box-stream-1.0.13" - sources."pull-cat-1.1.11" - sources."pull-catch-1.0.1" - sources."pull-cont-0.1.1" - sources."pull-core-1.1.0" - (sources."pull-cursor-3.0.0" // { - dependencies = [ - sources."looper-4.0.0" - ]; - }) - sources."pull-defer-0.2.3" - sources."pull-file-1.1.0" - sources."pull-flatmap-0.0.1" - (sources."pull-fs-1.1.6" // { - dependencies = [ - sources."pull-file-0.5.0" - ]; - }) - sources."pull-glob-1.0.7" - (sources."pull-goodbye-0.0.2" // { - dependencies = [ - sources."pull-stream-3.5.0" - ]; - }) - sources."pull-handshake-1.1.4" - sources."pull-hash-1.0.0" - sources."pull-inactivity-2.1.3" - sources."pull-level-2.0.4" - sources."pull-live-1.0.1" - (sources."pull-looper-1.0.0" // { - dependencies = [ - sources."looper-4.0.0" - ]; - }) - sources."pull-many-1.0.9" - sources."pull-next-1.0.1" - sources."pull-notify-0.1.1" - sources."pull-pair-1.1.0" - (sources."pull-paramap-1.2.2" // { - dependencies = [ - sources."looper-4.0.0" - ]; - }) - sources."pull-ping-2.0.2" - sources."pull-pushable-2.2.0" - sources."pull-rate-1.0.2" - sources."pull-reader-1.3.1" - sources."pull-sink-through-0.0.0" - sources."pull-sort-1.0.2" - sources."pull-stream-3.6.13" - sources."pull-stringify-2.0.0" - sources."pull-through-1.0.18" - sources."pull-traverse-1.0.3" - sources."pull-utf8-decoder-1.0.2" - (sources."pull-window-2.1.4" // { - dependencies = [ - sources."looper-2.0.0" - ]; - }) - (sources."pull-write-1.1.4" // { - dependencies = [ - sources."looper-4.0.0" - ]; - }) - sources."pull-write-file-0.2.4" - sources."pull-ws-3.3.2" - sources."pump-2.0.1" - sources."push-stream-10.1.2" - sources."push-stream-to-pull-stream-1.0.3" - sources."railroad-diagrams-1.0.0" - sources."randexp-0.4.6" - (sources."randomatic-3.1.1" // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.2" - ]; - }) - sources."rc-1.2.8" - 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."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.2" - sources."micromatch-3.1.10" - ]; - }) - sources."regex-cache-0.4.4" - sources."regex-not-1.0.2" - sources."relative-url-1.0.2" - sources."remark-3.2.3" - sources."remark-html-2.0.2" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" - sources."resolve-1.11.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.4" - ]; - }) - sources."rng-0.2.2" - sources."rwlock-5.0.0" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."secret-handshake-1.1.20" - (sources."secret-stack-5.1.1" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.2" - ]; - }) - sources."semver-5.7.0" - sources."separator-escape-0.0.0" - sources."set-blocking-2.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."sha.js-2.4.5" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."shellsubstitute-1.2.0" - sources."signal-exit-3.0.2" - sources."simple-concat-1.0.0" - sources."simple-get-2.8.1" - sources."smart-buffer-4.0.2" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - sources."isobject-3.0.1" - ]; - }) - sources."snapdragon-util-3.0.1" - sources."socks-2.3.2" - sources."sodium-browserify-1.2.7" - (sources."sodium-browserify-tweetnacl-0.2.6" // { - dependencies = [ - sources."sha.js-2.4.11" - sources."tweetnacl-1.0.1" - ]; - }) - sources."sodium-chloride-1.1.2" - 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" - sources."split-buffer-1.0.0" - sources."split-string-3.1.0" - (sources."ssb-blobs-1.2.1" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.2" - ]; - }) - sources."ssb-caps-1.0.1" - (sources."ssb-client-4.7.7" // { - dependencies = [ - sources."ssb-config-3.3.1" - ]; - }) - sources."ssb-config-2.3.9" - (sources."ssb-db-18.6.5" // { - dependencies = [ - sources."abstract-leveldown-5.0.0" - sources."deferred-leveldown-4.0.2" - sources."encoding-down-5.0.4" - sources."level-4.0.0" - sources."level-iterator-stream-3.0.1" - sources."level-packager-3.1.0" - sources."leveldown-4.0.2" - sources."levelup-3.1.1" - sources."nan-2.12.1" - ]; - }) - sources."ssb-ebt-5.6.7" - sources."ssb-friends-3.1.13" - sources."ssb-keys-7.1.7" - sources."ssb-links-3.0.8" - sources."ssb-msgs-5.2.0" - (sources."ssb-query-2.4.2" // { - dependencies = [ - sources."flumeview-query-7.2.0" - sources."map-filter-reduce-3.2.2" - ]; - }) - sources."ssb-ref-2.13.9" - sources."ssb-validate-4.0.4" - sources."ssb-ws-5.1.1" - sources."stack-0.1.0" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."statistics-3.3.0" - sources."stream-to-pull-stream-1.7.3" - sources."string-width-1.0.2" - sources."string.prototype.trim-1.1.2" - sources."string_decoder-1.1.1" - sources."stringify-entities-1.3.2" - sources."strip-ansi-3.0.1" - sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" - (sources."tape-4.11.0" // { - dependencies = [ - sources."glob-7.1.4" - ]; - }) - (sources."tar-fs-1.16.3" // { - dependencies = [ - sources."pump-1.0.3" - ]; - }) - sources."tar-stream-1.6.2" - sources."text-table-0.2.0" - sources."through-2.3.8" - sources."to-buffer-1.1.1" - sources."to-camel-case-1.0.0" - sources."to-no-case-1.0.2" - 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-space-case-1.0.0" - sources."to-vfile-1.0.0" - sources."trim-0.0.1" - sources."trim-lines-1.1.2" - sources."trim-trailing-lines-1.1.2" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."tweetnacl-auth-0.3.1" - sources."typedarray-0.0.6" - sources."typedarray-to-buffer-3.1.5" - sources."typewise-1.0.3" - sources."typewise-core-1.2.0" - sources."typewiselite-1.0.0" - sources."uint48be-2.0.1" - sources."ultron-1.0.2" - sources."unherit-1.1.2" - sources."unified-2.1.4" - sources."union-value-1.0.1" - sources."unist-util-is-3.0.0" - sources."unist-util-visit-1.4.1" - sources."unist-util-visit-parents-2.1.2" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - sources."isobject-3.0.1" - ]; - }) - sources."untildify-2.1.0" - sources."urix-0.1.0" - sources."use-3.1.1" - sources."user-home-2.0.0" - sources."util-deprecate-1.0.2" - sources."vfile-1.4.0" - sources."vfile-find-down-1.0.0" - sources."vfile-find-up-1.0.0" - sources."vfile-reporter-1.5.0" - sources."vfile-sort-1.0.0" - sources."ware-1.3.0" - sources."which-1.3.1" - sources."which-pm-runs-1.0.0" - sources."wide-align-1.1.3" - sources."word-wrap-1.2.3" - sources."wrap-fn-0.1.5" - sources."wrappy-1.0.2" - sources."ws-1.1.5" - sources."xtend-4.0.1" - sources."zerr-1.0.4" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "network protocol layer for secure-scuttlebutt"; - homepage = https://github.com/ssbc/scuttlebot; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; @@ -60400,10 +59744,10 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "11.0.2"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-11.0.2.tgz"; - sha512 = "TjjjwUdPU+STkUyxvZFtkWOTRXdNDNMfot9Z/f97eEeyjPAV69o1TmJrNAlDbvpPu1JEjCoWiGCjkel7kWNF4A=="; + url = "https://registry.npmjs.org/serve/-/serve-11.1.0.tgz"; + sha512 = "+4wpDtOSS+4ZLyDWMxThutA3iOTawX2+yDovOI8cjOUOmemyvNlHyFAsezBlSgbZKTYChI3tzA1Mh0z6XZ62qA=="; }; dependencies = [ sources."@zeit/schemas-2.6.0" @@ -60471,7 +59815,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" - (sources."serve-handler-6.0.2" // { + (sources."serve-handler-6.1.0" // { dependencies = [ sources."mime-db-1.33.0" sources."mime-types-2.1.18" @@ -60516,7 +59860,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.7" sources."after-0.8.1" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -60854,7 +60198,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."kind-of-6.0.2" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."micromatch-3.1.10" @@ -61125,20 +60469,19 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.186.0"; + version = "1.193.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.186.0.tgz"; - sha512 = "yMoX4x6NlWTmY9JTGeWU6+BM7cHdZey4fBDJmNYITndMa50lZ4nk9cJg52ZAN300CraOzlgt3FKd56GNT+eiVQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.193.1.tgz"; + sha512 = "bwxrpR8T5tOQgLGwBMq7BYKDvLQRVsB3znMJpdZpYnMCY34MpmkuDhU+546TA8kmp5cLPCg+0BlaO7Yrj3Ouag=="; }; dependencies = [ - sources."@snyk/composer-lockfile-parser-1.0.2" + sources."@snyk/composer-lockfile-parser-1.0.3" sources."@snyk/dep-graph-1.8.1" sources."@snyk/gemfile-1.2.0" sources."@types/agent-base-4.2.0" sources."@types/debug-4.1.4" sources."@types/events-3.0.0" - sources."@types/node-12.0.10" - sources."@types/sinon-7.0.11" + sources."@types/node-12.6.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.3.0" @@ -61194,7 +60537,7 @@ in sources."crypto-random-string-1.0.0" (sources."data-uri-to-buffer-2.0.1" // { dependencies = [ - sources."@types/node-8.10.49" + sources."@types/node-8.10.50" ]; }) sources."debug-3.2.6" @@ -61218,7 +60561,7 @@ in sources."esutils-2.0.2" sources."execa-1.0.0" sources."extend-3.0.2" - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" @@ -61256,7 +60599,7 @@ in sources."ms-2.0.0" ]; }) - sources."https-proxy-agent-2.2.1" + sources."https-proxy-agent-2.2.2" sources."iconv-lite-0.4.24" sources."immediate-3.0.6" sources."import-lazy-2.1.0" @@ -61264,7 +60607,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-6.4.1" // { + (sources."inquirer-6.5.0" // { dependencies = [ sources."ansi-escapes-3.2.0" ]; @@ -61294,7 +60637,7 @@ in sources."esprima-4.0.1" ]; }) - (sources."jszip-3.2.1" // { + (sources."jszip-3.2.2" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" @@ -61307,7 +60650,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."lie-3.3.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" @@ -61378,6 +60721,7 @@ in sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" + sources."rimraf-2.6.3" sources."run-async-2.3.0" sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" @@ -61419,7 +60763,7 @@ in ]; }) sources."snyk-module-1.9.1" - (sources."snyk-mvn-plugin-2.3.0" // { + (sources."snyk-mvn-plugin-2.3.1" // { dependencies = [ sources."tslib-1.9.3" ]; @@ -61427,7 +60771,7 @@ in sources."snyk-nodejs-lockfile-parser-1.13.0" sources."snyk-nuget-plugin-1.10.0" sources."snyk-paket-parser-1.4.3" - sources."snyk-php-plugin-1.6.2" + sources."snyk-php-plugin-1.6.3" sources."snyk-policy-1.13.5" sources."snyk-python-plugin-1.10.2" sources."snyk-resolve-1.0.1" @@ -61436,9 +60780,9 @@ in sources."semver-5.7.0" ]; }) - (sources."snyk-sbt-plugin-2.4.2" // { + (sources."snyk-sbt-plugin-2.5.6" // { dependencies = [ - sources."tslib-1.9.3" + sources."tmp-0.1.0" ]; }) sources."snyk-tree-1.0.0" @@ -61669,7 +61013,7 @@ in 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."https-proxy-agent-2.2.2" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" @@ -61735,7 +61079,7 @@ in sources."resolve-1.11.1" sources."restore-cursor-2.0.0" sources."round-to-3.0.0" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."sax-1.2.4" sources."semver-5.7.0" sources."semver-diff-2.1.0" @@ -61745,7 +61089,7 @@ in 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."spdx-license-ids-3.0.5" sources."speedtest-net-1.5.1" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -61783,6 +61127,788 @@ in bypassCache = true; reconstructLock = true; }; + ssb-server = nodeEnv.buildNodePackage { + name = "ssb-server"; + packageName = "ssb-server"; + version = "15.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-server/-/ssb-server-15.0.2.tgz"; + sha512 = "xY3H+E3P5vSQREtoBohUT/1Lhx01NNTkooud29h+fhwXX1+Erowds/b0M+HpVpVClY8/yR4/0jATBg0oKvD+VA=="; + }; + dependencies = [ + sources."abstract-leveldown-6.0.3" + sources."aligned-block-file-1.2.2" + 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.2" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.2.1" + sources."arrify-1.0.1" + sources."assign-symbols-1.0.0" + sources."async-each-1.0.3" + sources."async-single-1.0.5" + sources."async-write-2.1.0" + sources."atob-2.1.2" + sources."atomic-file-1.1.5" + sources."attach-ware-1.1.1" + 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."base64-url-2.2.2" + sources."bash-color-0.0.4" + sources."binary-extensions-1.13.1" + sources."binary-search-1.3.5" + (sources."bl-0.8.2" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.0.34" + sources."string_decoder-0.10.31" + ]; + }) + sources."blake2s-1.1.0" + sources."brace-expansion-1.1.11" + sources."braces-1.8.5" + sources."broadcast-stream-0.2.2" + sources."buffer-from-1.1.1" + sources."bytewise-1.1.0" + sources."bytewise-core-1.2.3" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."camelcase-2.1.1" + sources."ccount-1.0.4" + sources."chalk-1.1.3" + 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" + sources."chokidar-1.7.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."cli-cursor-1.0.2" + sources."co-3.1.0" + sources."code-point-at-1.1.0" + 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" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."cont-1.0.3" + sources."continuable-1.2.0" + (sources."continuable-hash-0.1.4" // { + dependencies = [ + sources."continuable-1.1.8" + ]; + }) + (sources."continuable-list-0.1.6" // { + dependencies = [ + sources."continuable-1.1.8" + ]; + }) + sources."continuable-para-1.2.0" + sources."continuable-series-1.2.0" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."cross-spawn-6.0.5" + sources."debug-4.1.1" + sources."decode-uri-component-0.2.0" + sources."deep-equal-1.0.1" + sources."deep-extend-0.6.0" + sources."deferred-leveldown-5.1.0" + sources."define-properties-1.1.3" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."defined-1.0.0" + sources."detab-1.0.2" + sources."discontinuous-range-1.0.0" + sources."dynamic-dijkstra-1.0.2" + sources."ed2curve-0.1.4" + sources."elegant-spinner-1.0.1" + sources."emoji-named-characters-1.0.2" + sources."emoji-server-1.0.0" + sources."encoding-down-6.1.0" + sources."epidemic-broadcast-trees-7.0.0" + sources."errno-0.1.7" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" + sources."escape-string-regexp-1.0.5" + sources."exit-hook-1.1.1" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."explain-error-1.0.4" + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."extend.js-0.0.2" + sources."extglob-0.3.2" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.4" + (sources."flumecodec-0.0.0" // { + dependencies = [ + sources."level-codec-6.2.0" + ]; + }) + sources."flumedb-1.1.0" + sources."flumelog-offset-3.4.2" + sources."flumeview-hashtable-1.1.1" + sources."flumeview-level-3.0.13" + (sources."flumeview-query-6.3.0" // { + dependencies = [ + sources."map-filter-reduce-3.2.2" + ]; + }) + (sources."flumeview-reduce-1.3.16" // { + dependencies = [ + (sources."atomic-file-2.0.1" // { + dependencies = [ + sources."flumecodec-0.0.1" + ]; + }) + sources."level-codec-6.2.0" + ]; + }) + sources."for-each-0.3.3" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."fragment-cache-0.2.1" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.9" + sources."function-bind-1.1.1" + sources."get-value-2.0.6" + sources."glob-6.0.4" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."globby-4.1.0" + sources."gossip-query-2.0.2" + sources."graceful-fs-4.2.0" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-network-0.0.1" + sources."has-symbols-1.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."hashlru-2.3.0" + sources."he-0.5.0" + sources."heap-0.2.6" + sources."hoox-0.0.1" + sources."idb-kv-store-4.4.0" + sources."immediate-3.2.3" + sources."increment-buffer-1.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."int53-1.0.0" + sources."ip-1.1.5" + sources."irregular-plurals-1.4.0" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-alphabetical-1.0.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" + sources."is-canonical-base64-1.1.1" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-date-object-1.0.1" + sources."is-decimal-1.0.3" + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-dotfile-1.0.3" + sources."is-electron-2.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-1.0.0" + sources."is-glob-2.0.1" + sources."is-hexadecimal-1.0.3" + sources."is-number-2.1.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" + sources."is-typedarray-1.0.0" + sources."is-valid-domain-0.0.11" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-2.1.0" + sources."json-buffer-2.0.11" + sources."kind-of-3.2.2" + sources."layered-graph-1.1.3" + sources."level-5.0.1" + sources."level-codec-9.0.1" + sources."level-concat-iterator-2.0.1" + sources."level-errors-2.0.1" + (sources."level-iterator-stream-4.0.1" // { + dependencies = [ + sources."readable-stream-3.4.0" + ]; + }) + sources."level-js-4.0.1" + sources."level-packager-5.0.2" + sources."level-post-1.0.7" + (sources."level-sublevel-6.6.5" // { + dependencies = [ + (sources."abstract-leveldown-0.12.4" // { + dependencies = [ + sources."xtend-3.0.0" + ]; + }) + sources."deferred-leveldown-0.2.0" + sources."isarray-0.0.1" + (sources."levelup-0.19.1" // { + dependencies = [ + sources."xtend-3.0.0" + ]; + }) + sources."ltgt-2.1.3" + sources."prr-0.0.0" + sources."readable-stream-1.0.34" + sources."semver-5.1.1" + sources."string_decoder-0.10.31" + ]; + }) + (sources."leveldown-5.1.1" // { + dependencies = [ + sources."node-gyp-build-4.1.0" + ]; + }) + sources."levelup-4.1.0" + sources."libnested-1.4.1" + sources."libsodium-0.7.4" + sources."libsodium-wrappers-0.7.4" + sources."lodash.get-4.4.2" + sources."log-symbols-1.0.2" + sources."log-update-1.0.2" + sources."longest-streak-1.0.0" + sources."looper-4.0.0" + sources."lossy-store-1.2.4" + sources."ltgt-2.2.1" + sources."map-cache-0.2.2" + sources."map-filter-reduce-2.2.1" + sources."map-merge-1.1.0" + sources."map-visit-1.0.0" + sources."markdown-table-0.4.0" + sources."math-random-1.0.4" + sources."mdmanifest-1.0.8" + sources."micromatch-2.3.11" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."monotonic-timestamp-0.0.9" + sources."moo-0.4.3" + sources."ms-2.1.2" + sources."multiblob-1.13.4" + sources."multiblob-http-1.0.0" + sources."multicb-1.2.2" + sources."multiserver-3.3.6" + sources."multiserver-address-1.0.1" + sources."multiserver-scopes-1.0.0" + sources."muxrpc-6.4.2" + sources."muxrpc-usage-2.1.0" + sources."muxrpc-validation-3.0.2" + sources."muxrpcli-3.1.1" + (sources."mv-2.1.1" // { + dependencies = [ + sources."rimraf-2.4.5" + ]; + }) + sources."nan-2.14.0" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) + sources."napi-macros-1.8.2" + sources."ncp-2.0.0" + sources."nearley-2.16.0" + sources."nice-try-1.0.5" + sources."node-gyp-build-3.9.0" + sources."non-private-ip-1.4.4" + sources."normalize-path-2.1.1" + sources."normalize-uri-1.1.2" + sources."npm-prefix-1.2.0" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + sources."object-inspect-1.6.0" + sources."object-keys-1.1.1" + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."observ-0.2.0" + sources."observ-debounce-1.1.1" + sources."obv-0.0.1" + sources."on-change-network-0.0.2" + sources."on-wakeup-1.0.1" + sources."once-1.4.0" + sources."onetime-1.1.0" + sources."opencollective-postinstall-2.0.2" + sources."options-0.0.6" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."packet-stream-2.0.4" + sources."packet-stream-codec-1.1.2" + sources."parse-entities-1.2.2" + sources."parse-glob-3.0.4" + sources."pascalcase-0.1.1" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."plur-2.1.2" + sources."posix-character-classes-0.1.1" + sources."preserve-0.2.0" + sources."private-box-0.3.0" + sources."process-nextick-args-2.0.1" + sources."promisize-1.1.2" + sources."prr-1.0.1" + sources."pull-abortable-4.0.0" + sources."pull-box-stream-1.0.13" + sources."pull-cat-1.1.11" + sources."pull-catch-1.0.1" + sources."pull-cont-0.1.1" + sources."pull-cursor-3.0.0" + sources."pull-defer-0.2.3" + sources."pull-file-1.1.0" + sources."pull-flatmap-0.0.1" + (sources."pull-fs-1.1.6" // { + dependencies = [ + sources."pull-file-0.5.0" + ]; + }) + sources."pull-glob-1.0.7" + (sources."pull-goodbye-0.0.2" // { + dependencies = [ + sources."pull-stream-3.5.0" + ]; + }) + sources."pull-handshake-1.1.4" + sources."pull-hash-1.0.0" + sources."pull-inactivity-2.1.3" + sources."pull-level-2.0.4" + sources."pull-live-1.0.1" + sources."pull-looper-1.0.0" + sources."pull-many-1.0.9" + sources."pull-next-1.0.1" + sources."pull-notify-0.1.1" + sources."pull-pair-1.1.0" + sources."pull-paramap-1.2.2" + sources."pull-ping-2.0.2" + sources."pull-pushable-2.2.0" + sources."pull-rate-1.0.2" + sources."pull-reader-1.3.1" + sources."pull-sink-through-0.0.0" + sources."pull-sort-1.0.2" + sources."pull-stream-3.6.13" + (sources."pull-through-1.0.18" // { + dependencies = [ + sources."looper-3.0.0" + ]; + }) + sources."pull-traverse-1.0.3" + sources."pull-utf8-decoder-1.0.2" + (sources."pull-window-2.1.4" // { + dependencies = [ + sources."looper-2.0.0" + ]; + }) + sources."pull-write-1.1.4" + sources."pull-write-file-0.2.4" + sources."pull-ws-3.3.2" + sources."push-stream-10.1.2" + sources."push-stream-to-pull-stream-1.0.3" + sources."railroad-diagrams-1.0.0" + sources."randexp-0.4.6" + (sources."randomatic-3.1.1" // { + dependencies = [ + sources."is-number-4.0.0" + sources."kind-of-6.0.2" + ]; + }) + sources."range-parser-1.2.1" + sources."rc-1.2.8" + 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-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."regex-cache-0.4.4" + sources."regex-not-1.0.2" + sources."relative-url-1.0.2" + (sources."remark-3.2.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."remark-html-2.0.2" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-1.11.1" + sources."resolve-url-0.2.1" + sources."restore-cursor-1.0.1" + sources."resumer-0.0.0" + sources."ret-0.1.15" + sources."right-pad-1.0.1" + (sources."rimraf-2.6.3" // { + dependencies = [ + sources."glob-7.1.4" + ]; + }) + sources."rng-0.2.2" + sources."rwlock-5.0.0" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."secret-handshake-1.1.20" + sources."secret-stack-6.2.1" + sources."semver-5.7.0" + sources."separator-escape-0.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."sha.js-2.4.5" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shellsubstitute-1.2.0" + sources."smart-buffer-4.0.2" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" + sources."socks-2.3.2" + sources."sodium-browserify-1.2.7" + (sources."sodium-browserify-tweetnacl-0.2.6" // { + dependencies = [ + sources."sha.js-2.4.11" + sources."tweetnacl-1.0.1" + ]; + }) + sources."sodium-chloride-1.1.2" + 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" + sources."split-buffer-1.0.0" + sources."split-string-3.1.0" + sources."ssb-blobs-1.2.1" + sources."ssb-caps-1.1.0" + sources."ssb-client-4.7.7" + sources."ssb-config-3.3.1" + sources."ssb-db-19.2.0" + sources."ssb-ebt-5.6.7" + sources."ssb-friends-4.1.4" + sources."ssb-gossip-1.1.0" + sources."ssb-invite-2.1.3" + sources."ssb-keys-7.1.7" + sources."ssb-links-3.0.8" + sources."ssb-local-1.0.0" + sources."ssb-logging-1.0.0" + sources."ssb-master-1.0.3" + sources."ssb-msgs-5.2.0" + sources."ssb-no-auth-1.0.0" + sources."ssb-onion-1.0.0" + (sources."ssb-ooo-1.3.1" // { + dependencies = [ + sources."flumecodec-0.0.1" + sources."level-codec-6.2.0" + ]; + }) + sources."ssb-plugins-1.0.0" + (sources."ssb-query-2.4.3" // { + dependencies = [ + sources."flumeview-query-7.2.1" + sources."map-filter-reduce-3.2.2" + ]; + }) + sources."ssb-ref-2.13.9" + sources."ssb-replicate-1.3.0" + sources."ssb-unix-socket-1.0.0" + sources."ssb-validate-4.0.4" + sources."ssb-ws-6.2.3" + sources."stack-0.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."statistics-3.3.0" + (sources."stream-to-pull-stream-1.7.3" // { + dependencies = [ + sources."looper-3.0.0" + ]; + }) + sources."string-width-1.0.2" + sources."string.prototype.trim-1.1.2" + sources."string_decoder-1.1.1" + sources."stringify-entities-1.3.2" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + (sources."tape-4.11.0" // { + dependencies = [ + sources."glob-7.1.4" + ]; + }) + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."to-camel-case-1.0.0" + sources."to-no-case-1.0.2" + 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-space-case-1.0.0" + sources."to-vfile-1.0.0" + sources."trim-0.0.1" + sources."trim-lines-1.1.2" + sources."trim-trailing-lines-1.1.2" + sources."tweetnacl-0.14.5" + sources."tweetnacl-auth-0.3.1" + sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" + sources."typewise-1.0.3" + sources."typewise-core-1.2.0" + sources."typewiselite-1.0.0" + sources."uint48be-2.0.1" + sources."ultron-1.0.2" + sources."unherit-1.1.2" + sources."unified-2.1.4" + sources."union-value-1.0.1" + sources."unist-util-is-3.0.0" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + sources."isobject-3.0.1" + ]; + }) + sources."untildify-2.1.0" + sources."urix-0.1.0" + sources."use-3.1.1" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."vfile-1.4.0" + sources."vfile-find-down-1.0.0" + sources."vfile-find-up-1.0.0" + sources."vfile-reporter-1.5.0" + sources."vfile-sort-1.0.0" + sources."ware-1.3.0" + sources."which-1.3.1" + sources."word-wrap-1.2.3" + sources."wrap-fn-0.1.5" + sources."wrappy-1.0.2" + sources."ws-1.1.5" + sources."xtend-4.0.2" + sources."zerr-1.0.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "network protocol layer for secure-scuttlebutt"; + homepage = https://github.com/ssbc/ssb-server; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; stackdriver-statsd-backend = nodeEnv.buildNodePackage { name = "stackdriver-statsd-backend"; packageName = "stackdriver-statsd-backend"; @@ -62058,7 +62184,7 @@ in }) sources."finalhandler-1.1.2" sources."for-in-1.0.2" - sources."form-data-2.4.0" + sources."form-data-2.5.0" sources."formidable-1.2.1" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" @@ -62078,7 +62204,7 @@ in sources."graceful-fs-4.2.0" (sources."graphlib-2.1.7" // { dependencies = [ - sources."lodash-4.17.11" + sources."lodash-4.17.14" ]; }) sources."growl-1.9.2" @@ -62149,7 +62275,7 @@ in sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.3.4" // { dependencies = [ - sources."lodash-4.17.11" + sources."lodash-4.17.14" ]; }) sources."jsonfile-2.4.0" @@ -62485,7 +62611,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."yallist-2.1.2" sources."z-schema-3.25.1" ]; @@ -62509,8 +62635,8 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-12.0.10" - sources."ajv-6.10.0" + sources."@types/node-12.6.2" + sources."ajv-6.10.1" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -62583,7 +62709,7 @@ in sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sandwich-stream-2.0.2" sources."set-blocking-2.0.0" @@ -62628,15 +62754,15 @@ in tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; - version = "0.24.0"; + version = "0.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/tern/-/tern-0.24.0.tgz"; - sha512 = "VQYPvIUtWm+EFASQc2mAaG7rzxdwJDu2ahFEGfqq6i6CpNnB454KDKWpzMbZDIjz9+CIE5FDrFsEYcjiy7aYrQ=="; + url = "https://registry.npmjs.org/tern/-/tern-0.24.1.tgz"; + sha512 = "6jK0DcgziZ0NAitZNncg+do/fKGh8hQJShcVU7dHoAljdckr7qr2oozd4l4kTIA7M+0FoKXy6gvRBLO8oWpTEw=="; }; dependencies = [ - sources."acorn-6.1.1" - sources."acorn-loose-6.0.0" - sources."acorn-walk-6.1.1" + sources."acorn-6.2.0" + sources."acorn-loose-6.1.0" + sources."acorn-walk-6.2.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" @@ -62677,10 +62803,10 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.2.5"; + version = "11.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.2.5.tgz"; - sha512 = "1yEEf0mPEVDfIZII0yWz9VVlo0xF51cfvqHubPtsylxHpQdfgCDX3cLHXhDVT2RTv8lrOGTrudeXtYV3NPoNdQ=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.2.6.tgz"; + sha512 = "TkiRpF6kdP2WMSeJSZjeLU2Kec8+kd369H4zIdTOBSiQ6QgWG8aM2MUw9R07HFe28G9CRTU6wF7C9hguWBnAyg=="; }; dependencies = [ sources."@azu/format-text-1.0.1" @@ -62688,7 +62814,7 @@ in 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/fixer-formatter-3.1.6" sources."@textlint/kernel-3.1.6" sources."@textlint/linter-formatter-3.1.5" sources."@textlint/markdown-to-ast-6.1.3" @@ -62713,7 +62839,6 @@ in 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.5" @@ -62725,7 +62850,7 @@ in sources."deep-equal-1.0.1" sources."deep-is-0.1.3" sources."define-properties-1.1.3" - sources."diff-2.2.3" + sources."diff-4.0.1" sources."error-ex-1.3.2" sources."es-abstract-1.13.0" sources."es-to-primitive-1.2.0" @@ -62734,9 +62859,10 @@ in sources."extend-3.0.2" sources."fast-levenshtein-2.0.6" sources."fault-1.0.3" - sources."file-entry-cache-2.0.0" + sources."file-entry-cache-5.0.1" sources."find-up-2.1.0" - sources."flat-cache-1.3.4" + sources."flat-cache-2.0.1" + sources."flatted-2.0.1" sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -62770,7 +62896,7 @@ in sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" sources."json-stable-stringify-1.0.1" - (sources."json5-1.0.1" // { + (sources."json5-2.1.0" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -62779,7 +62905,7 @@ in sources."levn-0.3.0" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."log-symbols-1.0.2" sources."map-like-2.0.0" sources."markdown-escapes-1.0.3" @@ -62810,11 +62936,7 @@ in sources."pluralize-2.0.0" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" - (sources."rc-config-loader-2.0.3" // { - dependencies = [ - sources."debug-3.2.6" - ]; - }) + sources."rc-config-loader-2.0.4" sources."read-pkg-1.1.0" (sources."read-pkg-up-3.0.0" // { dependencies = [ @@ -62840,7 +62962,7 @@ in 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."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" sources."state-toggle-1.0.2" sources."string-width-1.0.2" @@ -62881,10 +63003,10 @@ in sources."vfile-message-1.1.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" - sources."write-0.2.1" + sources."write-1.0.3" sources."x-is-string-0.1.0" sources."xml-escape-1.1.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -63156,7 +63278,7 @@ in 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."spdx-license-ids-3.0.5" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -63242,7 +63364,7 @@ in 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."xtend-4.0.2" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -63432,10 +63554,10 @@ in 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.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-period-in-list-item/-/textlint-rule-period-in-list-item-0.3.1.tgz"; - sha512 = "P96DkBVAymn/qCdzGVT4751xdxF4R7yY7Nj2jLkRxakEAOttU+YRLcSiHsIcVsH/3KoZW7pRdOLlMy5AUWw5rA=="; + url = "https://registry.npmjs.org/textlint-rule-period-in-list-item/-/textlint-rule-period-in-list-item-0.3.2.tgz"; + sha512 = "47yQZ14SbNfyBGKcSV/89eXwxLlGIwj8WzbKk1jvDh/uPy59skVfFbWoF4tUn09mYnRyVldMsdqB0llYgQMLUA=="; }; dependencies = [ sources."array.prototype.find-2.1.0" @@ -63476,7 +63598,7 @@ in 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."lodash-4.17.14" sources."split-lines-2.0.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -63506,7 +63628,7 @@ in 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."lodash-4.17.14" sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -63695,7 +63817,7 @@ in ]; }) sources."keep-alive-agent-0.0.1" - sources."lodash-4.17.11" + sources."lodash-4.17.14" (sources."lomstream-1.1.0" // { dependencies = [ sources."assert-plus-0.1.5" @@ -63720,7 +63842,11 @@ in sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" sources."read-1.0.7" - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) (sources."restify-clients-1.5.2" // { dependencies = [ sources."assert-plus-1.0.0" @@ -63739,7 +63865,7 @@ in ]; }) sources."rimraf-2.4.4" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" sources."semver-5.1.0" @@ -63773,7 +63899,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strsplit-1.0.0" (sources."tabula-1.10.0" // { dependencies = [ @@ -63882,10 +64012,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz"; - sha512 = "7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz"; + sha512 = "ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g=="; }; buildInputs = globalBuildInputs; meta = { @@ -63957,16 +64087,16 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.44"; + version = "1.4.46"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.44.tgz"; - sha512 = "lVZAgb+M09yWXqc/lsA/E5yUM6P4APOjDK0dMHmnpu0M+FXDeEBcoarCvHg6hoJ8ooM6EHqtItH9mCfT70cGqw=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.46.tgz"; + sha512 = "mJFQJQftgrdqP4npnUd9P9WUeMsTfrDeStfTuUG8g58ELxm2RKvLsphxzKK5HkI+u61MasftxdGvcGPUs3gOzQ=="; }; dependencies = [ sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" @@ -64169,8 +64299,8 @@ in sources."lcid-2.0.0" sources."locate-path-3.0.0" sources."locks-0.2.2" - sources."lodash-4.17.11" - sources."lodash.merge-4.6.1" + sources."lodash-4.17.14" + sources."lodash.merge-4.6.2" sources."lru-cache-4.1.5" sources."map-age-cleaner-0.1.3" sources."media-typer-0.3.0" @@ -64223,14 +64353,10 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."open-6.1.0" - sources."os-homedir-2.0.0" + sources."os-homedir-1.0.2" sources."os-locale-3.1.0" sources."os-tmpdir-1.0.2" - (sources."osenv-0.1.5" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) + sources."osenv-0.1.5" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" @@ -64318,7 +64444,7 @@ in 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."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."stack-trace-0.0.10" @@ -64476,7 +64602,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -64554,7 +64680,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."extend-shallow-2.0.1" - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" @@ -64595,7 +64721,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.4.1" + sources."inquirer-6.5.0" sources."is-3.3.0" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -64618,7 +64744,7 @@ in sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."klaw-1.3.1" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."log-symbols-2.2.0" sources."lowercase-keys-1.0.1" (sources."make-dir-1.3.0" // { @@ -64670,14 +64796,18 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-metadata-1.0.0" - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."recursive-readdir-2.2.2" sources."request-2.88.0" sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" sources."rxjs-6.5.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { dependencies = [ @@ -64695,7 +64825,11 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) (sources."strip-ansi-5.2.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -64740,7 +64874,7 @@ in sources."wordwrap-0.0.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."yaml-js-0.0.8" sources."yauzl-2.10.0" ]; @@ -64757,26 +64891,26 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.8.4"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.8.4.tgz"; - sha512 = "4853iVYjlYrIi/ilMlm3VJfmv8K+KbQEkI9Wb0/hsy2EZEek/zBEgAKZQwAYD52HpVQZ9Y/RSuzle2UwvRdbOQ=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.9.2.tgz"; + sha512 = "JKDt7plf3FOCK6X4OpK6ZETFFFw0AkrnmPqwyyi1Jc/irFz6eNVRBlodXk8rikQuY5MKbi+6hVOXitHPXbZc+w=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" sources."@apollographql/apollo-tools-0.3.7" - sources."@apollographql/graphql-playground-html-1.6.20" + sources."@apollographql/graphql-playground-html-1.6.24" sources."@babel/code-frame-7.0.0" - (sources."@babel/core-7.4.5" // { + (sources."@babel/core-7.5.4" // { dependencies = [ sources."semver-5.7.0" ]; }) - sources."@babel/generator-7.4.4" + sources."@babel/generator-7.5.0" 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.4" - sources."@babel/helper-create-class-features-plugin-7.4.4" + sources."@babel/helper-create-class-features-plugin-7.5.0" 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" @@ -64793,39 +64927,41 @@ in sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.4.4" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.4.4" - sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.5" + sources."@babel/helpers-7.5.4" + sources."@babel/highlight-7.5.0" + sources."@babel/parser-7.5.0" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" - sources."@babel/plugin-proposal-class-properties-7.4.4" + sources."@babel/plugin-proposal-class-properties-7.5.0" + sources."@babel/plugin-proposal-dynamic-import-7.5.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.4.4" + sources."@babel/plugin-proposal-object-rest-spread-7.5.4" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.4.4" sources."@babel/plugin-syntax-async-generators-7.2.0" + sources."@babel/plugin-syntax-dynamic-import-7.2.0" sources."@babel/plugin-syntax-flow-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-syntax-typescript-7.3.3" sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.4.4" + sources."@babel/plugin-transform-async-to-generator-7.5.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" 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.4" + sources."@babel/plugin-transform-destructuring-7.5.0" sources."@babel/plugin-transform-dotall-regex-7.4.4" - sources."@babel/plugin-transform-duplicate-keys-7.2.0" + sources."@babel/plugin-transform-duplicate-keys-7.5.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" sources."@babel/plugin-transform-flow-strip-types-7.4.4" 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.4" - sources."@babel/plugin-transform-modules-systemjs-7.4.4" + sources."@babel/plugin-transform-modules-amd-7.5.0" + sources."@babel/plugin-transform-modules-commonjs-7.5.0" + sources."@babel/plugin-transform-modules-systemjs-7.5.0" sources."@babel/plugin-transform-modules-umd-7.2.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" sources."@babel/plugin-transform-new-target-7.4.4" @@ -64839,9 +64975,9 @@ in sources."@babel/plugin-transform-sticky-regex-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-typescript-7.4.5" + sources."@babel/plugin-transform-typescript-7.5.2" sources."@babel/plugin-transform-unicode-regex-7.4.4" - (sources."@babel/preset-env-7.4.5" // { + (sources."@babel/preset-env-7.5.4" // { dependencies = [ sources."semver-5.7.0" ]; @@ -64850,8 +64986,8 @@ in sources."@babel/preset-typescript-7.3.3" sources."@babel/register-7.4.4" sources."@babel/template-7.4.4" - sources."@babel/traverse-7.4.5" - sources."@babel/types-7.4.4" + sources."@babel/traverse-7.5.0" + sources."@babel/types-7.5.0" sources."@hapi/address-2.0.0" sources."@hapi/hoek-6.2.4" sources."@hapi/joi-15.1.0" @@ -64884,25 +65020,25 @@ in sources."@types/long-4.0.0" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.0.10" + sources."@types/node-12.6.2" 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.8.0" - (sources."@vue/cli-ui-3.8.4" // { + sources."@vue/cli-shared-utils-3.9.0" + (sources."@vue/cli-ui-3.9.2" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.8.4" - sources."@vue/cli-ui-addon-widgets-3.8.4" + sources."@vue/cli-ui-addon-webpack-3.9.2" + sources."@vue/cli-ui-addon-widgets-3.9.2" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.9" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."aggregate-error-3.0.0" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" @@ -64913,15 +65049,11 @@ in ]; }) sources."apollo-cache-1.3.2" - (sources."apollo-cache-control-0.7.4" // { - dependencies = [ - sources."graphql-extensions-0.7.4" - ]; - }) + sources."apollo-cache-control-0.7.5" sources."apollo-cache-inmemory-1.6.2" sources."apollo-client-2.6.3" sources."apollo-datasource-0.5.0" - sources."apollo-engine-reporting-1.3.5" + sources."apollo-engine-reporting-1.3.6" sources."apollo-engine-reporting-protobuf-0.3.1" sources."apollo-env-0.5.1" sources."apollo-graphql-0.3.3" @@ -64932,19 +65064,15 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.18" sources."apollo-server-caching-0.4.0" - sources."apollo-server-core-2.6.7" + sources."apollo-server-core-2.6.9" sources."apollo-server-env-2.4.0" - sources."apollo-server-errors-2.3.0" - sources."apollo-server-express-2.6.7" - sources."apollo-server-plugin-base-0.5.6" - (sources."apollo-tracing-0.7.3" // { - dependencies = [ - sources."graphql-extensions-0.7.4" - ]; - }) + sources."apollo-server-errors-2.3.1" + sources."apollo-server-express-2.6.9" + sources."apollo-server-plugin-base-0.5.8" + sources."apollo-tracing-0.7.4" sources."apollo-upload-client-10.0.1" sources."apollo-utilities-1.3.2" - sources."arg-4.1.0" + sources."arg-4.1.1" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -64970,6 +65098,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."babel-core-7.0.0-bridge.0" + sources."babel-plugin-dynamic-import-node-2.3.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -64988,10 +65117,11 @@ in sources."inherits-2.0.3" ]; }) + sources."boolbase-1.0.0" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.6.3" + sources."browserslist-4.6.4" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -65004,12 +65134,13 @@ in sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30000979" + sources."caniuse-lite-1.0.30000984" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" sources."chardet-0.7.0" + sources."cheerio-1.0.0-rc.3" sources."chokidar-2.1.6" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { @@ -65067,8 +65198,11 @@ in ]; }) sources."crypto-random-string-1.0.0" + sources."css-select-1.2.0" + sources."css-what-2.1.3" sources."csv-parser-1.12.1" sources."dashdash-1.14.1" + sources."de-indent-1.0.2" (sources."debug-4.1.1" // { dependencies = [ sources."ms-2.1.2" @@ -65104,10 +65238,15 @@ in sources."depd-1.1.2" sources."deprecated-decorator-0.1.6" sources."destroy-1.0.4" + sources."detect-indent-6.0.0" sources."dicer-0.3.0" sources."didyoumean-1.2.1" sources."diff-4.0.1" sources."dir-glob-2.2.2" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.5.1" sources."dot-prop-4.2.0" (sources."download-5.0.3" // { dependencies = [ @@ -65120,7 +65259,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.6.2" - sources."electron-to-chromium-1.3.182" + sources."electron-to-chromium-1.3.191" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."entities-1.1.2" @@ -65170,7 +65309,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" + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -65243,13 +65382,13 @@ in sources."got-6.7.1" sources."graceful-fs-4.2.0" sources."graceful-readlink-1.0.1" - sources."graphql-14.4.1" + sources."graphql-14.4.2" (sources."graphql-anywhere-4.2.4" // { dependencies = [ sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.7.6" + sources."graphql-extensions-0.7.7" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.5" @@ -65270,7 +65409,13 @@ in ]; }) sources."hash.js-1.1.7" + sources."he-1.2.0" sources."homedir-polyfill-1.0.3" + (sources."htmlparser2-3.10.1" // { + dependencies = [ + sources."readable-stream-3.4.0" + ]; + }) sources."http-errors-1.7.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" @@ -65284,7 +65429,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.4.1" + sources."inquirer-6.5.0" sources."into-stream-2.0.1" sources."invariant-2.2.4" sources."ipaddr.js-1.9.0" @@ -65323,7 +65468,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" - sources."isbinaryfile-4.0.1" + sources."isbinaryfile-4.0.2" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" @@ -65354,9 +65499,9 @@ in sources."latest-version-3.1.0" sources."launch-editor-2.2.1" sources."locate-path-3.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.clonedeep-4.5.0" - sources."lodash.merge-4.6.1" + sources."lodash.merge-4.6.2" sources."lodash.sortby-4.7.0" sources."log-symbols-2.2.0" sources."long-4.0.0" @@ -65424,7 +65569,7 @@ in sources."semver-5.7.0" ]; }) - (sources."node-releases-1.1.24" // { + (sources."node-releases-1.1.25" // { dependencies = [ sources."semver-5.7.0" ]; @@ -65440,6 +65585,7 @@ in sources."normalize-path-3.0.0" sources."npm-conf-1.1.3" sources."npm-run-path-2.0.2" + sources."nth-check-1.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -65458,6 +65604,7 @@ in sources."object-keys-1.1.1" sources."object-path-0.11.4" sources."object-visit-1.0.1" + sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.0.3" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -65478,6 +65625,7 @@ in }) sources."parse-git-config-2.0.3" sources."parse-passwd-1.0.0" + sources."parse5-3.0.3" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -65500,7 +65648,7 @@ in sources."pinkie-promise-2.0.1" sources."pirates-4.0.1" sources."pkg-dir-3.0.0" - (sources."portfinder-1.0.20" // { + (sources."portfinder-1.0.21" // { dependencies = [ sources."debug-2.6.9" ]; @@ -65514,7 +65662,7 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.8.8" // { dependencies = [ - sources."@types/node-10.14.10" + sources."@types/node-10.14.12" ]; }) sources."proxy-addr-2.0.5" @@ -65550,7 +65698,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexp-tree-0.1.10" + sources."regexp-tree-0.1.11" sources."regexpu-core-4.5.4" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" @@ -65576,7 +65724,7 @@ in sources."ret-0.1.15" sources."retry-0.12.0" sources."rimraf-2.6.3" - sources."rss-parser-3.7.1" + sources."rss-parser-3.7.2" sources."run-async-2.3.0" sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" @@ -65754,7 +65902,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."typescript-3.5.2" + sources."typescript-3.5.3" sources."unbzip2-stream-1.3.3" (sources."undefsafe-2.0.2" // { dependencies = [ @@ -65795,6 +65943,13 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."vue-cli-plugin-apollo-0.20.0" + (sources."vue-jscodeshift-adapter-2.0.2" // { + dependencies = [ + sources."indent-string-4.0.0" + ]; + }) + sources."vue-sfc-descriptor-to-string-1.0.0" + sources."vue-template-compiler-2.6.10" sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -65805,7 +65960,7 @@ in sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."yallist-3.0.3" (sources."yaml-front-matter-3.4.1" // { dependencies = [ @@ -65837,7 +65992,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/highlight-7.0.0" + sources."@babel/highlight-7.5.0" sources."@emmetio/extract-abbreviation-0.1.6" sources."@starptech/expression-parser-0.9.0" sources."@starptech/hast-util-from-webparser-0.9.0" @@ -65849,14 +66004,14 @@ in sources."@starptech/rehype-minify-whitespace-0.9.0" sources."@starptech/rehype-webparser-0.9.0" sources."@starptech/webparser-0.9.0" - sources."@types/node-12.0.10" + sources."@types/node-12.6.2" 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-6.2.0" sources."acorn-jsx-5.0.1" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ajv-keywords-2.1.1" sources."amdefine-1.0.1" sources."ansi-align-2.0.0" @@ -66043,7 +66198,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" sources."extglob-0.3.2" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" @@ -66121,7 +66276,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-6.4.1" // { + (sources."inquirer-6.5.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."strip-ansi-5.2.0" @@ -66202,12 +66357,12 @@ in sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" sources."locate-path-2.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" 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.merge-4.6.2" sources."lodash.rest-4.0.5" sources."lodash.unescape-4.0.1" sources."loglevel-1.6.3" @@ -66540,7 +66695,7 @@ in 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."spdx-license-ids-3.0.5" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -66620,7 +66775,7 @@ in sources."tslib-1.10.0" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."typescript-3.5.2" + sources."typescript-3.5.3" (sources."typescript-eslint-parser-16.0.1" // { dependencies = [ sources."semver-5.5.0" @@ -66727,7 +66882,7 @@ in 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."xtend-4.0.2" sources."y18n-3.2.1" sources."yallist-2.1.2" (sources."yargs-4.7.1" // { @@ -66886,11 +67041,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/generator-7.4.4" - sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.5" + sources."@babel/generator-7.5.0" + sources."@babel/highlight-7.5.0" + sources."@babel/parser-7.5.0" sources."@babel/template-7.4.4" - sources."@babel/types-7.4.4" + sources."@babel/types-7.5.0" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -66916,7 +67071,7 @@ in sources."has-flag-3.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."mamacro-0.0.3" sources."source-map-0.5.7" sources."supports-color-5.5.0" @@ -66965,10 +67120,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.35.2"; + version = "4.35.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.35.2.tgz"; - sha512 = "TZAmorNymV4q66gAM/h90cEjG+N3627Q2MnkSgKlX/z3DlNVKUtqy57lz1WmZU2+FUZwzM+qm7cGaO95PyrX5A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.35.3.tgz"; + sha512 = "xggQPwr9ILlXzz61lHzjvgoqGU08v5+Wnut19Uv3GaTtzN4xBTcwnobodrXE142EL1tOiS5WVEButooGzcQzTA=="; }; dependencies = [ sources."@webassemblyjs/ast-1.8.5" @@ -66991,11 +67146,10 @@ in sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-6.1.1" - sources."acorn-dynamic-import-4.0.0" - sources."ajv-6.10.0" + sources."acorn-6.2.0" + sources."ajv-6.10.1" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.4.0" + sources."ajv-keywords-3.4.1" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -67047,7 +67201,7 @@ in sources."cacache-11.3.3" sources."cache-base-1.0.1" sources."chokidar-2.1.6" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { @@ -67364,7 +67518,7 @@ in sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-4.0.2" // { + (sources."terser-4.1.2" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -67424,7 +67578,7 @@ in }) sources."worker-farm-1.7.0" sources."wrappy-1.0.2" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.0.3" ]; @@ -67770,10 +67924,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-2.0.0.tgz"; - sha512 = "ohJpPjMtLMjsxi3Cgj+xmGTkuM6Eb58Ik5Esd/xsMSrgXI9IEwbSnlT4D1/FTypCrjDbWVdl68u0zNeTNiQ5FQ=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-2.0.1.tgz"; + sha512 = "isbO4uXmNAPgHA0rD3FAlxC6Z8nOf8zeUgntweT/BahVqjyxZa3KuNCusjyaeShqgx+T6+kZmzJvSOTTDIG3Qw=="; }; dependencies = [ sources."addr-to-ip-port-1.5.1" @@ -67796,6 +67950,7 @@ in sources."debug-3.2.6" sources."ms-2.1.2" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" ]; }) (sources."bittorrent-tracker-9.11.0" // { @@ -67809,6 +67964,7 @@ in (sources."block-stream2-1.1.0" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" ]; }) sources."bn.js-4.11.8" @@ -67840,6 +67996,7 @@ in (sources."concat-stream-1.6.2" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" ]; }) sources."core-util-is-1.0.2" @@ -67862,6 +68019,7 @@ in (sources."filestream-4.1.3" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" ]; }) sources."flatten-1.0.2" @@ -67872,7 +68030,7 @@ in }) sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.0.2" - sources."get-stdin-6.0.0" + sources."get-stdin-7.0.0" sources."glob-7.1.4" sources."he-1.2.0" sources."immediate-chunk-store-2.0.0" @@ -67938,7 +68096,7 @@ in sources."optjs-3.2.2" sources."package-json-versionify-1.0.4" sources."parse-numeric-range-0.0.2" - (sources."parse-torrent-6.1.2" // { + (sources."parse-torrent-7.0.0" // { dependencies = [ sources."simple-get-3.0.3" ]; @@ -67975,7 +68133,7 @@ in sources."run-parallel-limit-1.0.5" sources."run-series-1.1.8" sources."rusha-0.8.13" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."sax-1.1.4" sources."semver-5.1.1" sources."simple-concat-1.0.0" @@ -67985,6 +68143,7 @@ in sources."debug-4.1.1" sources."ms-2.1.2" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" ]; }) sources."simple-sha1-2.1.2" @@ -67993,6 +68152,7 @@ in sources."debug-3.2.6" sources."ms-2.1.2" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" ]; }) sources."speedometer-1.1.0" @@ -68001,7 +68161,11 @@ in sources."stream-to-blob-url-2.1.2" sources."stream-with-known-length-to-buffer-1.0.3" sources."string2compact-1.3.0" - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."thirty-two-1.0.2" sources."through-2.3.8" sources."thunky-0.1.0" @@ -68020,7 +68184,7 @@ in sources."unordered-array-remove-1.0.2" sources."upnp-device-client-1.0.2" sources."upnp-mediarenderer-client-1.2.4" - sources."url-join-4.0.0" + sources."url-join-4.0.1" (sources."ut_metadata-3.3.0" // { dependencies = [ sources."debug-3.2.6" @@ -68032,7 +68196,7 @@ in sources."util-deprecate-1.0.2" sources."videostream-3.2.0" sources."vlc-command-1.1.2" - (sources."webtorrent-0.104.0" // { + (sources."webtorrent-0.105.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -68045,7 +68209,7 @@ in sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -68067,14 +68231,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/highlight-7.0.0" + sources."@babel/highlight-7.5.0" sources."@babel/polyfill-7.4.4" sources."@babel/runtime-7.4.5" - sources."@babel/runtime-corejs2-7.4.5" + sources."@babel/runtime-corejs2-7.5.4" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" - sources."@snyk/composer-lockfile-parser-1.0.2" + sources."@snyk/composer-lockfile-parser-1.0.3" sources."@snyk/dep-graph-1.8.1" sources."@snyk/gemfile-1.2.0" sources."@szmarczak/http-timer-1.1.2" @@ -68082,8 +68246,7 @@ in sources."@types/debug-4.1.4" sources."@types/events-3.0.0" sources."@types/minimatch-3.0.3" - sources."@types/node-12.0.10" - sources."@types/sinon-7.0.11" + sources."@types/node-12.6.2" sources."@yarnpkg/lockfile-1.1.0" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" @@ -68319,7 +68482,7 @@ in sources."dashdash-1.14.1" (sources."data-uri-to-buffer-2.0.1" // { dependencies = [ - sources."@types/node-8.10.49" + sources."@types/node-8.10.50" ]; }) sources."debounce-1.2.0" @@ -68438,7 +68601,7 @@ in sources."eslint-visitor-keys-1.0.0" (sources."espree-5.0.1" // { dependencies = [ - sources."acorn-6.1.1" + sources."acorn-6.2.0" sources."acorn-jsx-5.0.1" ]; }) @@ -68475,7 +68638,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."external-editor-3.0.3" // { + (sources."external-editor-3.1.0" // { dependencies = [ sources."tmp-0.0.33" ]; @@ -68533,6 +68696,7 @@ in dependencies = [ sources."commander-2.9.0" sources."isexe-1.1.2" + sources."lodash-4.17.11" sources."which-1.2.4" ]; }) @@ -68596,7 +68760,7 @@ in ]; }) sources."http-signature-1.2.0" - (sources."https-proxy-agent-2.2.1" // { + (sources."https-proxy-agent-2.2.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -68612,7 +68776,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-6.4.1" // { + (sources."inquirer-6.5.0" // { dependencies = [ sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" @@ -68695,7 +68859,7 @@ in ]; }) sources."jsprim-1.4.1" - (sources."jszip-3.2.1" // { + (sources."jszip-3.2.2" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" @@ -68719,7 +68883,7 @@ in sources."levn-0.3.0" sources."lie-3.3.0" sources."locate-path-3.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" @@ -69058,7 +69222,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.186.0" // { + (sources."snyk-1.193.1" // { dependencies = [ sources."ansi-regex-4.1.0" sources."debug-3.2.6" @@ -69100,7 +69264,7 @@ in sources."ms-2.1.2" ]; }) - (sources."snyk-mvn-plugin-2.3.0" // { + (sources."snyk-mvn-plugin-2.3.1" // { dependencies = [ sources."tslib-1.9.3" ]; @@ -69113,7 +69277,7 @@ in ]; }) sources."snyk-paket-parser-1.4.3" - sources."snyk-php-plugin-1.6.2" + sources."snyk-php-plugin-1.6.3" (sources."snyk-policy-1.13.5" // { dependencies = [ sources."debug-3.2.6" @@ -69138,9 +69302,9 @@ in sources."semver-5.7.0" ]; }) - (sources."snyk-sbt-plugin-2.4.2" // { + (sources."snyk-sbt-plugin-2.5.6" // { dependencies = [ - sources."tslib-1.9.3" + sources."semver-6.2.0" ]; }) sources."snyk-tree-1.0.0" @@ -69335,7 +69499,7 @@ in sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xregexp-2.0.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."y18n-3.2.1" sources."yallist-2.1.2" (sources."yargs-13.2.4" // { @@ -69426,10 +69590,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.16.0"; + version = "1.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.16.0.tgz"; - sha512 = "cfemyGlnWKA1zopUUgebTPf8C4WkPIZ+TJmklwcEAJ4u6oWPtJeAzrsamaGGh/+b1XWe8W51yzAImC4AWbWR1g=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.17.3.tgz"; + sha512 = "CgA8o7nRZaQvmeF/WBx2FC7f9W/0X59T2IaLYqgMo6637wfp5mMEsM3YXoJtKUspnpmDJKl/gGFhnqS+sON7hA=="; }; buildInputs = globalBuildInputs; meta = { @@ -69444,17 +69608,17 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-3.0.0.tgz"; - sha512 = "e+oKkCIBjMf0Xq+Zda2qrp8RfKGUW2deqJYrpZjsxasy4HpdBkog5K1TlqiscDV7/8yS/nx7h8fBlo/uR9K8IA=="; + url = "https://registry.npmjs.org/yo/-/yo-3.1.0.tgz"; + sha512 = "boSESRRyvfyns3DfzxF2F0LVV97wSEFbKUi1oC7RwnZTA66KZ7Bo3JjOLe7mM6IjjeI0vEZcr4BbFjrSHh8d0Q=="; }; dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."aggregate-error-1.0.0" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -69621,7 +69785,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.0.3" + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -69702,7 +69866,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.4.1" + sources."inquirer-6.5.0" sources."insight-0.10.3" sources."into-stream-3.1.0" sources."ip-regex-2.1.0" @@ -69771,7 +69935,7 @@ in }) sources."locate-path-2.0.0" sources."locutus-2.0.11" - sources."lodash-4.17.11" + sources."lodash-4.17.14" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" @@ -69924,7 +70088,11 @@ in sources."strip-bom-3.0.0" ]; }) - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) (sources."redent-1.0.0" // { dependencies = [ sources."indent-string-2.1.0" @@ -69957,7 +70125,7 @@ in sources."run-async-2.3.0" sources."rx-4.1.0" sources."rxjs-6.5.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."scoped-regex-1.0.0" @@ -70013,7 +70181,7 @@ in 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."spdx-license-ids-3.0.5" sources."split-string-3.1.0" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" @@ -70045,7 +70213,11 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) (sources."strip-ansi-5.2.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -70166,7 +70338,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."yallist-2.1.2" (sources."yeoman-character-1.1.0" // { dependencies = [ diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index ac19a7e7063..c9398d96fce 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ROPGadget"; - version = "5.4"; + version = "5.8"; src = fetchPypi { inherit pname version; - sha256 = "19wly4x3mq73c91pplqjk0c7sx6710887czh514qk5l7j0ky6dxg"; + sha256 = "184qncm2ss474prphw0xnf7ifkpgj955dzlb2vqq94z6xvf3xyd9"; }; propagatedBuildInputs = [ capstone ]; diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 18e5c80615a..18c42dbc126 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.4"; + version = "0.5.5"; src = fetchPypi { inherit pname version; - sha256 = "e2e08e19a37c61e85eaa307fe319889af46fe4cac6c23e3ae668b96be3e497ff"; + sha256 = "1qjwqshcrfsa2a0j9bk0w01y857idzic1bj202p9cpar3xsjjw69"; }; postPatch = '' diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index e212e83c270..51b4b15cd18 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "acme-tiny"; - version = "4.0.4"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0vqlmvk34jgvgx3qdsh50q7m4aiy02786jyjjcq45dcws7a4f9f1"; + sha256 = "0jmg525n4n98hwy3hf303jbnq23z79sqwgliji9j7qcnph47gkgq"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix new file mode 100644 index 00000000000..1d2b32a73b9 --- /dev/null +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, pytest +, pytest-asyncio +, pytestcov +, trustme +, async-timeout +}: + +buildPythonPackage rec { + pname = "aioftp"; + version = "0.13.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "5711c03433b510c101e9337069033133cca19b508b5162b414bed24320de6c18"; + }; + + checkInputs = [ + pytest + pytest-asyncio + pytestcov + trustme + async-timeout + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Ftp client/server for asyncio"; + homepage = https://github.com/aio-libs/aioftp; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index e6e7b453276..e21445ab3ec 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "0ia4x17ywym3r1m96ar4h0wc2xlylhbjp6x4wzwkh4p2i0x1vmg1"; + sha256 = "1e5ba829ca0602c55b33da399b06f99b135a34014b661d1c36d8892a1e2d3730"; }; prePatch = '' diff --git a/pkgs/development/python-modules/asciitree/default.nix b/pkgs/development/python-modules/asciitree/default.nix new file mode 100644 index 00000000000..74b78d4a166 --- /dev/null +++ b/pkgs/development/python-modules/asciitree/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +}: + +buildPythonPackage rec { + pname = "asciitree"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "mbr"; + repo = pname; + rev = version; + sha256 = "071wlpyi8pa262sj9xdy0zbj163z84dasxad363z3sfndqxw78h1"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Draws ASCII trees"; + homepage = https://github.com/mbr/asciitree; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix new file mode 100644 index 00000000000..8efc251140a --- /dev/null +++ b/pkgs/development/python-modules/asdf/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest-astropy +, semantic-version +, pyyaml +, jsonschema +, six +, numpy +, isPy27 +, astropy +}: + +buildPythonPackage rec { + pname = "asdf"; + version = "2.3.3"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "d02e936a83abd206e7bc65050d94e8848da648344dbec9e49dddc2bdc3bd6870"; + }; + + checkInputs = [ + pytest-astropy + astropy + ]; + + propagatedBuildInputs = [ + semantic-version + pyyaml + jsonschema + six + numpy + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Python tools to handle ASDF files"; + homepage = https://github.com/spacetelescope/asdf; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index a07d370761a..84c157e1bcd 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: buildPythonPackage rec { - version = "3.1.2"; + version = "3.1.4"; pname = "asgiref"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "1y32ys1q07nyri0b053mx24qvkw305iwvqvqgi2fdhx0va8d7qfy"; + sha256 = "0rmasjrvf083c7855xnggy251gm8vaxyv970b2rd6198h8s3rldh"; }; propagatedBuildInputs = [ async-timeout ]; diff --git a/pkgs/development/python-modules/azure-applicationinsights/default.nix b/pkgs/development/python-modules/azure-applicationinsights/default.nix new file mode 100644 index 00000000000..74f7cf61b13 --- /dev/null +++ b/pkgs/development/python-modules/azure-applicationinsights/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, msrest +}: + +buildPythonPackage rec { + pname = "azure-applicationinsights"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "6e1839169bb6ffd2d2c21ee3f4afbdd068ea428ad47cf884ea3167ecf7fd0859"; + }; + + propagatedBuildInputs = [ + azure-common + msrest + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Application Insights Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-applicotioninsights; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix new file mode 100644 index 00000000000..35ba2d25d5a --- /dev/null +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, azure-common +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-batch"; + version = "6.0.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "d5b0de3db0058cd69baf30e059874094abf865e24ccd82e3cd25f3a48b9676d1"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Batch Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/batch?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 7634be18104..3b25ce6bcfb 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -4,6 +4,7 @@ , azure-nspkg , isPyPy , python +, isPy3k }: buildPythonPackage rec { @@ -17,16 +18,20 @@ buildPythonPackage rec { sha256 = "25d696d2affbf5fe9b13aebe66271fce545e673e7e1eeaaec2d73599ba639d63"; }; - propagatedBuildInputs = [ azure-nspkg ]; + propagatedBuildInputs = [ + azure-nspkg + ]; - postInstall = '' + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; + doCheck = false; + meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + description = "This is the Microsoft Azure common code"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-common; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix new file mode 100644 index 00000000000..fef2614e1ae --- /dev/null +++ b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-nspkg +}: + +buildPythonPackage rec { + pname = "azure-cosmosdb-nspkg"; + version = "2.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "acf691e692818d9a65c653c7a3485eb8e35c0bdc496bba652e5ea3905ba09cd8"; + }; + + propagatedBuildInputs = [ + azure-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure CosmosDB namespace package"; + homepage = https://github.com/Azure/azure-cosmos-table-python/tree/master/azure-cosmosdb-nspkg; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix new file mode 100644 index 00000000000..6a5d54b8298 --- /dev/null +++ b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +, azure-common +, azure-storage-common +, azure-cosmosdb-nspkg +, futures +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-cosmosdb-table"; + version = "1.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "4a34c2c792036afc2a3811f4440ab967351e9ceee6542cc96453b63c678c0145"; + }; + + propagatedBuildInputs = [ + cryptography + azure-common + azure-storage-common + azure-cosmosdb-nspkg + ] ++ lib.optionals (!isPy3k) [ + futures + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Log Analytics Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/cosmosdb?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix new file mode 100644 index 00000000000..508fa8bf87e --- /dev/null +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, adal +, azure-common +, futures +, pathlib2 +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-datalake-store"; + version = "0.0.45"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k2wkpdv30wjmi53zdcsa5xfqw8gyak39na73ja6rb7wy8196wbd"; + }; + + propagatedBuildInputs = [ + requests + adal + azure-common + ] ++ lib.optionals (!isPy3k) [ + futures + pathlib2 + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This project is the Python filesystem library for Azure Data Lake Store"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/data-lake-store?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix new file mode 100644 index 00000000000..79449c328b0 --- /dev/null +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, azure-common +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-eventgrid"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "7ebbe1c4266ba176aa4969d9755c08f10b89848ad50fb0bfd16fa82e29234f95"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/event-grid?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-graphrbac/default.nix b/pkgs/development/python-modules/azure-graphrbac/default.nix new file mode 100644 index 00000000000..c47c10f1418 --- /dev/null +++ b/pkgs/development/python-modules/azure-graphrbac/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +}: + +buildPythonPackage rec { + version = "0.61.0"; + pname = "azure-graphrbac"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "4ab27db29d730e4d35f420466500f8ee60a26a8151dbd121a6c353ccd9d4ee55"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Graph RBAC Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-graphrbac; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix new file mode 100644 index 00000000000..ed0fe138769 --- /dev/null +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-nspkg +, msrest +, msrestazure +, cryptography +}: + +buildPythonPackage rec { + pname = "azure-keyvault"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "37a8e5f376eb5a304fcd066d414b5d93b987e68f9212b0c41efa37d429aadd49"; + }; + + propagatedBuildInputs = [ + azure-common + azure-nspkg + msrest + msrestazure + cryptography + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Key Vault Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/key-vault?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix new file mode 100644 index 00000000000..6a2b57052cc --- /dev/null +++ b/pkgs/development/python-modules/azure-loganalytics/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, azure-common +}: + +buildPythonPackage rec { + version = "0.1.0"; + pname = "azure-loganalytics"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "3ceb350def677a351f34b0a0d1637df6be0c6fe87ff32a5270b17f540f6da06e"; + }; + + propagatedBuildInputs = [ + msrest + azure-common + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Log Analytics Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/loganalytics/client?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix new file mode 100644 index 00000000000..c2423095280 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, isPy3k +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-advisor"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1929d6d5ba49d055fdc806e981b93cf75ea42ba35f78222aaf42d8dcf29d4ef3"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Advisor Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-advisor; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix new file mode 100644 index 00000000000..d7e27eabf64 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-applicationinsights"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1hm6s7vym1y072jqypjgbhps8lza1d5kb8qcpyxnw4zsmsvshdp5"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Application Insights Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-applicationinsights; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix new file mode 100644 index 00000000000..c94620e0b15 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-authorization"; + version = "0.51.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "d2789e21c6b85591b38d5d4e9b835b6546824c14e14aaa366da0ef50a95d2478"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Authorization Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-authorization; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix new file mode 100644 index 00000000000..67fe9c568ea --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-batch"; + version = "6.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "dc929d2a0a65804c28a75dc00bb84ba581f805582a09238f4e7faacb15f8a2a3"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Batch Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-batch; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix new file mode 100644 index 00000000000..faa4d5bc39a --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-mgmt-nspkg +, msrestazure +, python +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-batchai"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "f1870b0f97d5001cdb66208e5a236c9717a0ed18b34dbfdb238a828f3ca2a683"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Batch AI Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-batchai; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix new file mode 100644 index 00000000000..c79f9a5a73e --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, msrestazure +, azure-common +, azure-mgmt-nspkg +, python +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-billing"; + version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-python"; + rev = "ee5b47525d6c1eae3b1fd5f65b0421eab62a6e6f"; + sha256 = "0xzdn7da5c3q5knh033vbsqk36vwbm75cx8vf10x0yj58krb4kn4"; + }; + + preBuild = '' + cd ./azure-mgmt-billing + ''; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Billing Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-billing; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix new file mode 100644 index 00000000000..7ad27938082 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-cdn"; + version = "3.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0cdbe0914aec544884ef681e31950efa548d9bec6d6dc354e00c3dbdab9e76e3"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure CDN Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-cdn; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix new file mode 100644 index 00000000000..d0ebe0470ae --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-mgmt-nspkg +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-mgmt-cognitiveservices"; + version = "4.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "05zbgy1d6mschqv6y14byr4nwdnv48x9skx4rbsbz1fcqqx3j2sd"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Cognitive Services Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-cognitiveservices; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix new file mode 100644 index 00000000000..86e323be168 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, msrestazure +, azure-common +, azure-mgmt-nspkg +, python +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-commerce"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-python"; + rev = "ee5b47525d6c1eae3b1fd5f65b0421eab62a6e6f"; + sha256 = "0xzdn7da5c3q5knh033vbsqk36vwbm75cx8vf10x0yj58krb4kn4"; + }; + + preBuild = '' + cd ./azure-mgmt-commerce + ''; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Commerce Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-commerce; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index c11b8707cb1..e948afd91cf 100644 --- a/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -6,6 +6,7 @@ , azure-mgmt-nspkg , requests , msrestazure +, isPy3k }: buildPythonPackage rec { @@ -15,20 +16,26 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66"; + sha256 = "c63812c13d9f36615c07f874bc602b733bb516f1ed62ab73189b8f71c6bfbfe6"; }; - propagatedBuildInputs = [ azure-common azure-mgmt-nspkg requests msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-nspkg + requests + msrestazure + ]; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; + doCheck = false; + meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + description = "This is the Microsoft Azure Resource Management common code"; + homepage = https://pypi.org/project/azure-mgmt-common; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index ffd2ea11d7c..3df307242cf 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -1,31 +1,37 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi , python , azure-mgmt-common +, isPy3k }: buildPythonPackage rec { - version = "4.4.0"; + version = "5.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "356219a354140ea26e6b4f4be4f855f1ffaf63af60de24cd2ca335b4ece9db00"; + sha256 = "1zdypc8f825n60341ai2482rwgsc7l8dpr691j8hqz571l80y85w"; }; - postInstall = '' + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + propagatedBuildInputs = [ + azure-mgmt-common + ]; - meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Compute Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-compute; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix new file mode 100644 index 00000000000..d074f45cce5 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-consumption"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0nqgywknpj2a69an5yrn0c32fk01v5gi05za7dlf4ivwr9s4np83"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Consumption Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-consumption; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix new file mode 100644 index 00000000000..e32182225f1 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-containerinstance"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "87919f3e618ec0a40fd163d763113eef908e78c50d8b76bf4dd795444cb069fd"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Container Instance Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-containerinstance; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix new file mode 100644 index 00000000000..5e68ef2d383 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-containerservice"; + version = "5.3.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1dhni22n85x76709mvjmby8i8hvginzniq1dna6f5cidfcalc0vs"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Container Service Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-containerservice; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix new file mode 100644 index 00000000000..6741686b0d4 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-cosmosdb"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0g4znanx540p983gzr55z0n0jyzfnzmnzlshl92hm4gldwjdd91d"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Cosmos DB Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-cosmosdb; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix new file mode 100644 index 00000000000..7d028a61a55 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-datafactory"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "7a50da8415e316bd3be0c90ff7e2bffee2afb959aefea23b5923f22dd7094a37"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Data Factory Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datafactory; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix new file mode 100644 index 00000000000..31cfdf0e6d5 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-datalake-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-datalake-analytics"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0d64c4689a67d6138eb9ffbaff2eda2bace7d30b846401673183dcb42714de8f"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-datalake-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Data Lake Analytics Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datalake-analytics; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix new file mode 100644 index 00000000000..0df7d65374a --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-datalake-nspkg"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "deb192ba422f8b3ec272ce4e88736796f216f28ea5b03f28331d784b7a3f4880"; + }; + + propagatedBuildInputs = [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Data Lake Management namespace package"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datalake-nspkg; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix new file mode 100644 index 00000000000..ce28d0a7749 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-datalake-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-datalake-store"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "9376d35495661d19f8acc5604f67b0bc59493b1835bbc480f9a1952f90017a4c"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-datalake-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Data Lake Store Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datalake-store; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix new file mode 100644 index 00000000000..26b90029977 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-datamigration"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "49e6e68093e2d647c1c54a4027dee5b1d57f7e7c21480ae386c55cb3d5fa14bc"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Data Migration Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datamigration; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix new file mode 100644 index 00000000000..f5830f01ac9 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-devspaces"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "4710dd59fc219ebfa4272dbbad58bf62093b52ce22bfd32a5c0279d2149471b5"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Dev Spaces Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-devspaces; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix new file mode 100644 index 00000000000..f5d60a74b60 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-devtestlabs"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "b3d5b2919021bf45f0acdd34ab23dc9b0435d9d0a6b472e5008128fb8521e700"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure DevTestLabs Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-devtestlabs; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix new file mode 100644 index 00000000000..6f802eb6144 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, python +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-dns"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "3730b1b3f545a5aa43c0fff07418b362a789eb7d81286e2bed90ffef88bfa5d0"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure DNS Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/dns?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix new file mode 100644 index 00000000000..8887a8b2776 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-eventgrid"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "9a1da1085d39163b13dee14215b02f18eab93ede10ffe83dc6030ecf2163d2f1"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure EventGrid Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/event-grid?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix new file mode 100644 index 00000000000..1c0c3c5a866 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-eventhub"; + version = "2.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1nnp2ki4iz4f4897psmwb0v5khrwh84fgxja7nl7g73g3ym20sz8"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure EventHub Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/event-hub?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix new file mode 100644 index 00000000000..26247a7eb39 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-hanaonazure"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1spsy6g5z4nb1y1gfz0p1ykybi76qbig8j22zvmws59329b3br5h"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure SAP Hana on Azure Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/hanaonazure?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix new file mode 100644 index 00000000000..9509911709b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-iotcentral"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "9aac88ed1f993965015f4e9986931fc08798e09d7b864928681a7cebff053de8"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure IoTCentral Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/iot?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix new file mode 100644 index 00000000000..aac5ef06e91 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-iothub"; + version = "0.8.2"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0w3w1d156rnkwjdarv3qvycklxr3z2j7lry7a3jfgj3ykzny12rq"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure IoTHub Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/iot?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix new file mode 100644 index 00000000000..502ddccd667 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-iothubprovisioningservices"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "8c37acfd1c33aba845f2e0302ef7266cad31cba503cc990a48684659acb7b91d"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure IoTHub Provisioning Services Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/iot?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix new file mode 100644 index 00000000000..3b786cbf760 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-keyvault"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "05a15327a922441d2ba32add50a35c7f1b9225727cbdd3eeb98bc656e4684099"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Key Vault Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/key-vault?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix new file mode 100644 index 00000000000..3473b6e86b4 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-loganalytics"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "c7315ff0ee4d618fb38dca68548ef4023a7a20ce00efe27eb2105a5426237d86"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Log Analytics Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-loganalytics; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/pkgs/development/python-modules/azure-mgmt-logic/default.nix new file mode 100644 index 00000000000..2050e290467 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-logic/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-logic"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "d163dfc32e3cfa84f3f8131a75d9e94f5c4595907332cc001e45bf7e4efd5add"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Logic Apps Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/logic-apps?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix new file mode 100644 index 00000000000..a68f7e43858 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-machinelearningcompute"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "7a52f85591114ef33a599dabbef840d872b7f599b7823e596af9490ec51b873f"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Machine Learning Compute Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-machinelearningcompute; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix new file mode 100644 index 00000000000..03faf442cbd --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-managementgroups"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "3d5237947458dc94b4a392141174b1c1258d26611241ee104e9006d1d798f682"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Management Groups Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-managementgroups; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix new file mode 100644 index 00000000000..be1ddc49a49 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-managementpartner"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1bvcmx7dkf2adi26z7c2ga63ggpzdfqj8q1gzcic1yn03v6nb8i7"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure ManagementPartner Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-managementpartner; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix new file mode 100644 index 00000000000..b1e373173d2 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-maps"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "c120e210bb61768da29de24d28b82f8d42ae24e52396eb6569b499709e22f006"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Maps Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-maps; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix new file mode 100644 index 00000000000..8995f43a08b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-marketplaceordering"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "dc765cde7ec03efe456438c85c6207c2f77775a8ce8a7adb19b0df5c5dc513c2"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Market Place Ordering Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-marketplaceordering; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix new file mode 100644 index 00000000000..5061fa90ae8 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-media"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "5d0c6b3a0f882dde8ae3d42467f03ea6c4e3f62613936087d54c67e6f504939b"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Media Services Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/media-services?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix new file mode 100644 index 00000000000..0a6f045dc4b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-monitor"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "5a804dae2c3e31bfd6f1b0482d49761b9a56f7eefa9b190cd76ef5fe1d504ef2"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Monitor Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/monitoring?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix new file mode 100644 index 00000000000..63ebbb298f2 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-msi"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0n4gbwk843z66hhpcp1kcrnwqkzygbbc2ma01r9asgfv4nmklvyl"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure MSI Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-msi; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 63457d6f542..ad730774c5e 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -1,31 +1,37 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi , azure-mgmt-common , python +, isPy3k }: buildPythonPackage rec { - version = "2.5.1"; + version = "2.7.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cef9bf5d36700966e52f7cea86e29c622bc5bbb92d0ce7a75420e29fb0e75f45"; + sha256 = "04z9f0nd2nh5miw81qahqrrz998l4yd328qcyx7bxg42a5f5v5jp"; }; - postInstall = '' + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + propagatedBuildInputs = [ + azure-mgmt-common + ]; - meta = with pkgs.lib; { + # has no tests + doCheck = false; + + meta = with lib; { description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/network?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix new file mode 100644 index 00000000000..0629eb07b66 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-notificationhubs"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "10w53ida2nlx73vd1pczh4mkpg0lag1h19yyklx3yvgsyvahj25h"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Notification Hubs Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/notification-hubs?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index cf977539d5d..8adb60e99aa 100644 --- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , azure-nspkg +, python +, isPy3k }: buildPythonPackage rec { @@ -16,10 +18,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-nspkg ]; + doCheck = false; + meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + homepage = https://github.com/Azure/azure-sdk-for-python; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix new file mode 100644 index 00000000000..b57146afe3e --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-policyinsights"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "b27f5ac367b69e225ab02fa2d1ea20cbbfe948ff43b0af4698cd8cbde0063908"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Policy Insights Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/policy?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix new file mode 100644 index 00000000000..c946bb7ab36 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-powerbiembedded"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "2f05be73f2a086c579a78fc900e3b2ae14ccde5bcec54e29dfc73e626b377476"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Power BI Embedded Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/power-bi?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix new file mode 100644 index 00000000000..881727e383b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-rdbms"; + version = "1.8.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "40abbe4f9c59d7906594ceed067d0e7d09fef44be0d16aded5d5717f1a8aa5ea"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure RDBMS Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-rdbms; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix new file mode 100644 index 00000000000..5e4a500ce3b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-recoveryservices"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "e1e794760232239f8a9328d5de1740565ff70d1612a2921c9609746ba5671e6c"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Recovery Services Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/recoveryservices?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix new file mode 100644 index 00000000000..49247e87801 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-recoveryservicesbackup"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1e55b6cbb808df83576cef352ba0065f4878fe505299c0a4c5a97f4f1e5793df"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Recovery Services Backup Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/recovery-services-backup?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix new file mode 100644 index 00000000000..21cdfbafc92 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-redis"; + version = "6.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "db999e104edeee3a13a8ceb1881e15196fe03a02635e0e20855eb52c1e2ecca1"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Redis Cache Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/redis?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix new file mode 100644 index 00000000000..a3491356c9a --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-relay"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0s5z4cil750wn770m0hdzcrpshj4bj1bglkkvxdx9l9054dk9s57"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Relay Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/relay?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix new file mode 100644 index 00000000000..be00d4aa418 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-reservations"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0nksxjh5kh09dr0zw667fg8mzik4ymvfq3dipwag6pynbqr9ls4l"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Reservations Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-reservations; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index e5f5b38509f..3689f85f225 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -3,6 +3,7 @@ , fetchPypi , python , azure-mgmt-common +, isPy3k }: @@ -16,17 +17,20 @@ buildPythonPackage rec { sha256 = "aef8573066026db04ed3e7c5e727904e42f6462b6421c2e8a3646e4c4f8128be"; }; - postInstall = '' + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; propagatedBuildInputs = [ azure-mgmt-common ]; + # has no tests + doCheck = false; + meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/resources?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix new file mode 100644 index 00000000000..a25b81aa5fa --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-scheduler"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "c6e6edd386ddc4c21d54b1497c3397b970bc127b71809b51bd2391cb1f3d1a14"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Scheduler Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/scheduler?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix new file mode 100644 index 00000000000..6ae9693e7f5 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-search"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0ec5de861bd786bcb8691322feed6e6caa8d2f0806a50dc0ca5d640591926893"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Search Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/search?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix new file mode 100644 index 00000000000..e5b35e538ee --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-servicebus"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "f20920b8fb119ef4abeda4d2dac765a4fc48cd0bcf30c27f8c4cc6d890bc08b1"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Service Bus Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/servicebus?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix new file mode 100644 index 00000000000..54c695a5079 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-servicefabric"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "b2bf2279b8ff8450c35e78e226231655021482fdbda27db09975ebfc983398ad"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Service Fabric Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/servicefabric?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix new file mode 100644 index 00000000000..d1671e02ec1 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-signalr"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "8a6266a59a5c69102e274806ccad3ac74b06fd2c226e16426bbe248fc2174903"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure SignalR Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-signalr; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix new file mode 100644 index 00000000000..913eb150224 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-sql"; + version = "0.12.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "8399702e9d1836f3b040ce0c93d8dc089767d66edb9224a3b8a6c9ab7e8ff01f"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure SQL Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/sql?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 12d10d8ac47..0f4c6b101e0 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -1,31 +1,35 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi , python , azure-mgmt-common +, isPy3k }: buildPythonPackage rec { - version = "3.1.1"; + version = "3.3.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "22a779cae5e09712b7d62ef9bc3d8907a5666893a8a113b6d9348e933170236f"; + sha256 = "1kffay8hr8h3hf78wb1kisvffpwxsxy6lixbgh9dbv0p781sgyh6"; }; - postInstall = '' + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; propagatedBuildInputs = [ azure-mgmt-common ]; - meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Storage Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/storage?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix new file mode 100644 index 00000000000..d19aba5fbc2 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-subscription"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "7a095fe46e598210b178e1059bba82eb02f3b8a7f44f3791442ff7d9ff323d2b"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Subscription Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-subscription; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix new file mode 100644 index 00000000000..87b0603877b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-trafficmanager"; + version = "0.51.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "fc8ae77022cfe52fda4379a2f31e0b857574d536e41291a7b569b5c0f4104186"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Traffic Manager Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/traffic-manager?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix new file mode 100644 index 00000000000..f2beeb99ffb --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-web"; + version = "0.41.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "5f170f25c72119ff4b4e2f39d46ce21bdb2f399f786ea24eedc15c12cfba3054"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Web Apps Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/webapps?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-nspkg/default.nix b/pkgs/development/python-modules/azure-nspkg/default.nix index f95db7b1c59..bb1cb41f341 100644 --- a/pkgs/development/python-modules/azure-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-nspkg/default.nix @@ -1,6 +1,8 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi +, python +, isPy3k }: buildPythonPackage rec { @@ -13,10 +15,12 @@ buildPythonPackage rec { sha256 = "e7d3cea6af63e667d87ba1ca4f8cd7cb4dfca678e4c55fc1cedb320760e39dd0"; }; - meta = with pkgs.lib; { + doCheck = false; + + meta = with lib; { description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + homepage = https://github.com/Azure/azure-sdk-for-python; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix new file mode 100644 index 00000000000..e8683a68e29 --- /dev/null +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, uamqp +, azure-common +, msrestazure +, futures +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-servicebus"; + version = "0.50.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "c5864cfc69402e3e2897e61b3bd224ade28d9e33dad849e4bd6afad26a3d2786"; + }; + + buildInputs = [ + uamqp + azure-common + msrestazure + ] ++ lib.optionals (!isPy3k) [ + futures + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Service Bus Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/free/master/azure-servicebus; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix new file mode 100644 index 00000000000..6b9ac45ad97 --- /dev/null +++ b/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, msrest +}: + +buildPythonPackage rec { + pname = "azure-servicefabric"; + version = "6.4.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "f049e8c4a179f1277f2ec60158f88caf14a50f7df491fc6841e360cd61746da1"; + }; + + propagatedBuildInputs = [ + azure-common + msrest + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This project provides a client library in Python that makes it easy to consume Microsoft Azure Storage services"; + homepage = https://pypi.org/project/azure-servicefabric; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix index 8148fe78e53..6a0c04c58cc 100644 --- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix +++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix @@ -1,31 +1,37 @@ -{ pkgs +{ lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , azure-common , requests -, python }: buildPythonPackage rec { - version = "0.20.6"; + version = "0.20.7"; pname = "azure-servicemanagement-legacy"; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "c883ff8fa3d4f4cb7b9344e8cb7d92a9feca2aa5efd596237aeea89e5c10981d"; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-python"; + rev = "ab01fc1f23462f130c69f46505524b88101023dc"; + sha256 = "0w2bm9hkwy1m94l8r2klnpqn4192y8bir3z8bymxgfx9y0b1mn2q"; }; - propagatedBuildInputs = [ azure-common requests ]; - - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + preBuild = '' + cd ./azure-servicemanagement-legacy ''; - meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + propagatedBuildInputs = [ + azure-common + requests + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Service Management Legacy Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-servicemanagement-legacy; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 2531c440daf..2c00d78a718 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0b15dzy75fml994gdfmaw5qcyij15gvh968mk3hg94d1wxwai1zi"; + sha256 = "f187a878e7a191f4e098159904f72b4146cf70e1aabaf6484ab4ba72fc6f252c"; }; propagatedBuildInputs = [ @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Client library for Microsoft Azure Storage services containing the blob service APIs"; homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-blob; license = licenses.mit; - maintainers = with maintainers; [ cmcdragonkai ]; + maintainers = with maintainers; [ cmcdragonkai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index e54136a5027..117b6fed597 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -1,9 +1,10 @@ { buildPythonPackage, lib, fetchPypi , pytest, filelock, mock, pep8 , cython, isPy27 -, six, pyshp, shapely, geos, proj, numpy +, six, pyshp, shapely, geos, numpy , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona , xvfb_run +, proj_5 # see https://github.com/SciTools/cartopy/pull/1252 for status on proj 6 support }: buildPythonPackage rec { @@ -27,17 +28,17 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ${maybeXvfbRun} pytest --pyargs cartopy \ -m "not network and not natural_earth" \ - -k "not test_nightshade_image" + -k "not test_nightshade_image and not background_img" ''; nativeBuildInputs = [ cython geos # for geos-config - proj + proj_5 ]; buildInputs = [ - geos proj + geos proj_5 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix new file mode 100644 index 00000000000..3ba442d0d86 --- /dev/null +++ b/pkgs/development/python-modules/cliff/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, prettytable +, pyparsing +, six +, stevedore +, pyyaml +, unicodecsv +, cmd2 +}: + +buildPythonPackage rec { + pname = "cliff"; + version = "2.15.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "fe044273539250a99a5b9915843902e40e4e9b32ac5698c1fae89e31200d649f"; + }; + + propagatedBuildInputs = [ + pbr + prettytable + pyparsing + six + stevedore + pyyaml + cmd2 + unicodecsv + ]; + + # test dependencies are complex + # and would require about 20 packages + # to be added + doCheck = false; + + meta = with lib; { + description = "Command Line Interface Formulation Framework"; + homepage = https://docs.openstack.org/cliff/latest/; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix new file mode 100644 index 00000000000..ca95ebbf1f3 --- /dev/null +++ b/pkgs/development/python-modules/clifford/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, numba +, future +, h5py +, nose +, isPy27 +}: + +buildPythonPackage rec { + pname = "clifford"; + version = "1.0.4"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "7fc5aa76b4f73c697c0ebd2f86c5233e7ca0a5109b80147f4e711bc3de4b3f2c"; + }; + + propagatedBuildInputs = [ + numpy + scipy + numba + future + h5py + ]; + + checkInputs = [ + nose + ]; + + preConfigure = '' + substituteInPlace setup.py \ + --replace "'numba==0.43'" "'numba'" + ''; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "Numerical Geometric Algebra Module"; + homepage = https://clifford.readthedocs.io; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix new file mode 100644 index 00000000000..6a7328aaf73 --- /dev/null +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, param +, pyct +, nbsmoke +, flake8 +, pytest +, pytest-mpl +}: + +buildPythonPackage rec { + pname = "colorcet"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ab1d16aba97f54af190631c7777c356b04b53de549672ff6b01c66d716eddff3"; + }; + + propagatedBuildInputs = [ + param + pyct + ]; + + checkInputs = [ + nbsmoke + pytest + flake8 + pytest-mpl + ]; + + checkPhase = '' + export HOME=$(mktemp -d) + mkdir -p $HOME/.config/matplotlib + echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc + + pytest colorcet + ''; + + meta = with lib; { + description = "Collection of perceptually uniform colormaps"; + homepage = https://colorcet.pyviz.org; + license = licenses.cc-by-40; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix new file mode 100644 index 00000000000..8ce3012513c --- /dev/null +++ b/pkgs/development/python-modules/datashader/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, fetchPypi +, dask +, distributed +, bokeh +, toolz +, datashape +, numba +, numpy +, pandas +, pillow +, xarray +, colorcet +, param +, pyct +, pyyaml +, requests +, scikitimage +, scipy +, pytest +, pytest-benchmark +, flake8 +, nbsmoke +, fastparquet +, testpath +, nbconvert +}: + +buildPythonPackage rec { + pname = "datashader"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "5baf218713dc1ad4791f7bcf606ef8f618273945e788c59f9573aebd7cb851f8"; + }; + + propagatedBuildInputs = [ + dask + distributed + bokeh + toolz + datashape + numba + numpy + pandas + pillow + xarray + colorcet + param + pyct + pyyaml + requests + scikitimage + scipy + testpath + ]; + + checkInputs = [ + pytest + pytest-benchmark + flake8 + nbsmoke + fastparquet + pandas + nbconvert + ]; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "'testpath<0.4'" "'testpath'" + ''; + + checkPhase = '' + pytest datashader + ''; + + meta = with lib; { + description = "Data visualization toolchain based on aggregating into a grid"; + homepage = https://datashader.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 63191aa224e..bb2e65125b7 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -34,7 +34,8 @@ in buildPythonPackage rec { # Disable several tests # https://github.com/blaze/datashape/issues/232 checkPhase = '' - py.test -k "not test_validate and not test_nested_iteratables and not test_validate_dicts and not test_tuples_can_be_records_too" datashape/tests + pytest --ignore datashape/tests/test_str.py \ + --ignore datashape/tests/test_user.py ''; meta = { @@ -42,7 +43,5 @@ in buildPythonPackage rec { description = "A data description language"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fridh ]; - # Package is no longer maintained upstream, and more and more tests are failing. - broken = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 2ba308596d4..c3d5224dd4d 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.98.0"; + version = "0.98.2"; src = fetchPypi { inherit pname version; - sha256 = "089h98gpjf9ffxzbkbd9k9wd8n3s7g0nhfpn3rf44h51hllgqxxb"; + sha256 = "0d8m3zhhxy1f35r1s8k0s218iz86bs6v89vy65lslrxbdg5pjia0"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index f4395245a81..b8c784023c2 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,16 +5,17 @@ buildPythonPackage rec { pname = "decorator"; - version = "4.3.2"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "33cd704aea07b4c28b3eb2c97d288a06918275dac0ecebdaf1bc8a48d98adb9e"; + sha256 = "1pi54wqj2p6ka13x7q8d5zgqg9bcf7m5d00l7x5bi204qmhn65c6"; }; - meta = { + meta = with lib; { homepage = https://pypi.python.org/pypi/decorator; description = "Better living through Python with decorators"; license = lib.licenses.mit; + maintainers = [ maintainers.costrouc ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix new file mode 100644 index 00000000000..a62393b7baf --- /dev/null +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tox +}: + +buildPythonPackage rec { + pname = "diskcache"; + version = "4.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7c20b58ed07d03bbfba793f823d1fc27a61e590371fe6011fa1319a25c028cd1"; + }; + + checkInputs = [ + tox + ]; + + meta = with lib; { + description = "Disk and file backed persistent cache"; + homepage = https://www.grantjenks.com/docs/diskcache/; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index 569df7f7246..b454fc32108 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "0.23.0"; + version = "1.1.0"; disabled = pythonOlder "2.7"; src = fetchPypi { inherit pname version; - sha256 = "a21cbe7e0879f1364eef1c88a2eda89d593bf000ebf51c3f00423c6927075dce"; + sha256 = "044fzcpmns90kaxdi49qczlam4xsi8rl73rpfwvxx1gkcqzidgq1"; }; propagatedBuildInputs = [ isort django ]; diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index 9d644c22eaf..f671cdc9642 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "dot2tex"; - version = "2.9.0"; + version = "2.11.3"; src = fetchPypi { inherit pname version; - sha256 = "7d3e54add7dccdaeb6cc9e61ceaf7b587914cf8ebd6821cfea008acdc1e50d4a"; + sha256 = "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9"; }; # Tests fail with 3.x. Furthermore, package is no longer maintained. diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix new file mode 100644 index 00000000000..4d322695ebf --- /dev/null +++ b/pkgs/development/python-modules/drms/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, pandas +, six +, pytest +, python +}: + +buildPythonPackage rec { + pname = "drms"; + version = "0.5.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "95cac0e14532893a44eeab8e329ddb76150e6848153d8cb1e4e08ba55569e6af"; + }; + + propagatedBuildInputs = [ + numpy + pandas + six + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + ${python.interpreter} -m drms.tests + ''; + + meta = with lib; { + description = "Access HMI, AIA and MDI data with Python"; + homepage = https://github.com/sunpy/drms; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix index b02ff0c7457..7102e5d73c4 100644 --- a/pkgs/development/python-modules/filebytes/default.nix +++ b/pkgs/development/python-modules/filebytes/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "filebytes"; - version = "0.9.20"; + version = "0.9.21"; src = fetchPypi { inherit pname version; - sha256 = "6c33986ca048e49cf1a5e2f167af9f02c7f866576b3b91a8a9124d32e57f935d"; + sha256 = "09e306feafd435e240b6ca22e6319ce51862dbe99e3481368fc9a2d15d2263d5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index ebd100037b2..6dd74742741 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder , attrs, click, cligj, click-plugins, six, munch, enum34 , pytest, boto3, mock -, gdal +, gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745 }: buildPythonPackage rec { @@ -16,11 +16,11 @@ buildPythonPackage rec { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; nativeBuildInputs = [ - gdal # for gdal-config + gdal_2 # for gdal-config ]; buildInputs = [ - gdal + gdal_2 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index 93bf4716073..ef4859a749a 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "fitbit"; - version = "0.3.0"; + version = "0.3.1"; checkInputs = [ coverage freezegun mock requests-mock sphinx ]; propagatedBuildInputs = [ dateutil requests_oauthlib ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { rev = version; owner = "orcasgit"; repo = "python-fitbit"; - sha256 = "0s1kp4qcxvxghqf9nb71843slm4r5lhl2rlvj3yvhbby3cqs4g84"; + sha256 = "1w2lpgf6bs5nbnmslppaf4lbhr9cj6grg0a525xv41jip7iy3vfn"; }; postPatch = '' diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index a2c372c8bee..52dd77c8391 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.5.2"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "ebc896bf6e8d7a414e3efba0bd0770a8f73dcd7023f99e849c64164287e36e9b"; + sha256 = "15plwkmi6i7p85q2vgyvmn0l4c2h7pj4mmiziwghyyqbd1rc0dr2"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 25a5e7e3ed5..a9ac85e6248 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.5.0"; + version = "0.5.1"; name = pname + "-" + version; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "0gmqksjgxrng52jvjk0ylkpsg0qriygb10b7n80l28kdz6c0givj"; + sha256 = "1j665fpkyfib17z0hn3bg2j96pbkgd36yfif6jyia4yn6g76hlfg"; }; checkInputs = [ pytest Rtree ]; diff --git a/pkgs/development/python-modules/github-webhook/default.nix b/pkgs/development/python-modules/github-webhook/default.nix index 99af2830167..c9814b94d82 100644 --- a/pkgs/development/python-modules/github-webhook/default.nix +++ b/pkgs/development/python-modules/github-webhook/default.nix @@ -1,28 +1,25 @@ -{ stdenv -, buildPythonPackage -, fetchgit +{ lib, buildPythonPackage, fetchPypi , flask +, six }: buildPythonPackage rec { pname = "github-webhook"; - version = "unstable-2016-03-11"; + version = "1.0.2"; - # There is a PyPI package but an older one. - src = fetchgit { - url = "https://github.com/bloomberg/python-github-webhook.git"; - rev = "ca1855479ee59c4373da5425dbdce08567605d49"; - sha256 = "0mqwig9281iyzbphp1d21a4pqdrf98vs9k8lqpqx6spzgqaczx5f"; + src = fetchPypi { + inherit pname version; + sha256 = "04jdf595gv97s4br0ym8izca3i6d1nfwcrpi4s26hkvn3czz84sv"; }; - propagatedBuildInputs = [ flask ]; - # No tests + propagatedBuildInputs = [ flask six ]; + + # touches network doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A framework for writing webhooks for GitHub"; + homepage = "https://github.com/bloomberg/python-github-webhook"; license = licenses.mit; - homepage = https://github.com/bloomberg/python-github-webhook; }; - } diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix new file mode 100644 index 00000000000..3da367c445f --- /dev/null +++ b/pkgs/development/python-modules/glymur/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, numpy +, setuptools +, python +, scikitimage +, openjpeg +, procps +, contextlib2 +, mock +, importlib-resources +, isPy27 +}: + +buildPythonPackage rec { + pname = "glymur"; + version = "0.8.18"; + + src = fetchFromGitHub { + owner = "quintusdias"; + repo = pname; + rev = "v${version}"; + sha256 = "1zbghzw1q4fljb019lsrhka9xrnn4425qnxrjbmbv7dssgkkywd7"; + }; + + propagatedBuildInputs = [ + numpy + ] ++ stdenv.lib.optional isPy27 [ contextlib2 mock importlib-resources ]; + + checkInputs = [ + scikitimage + procps + ]; + + postConfigure = '' + substituteInPlace glymur/config.py \ + --replace "path = read_config_file(libname)" "path = '${openjpeg}/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}" + ''; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = with stdenv.lib; { + description = "Tools for accessing JPEG2000 files"; + homepage = https://github.com/quintusdias/glymur; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index b318016ee81..2cc1513812f 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "03rq2rjac0zh16vsw0q914sp62l9f8fp033wn3191pqd2cchqix0"; + sha256 = "1fl3w23c93hlgqf0l57cdy17wmvyhrv3bh133ksd2h490ir012va"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index d4052a227bb..383ed1bdbb9 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "2167e1c599ea1d9fed96d317ad817d0b37497460c70f11aafa13a24ede7c9c35"; + sha256 = "0ypn95swjj93kvdcrvmijmh3vzpr499a3krk923a86m8vlcwcvjm"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 8837e34c788..8987ce97c71 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.3"; + version = "1.4.5"; src = fetchPypi { inherit pname version; - sha256 = "432c548d6138cb57a3d8f62f079a025a29b8ae34a50dd3b496bbf661818f2bc0"; + sha256 = "1z8xjvpkj599h3s76q05y10iysjjky7b0s5g3zicfyxhzm7x59a3"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/isoweek/default.nix b/pkgs/development/python-modules/isoweek/default.nix new file mode 100644 index 00000000000..65de70b20b5 --- /dev/null +++ b/pkgs/development/python-modules/isoweek/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "isoweek"; + version = "1.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s7zsf0pab0l9gn6456qadnz5i5h90hafcjwnhx5mq23qjxggwvk"; + }; + + meta = with lib; { + description = "The module provide the class Week. Instances represent specific weeks spanning Monday to Sunday."; + homepage = "https://github.com/gisle/isoweek"; + license = licenses.bsd2; + maintainers = with maintainers; [ mrmebelman ]; + }; +} + diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index f968b9fbd9f..d3b5ad79d6c 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "fb5c62c77d26e04df29cb5ecd01b9ce69b6fcc9e521eb1ca193b7faa2afa7086"; + sha256 = "1lq2s1649zinfii9ccl1wk6aqpaj35r8xwz44020ylp9ky1rmv4w"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index f7ac30c28c5..66e79227697 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.1.3"; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "1klcx333kpgb5gbaasmz07brqjxvls3l5dpj0kv9cfsd76cq17yh"; + sha256 = "0g365j22gbmq4x60l06id5930aywzy1dx2s25109nqq2l2cxc7ws"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix new file mode 100644 index 00000000000..3904473f1a3 --- /dev/null +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, scikitlearn +, numpy +, scipy +, jinja2 +, pytest +, networkx +, matplotlib +, python-igraph +, plotly +, ipywidgets +}: + +buildPythonPackage rec { + pname = "kmapper"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0879294680c5d01a928847b818a3c4e07eded3f602f96e510858e68e74fa3783"; + }; + + propagatedBuildInputs = [ + scikitlearn + numpy + scipy + jinja2 + ]; + + checkInputs = [ + pytest + networkx + matplotlib + python-igraph + plotly + ipywidgets + ]; + + checkPhase = '' + pytest test --ignore test/test_drawing.py + ''; + + meta = with lib; { + description = "Python implementation of Mapper algorithm for Topological Data Analysis"; + homepage = http://kepler-mapper.scikit-tda.org; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index f8427cd7d17..c3025311e10 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "knack"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "1kxxj9m2mvva9rz11m6pgdg0mi712d28faj4633rl23qa53sh7i8"; + sha256 = "08g15kwfppdr7vhbsg6qclpqbf11d9k3hwgrmvhh5fa1jrk95b5i"; }; propagatedBuildInputs = [ @@ -40,9 +40,8 @@ buildPythonPackage rec { pytest ]; - # tries to make a '/homeless-shelter' dir checkPhase = '' - pytest -k 'not test_cli_exapp1' + HOME=$TMPDIR pytest . ''; meta = with lib; { diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix new file mode 100644 index 00000000000..fee314aa6c3 --- /dev/null +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cmake +, numpy +, scipy +, scikitlearn +}: + +buildPythonPackage rec { + pname = "lightgbm"; + version = "2.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "40354d21da6bfa73c7ada4d01b2e0b22eaae00f93e90bdaf3fc423020c273890"; + }; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + numpy + scipy + scikitlearn + ]; + + postConfigure = '' + export HOME=$(mktemp -d) + ''; + + # The pypi package doesn't distribute the tests from the GitHub + # repository. It contains c++ tests which don't seem to wired up to + # `make check`. + doCheck = false; + + meta = with lib; { + description = "A fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework"; + homepage = https://github.com/Microsoft/LightGBM; + license = licenses.mit; + maintainers = with lib.maintainers; [ teh costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index 256cf107c86..00ea8dba663 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -16,12 +16,18 @@ buildPythonPackage rec { sha256 = "efa66e9e3045aa7cb1dd4bf0106e07dec9f80bc781a993fbaf8162a36c20af5c"; }; + patches = [ ./python37.patch ]; + buildInputs = [ cython ]; propagatedBuildInputs = [ ipython ]; disabled = isPyPy; + preBuild = '' + rm -f _line_profiler.c + ''; + checkPhase = '' ${python.interpreter} -m unittest discover -s tests ''; @@ -32,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/line_profiler/python37.patch b/pkgs/development/python-modules/line_profiler/python37.patch new file mode 100644 index 00000000000..0b6e93732c4 --- /dev/null +++ b/pkgs/development/python-modules/line_profiler/python37.patch @@ -0,0 +1,36 @@ +From 542baf59f3b2eada13bde48e8a89e484c2cfeeef Mon Sep 17 00:00:00 2001 +From: Hanaasagi +Date: Wed, 17 Apr 2019 06:46:03 +0000 +Subject: [PATCH] Support Python 3.7 Generator (PEP 479) + +--- + kernprof.py | 2 ++ + line_profiler.py | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/kernprof.py b/kernprof.py +index 108d36e..6461cf6 100755 +--- a/kernprof.py ++++ b/kernprof.py +@@ -102,6 +102,8 @@ def wrapper(*args, **kwds): + self.enable_by_count() + try: + item = g.send(input) ++ except StopIteration: ++ return + finally: + self.disable_by_count() + input = (yield item) +diff --git a/line_profiler.py b/line_profiler.py +index a481dd2..5744d05 100755 +--- a/line_profiler.py ++++ b/line_profiler.py +@@ -100,6 +100,8 @@ def wrapper(*args, **kwds): + self.enable_by_count() + try: + item = g.send(input) ++ except StopIteration: ++ return + finally: + self.disable_by_count() + input = (yield item) diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 34e2260109b..101468da09f 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mahotas"; - version = "1.4.5"; + version = "1.4.7"; src = fetchFromGitHub { owner = "luispedro"; repo = "mahotas"; rev = "v${version}"; - sha256 = "0dm34751w1441lxq00219fqlqix5qrgc18wp1wgp7xivlz3czzcz"; + sha256 = "1a3nzxb7is8n7lpxwq1fw3fr03qflig334rb1zzr2znjrhq6g94b"; }; # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index d3b5c79e967..bc94202a070 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "micawber"; - version = "0.4.1"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "002g31h4fcrrlfcrcbqa94aggszadm0p91c28n19vgssinmbz0ia"; + sha256 = "0vk4xkby306f79gkwrn3cx94qdqil285dand8kb6lnlsdi90sb25"; }; propagatedBuildInputs = [ beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix new file mode 100644 index 00000000000..298c69194f2 --- /dev/null +++ b/pkgs/development/python-modules/modeled/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, zetup +, six +, moretools +, pathpy +, pytest +}: + +buildPythonPackage rec { + pname = "modeled"; + version = "0.1.8"; + + src = fetchPypi { + extension = "zip"; + inherit pname version; + sha256 = "64934c68cfcdb75ed4a1ccadcfd5d2a46bf1b8e8e81dde89ef0f042c401e94f1"; + }; + + buildInputs = [ + zetup + ]; + + propagatedBuildInputs = [ + six + moretools + pathpy + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "Universal data modeling for Python"; + homepage = https://bitbucket.org/userzimmermann/python-modeled; + license = licenses.lgpl3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index ba3dd00bfe4..4b6a617c018 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , isPy3k , requests , requests_oauthlib @@ -21,9 +21,13 @@ buildPythonPackage rec { version = "0.6.8"; pname = "msrest"; - src = fetchPypi { - inherit pname version; - sha256 = "0yd43fnmfxkvk3idkyn67ziwjgkwkn261kicr3szjibpqjqcpsf9"; + # no tests in PyPI tarball + # see https://github.com/Azure/msrest-for-python/pull/152 + src = fetchFromGitHub { + owner = "Azure"; + repo = "msrest-for-python"; + rev = "v${version}"; + sha256 = "1vnh0y68vqf7hwhghbf6bjadrzlv98aj4vfz6g592lww3ijpy77w"; }; propagatedBuildInputs = [ @@ -42,8 +46,8 @@ buildPythonPackage rec { meta = with lib; { description = "The runtime library 'msrest' for AutoRest generated Python clients."; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; + homepage = https://github.com/Azure/msrest-for-python; license = licenses.mit; - maintainers = with maintainers; [ bendlas jonringer ]; + maintainers = with maintainers; [ bendlas jonringer mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix new file mode 100644 index 00000000000..e52e033cdb0 --- /dev/null +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mwparserfromhell"; + version = "0.5.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "aaf5416ab9b75e99e286f8a4216f77a2f7d834afd4c8f81731e701e59bf99305"; + }; + + meta = with stdenv.lib; { + description = "MWParserFromHell is a parser for MediaWiki wikicode"; + homepage = "https://mwparserfromhell.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix index f18420b676b..6e82119faa5 100644 --- a/pkgs/development/python-modules/odo/default.nix +++ b/pkgs/development/python-modules/odo/default.nix @@ -13,32 +13,46 @@ buildPythonPackage rec { pname = "odo"; - version= "0.5.1"; - + version= "unstable-2019-07-16"; src = fetchFromGitHub { owner = "blaze"; repo = pname; - rev = version; - sha256 = "142f4jvaqjn0dq6rvlk7d7mzcmc255a9z4nxc1b3a862hp4gvijs"; + rev = "9fce6690b3666160681833540de6c55e922de5eb"; + sha256 = "0givkd5agr05wrf72fbghdaav6gplx7c069ngs1ip385v72ifsl9"; }; - checkInputs = [ pytest dask ]; - propagatedBuildInputs = [ datashape numpy pandas toolz multipledispatch networkx ]; + checkInputs = [ + pytest + dask + ]; - # Disable failing tests - # https://github.com/blaze/odo/issues/609 - checkPhase = '' - py.test -k "not test_numpy_asserts_type_after_dataframe" odo/tests + propagatedBuildInputs = [ + datashape + numpy + pandas + toolz + multipledispatch + networkx + ]; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "versioneer.get_version()" "'0.5.1'" ''; - meta = { + # disable 6/315 tests + checkPhase = '' + pytest odo -k "not test_insert_to_ooc \ + and not test_datetime_index \ + and not test_different_encoding \ + and not test_numpy_asserts_type_after_dataframe" + ''; + + meta = with lib; { homepage = https://github.com/ContinuumIO/odo; description = "Data migration utilities"; - license = lib.licenses.bsdOriginal; - maintainers = with lib.maintainers; [ fridh ]; - # incomaptible with Networkx 2 - # see https://github.com/blaze/odo/pull/601 - broken = true; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ fridh costrouc ]; }; } diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix new file mode 100644 index 00000000000..fc62f67430f --- /dev/null +++ b/pkgs/development/python-modules/optuna/default.nix @@ -0,0 +1,81 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, mock +, bokeh +, plotly +, chainer +, xgboost +, mpi4py +, lightgbm +, Keras +, mxnet +, scikit-optimize +, tensorflow +, sqlalchemy +, numpy +, scipy +, six +, cliff +, colorlog +, pandas +, alembic +, typing +, pythonOlder +, isPy27 +}: + +buildPythonPackage rec { + pname = "optuna"; + version = "0.13.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "915b9d7b28f7f7cdf015d8617c689ca90eda7a5bbd59c5fc232c9eccc9a91585"; + }; + + checkInputs = [ + pytest + mock + bokeh + plotly + chainer + xgboost + mpi4py + lightgbm + Keras + mxnet + scikit-optimize + tensorflow + ]; + + propagatedBuildInputs = [ + sqlalchemy + numpy + scipy + six + cliff + colorlog + pandas + alembic + ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; + + configurePhase = if !(pythonOlder "3.5") then '' + substituteInPlace setup.py \ + --replace "'typing'" "" + '' else ""; + + checkPhase = '' + pytest --ignore tests/test_cli.py \ + --ignore tests/integration_tests/test_chainermn.py + ''; + + meta = with lib; { + description = "A hyperparameter optimization framework"; + homepage = https://optuna.org/; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 22b9360a56a..7921b0a7a14 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.17.1"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "19dm6dxj9hsiq0bnb4d6ms3sh2hcss9d9fhpjgkwxzrw9mlzvrxj"; + sha256 = "018p2ypmpbbcgl0hp92s0vig1wirh41lj0wy62aafn5050pmqr7m"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix new file mode 100644 index 00000000000..26a3a613be4 --- /dev/null +++ b/pkgs/development/python-modules/parfive/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tqdm +, aiohttp +, pytest +, setuptools_scm +, pytest-localserver +, pytest-socket +, pytest-asyncio +, aioftp +}: + +buildPythonPackage rec { + pname = "parfive"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "15dc8466922c8fb1f814d3f7c3f3656191ac17b38fd7cc3350b9bf726e144ebb"; + }; + + buildInputs = [ + setuptools_scm + ]; + + propagatedBuildInputs = [ + tqdm + aiohttp + aioftp + ]; + + checkInputs = [ + pytest + pytest-localserver + pytest-socket + pytest-asyncio + ]; + + checkPhase = '' + # these two tests require network connection + pytest parfive -k "not test_ftp and not test_ftp_http" + ''; + + meta = with lib; { + description = "A HTTP and FTP parallel file downloader"; + homepage = https://parfive.readthedocs.io/; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix new file mode 100644 index 00000000000..12bfddb3deb --- /dev/null +++ b/pkgs/development/python-modules/persim/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, scikitlearn +, numpy +, matplotlib +, scipy +, hopcroftkarp +, pytest +}: + +buildPythonPackage rec { + pname = "persim"; + version = "0.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "52ce59856de25eec74c6f20951301b13e7d98c434e712d2225653e2087d54fbc"; + }; + + propagatedBuildInputs = [ + scikitlearn + numpy + matplotlib + scipy + hopcroftkarp + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + # specifically needed for darwin + export HOME=$(mktemp -d) + mkdir -p $HOME/.matplotlib + echo "backend: ps" > $HOME/.matplotlib/matplotlibrc + + # ignore tests due to python 2.7 fail + pytest --ignore test/test_plots.py \ + --ignore test/test_visuals.py + ''; + + meta = with lib; { + description = "Distances and representations of persistence diagrams"; + homepage = https://persim.scikit-tda.org; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 4d064af18fa..1e61992b49d 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.6.7"; + version = "1.6.8"; src = fetchPypi { inherit pname version; - sha256 = "1hg30y8b4b96r4skhz2qmsp7li1izcg8854q3fi48rks0kcfx5fw"; + sha256 = "1zibkc074dvk69bkiipfzn2l9glgzs26g16j2ny5lzq320wqszkj"; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index f30a73be8fb..b86706bef08 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.12"; + version = "8.10.15"; src = fetchPypi { inherit pname version; - sha256 = "708c19860afb05085d5fe91b52fcbce9e1be3c020fe8c9b6f6d028879f5a7d5e"; + sha256 = "617b9127dc6fd29765ca122915d3b603131446a76a587deed0b92c8db53963fe"; }; meta = { diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix index 0de96a3f585..595e246f777 100644 --- a/pkgs/development/python-modules/piexif/default.nix +++ b/pkgs/development/python-modules/piexif/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "piexif"; - version = "1.1.2"; + version = "1.1.3"; # Pillow needed for unit tests checkInputs = [ pillow ]; @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0dj6wiw4mk65zn7p0qpghra39mf88m3ph2xn7ff9jvasgczrgkb0"; + sha256 = "06sz58q4mrw472p8fbnq7wsj8zpi5js5r8phm2hiwfmz0v33bjw3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix new file mode 100644 index 00000000000..8bdb2affc53 --- /dev/null +++ b/pkgs/development/python-modules/pydy/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, cython +, numpy +, scipy +, sympy +}: + +buildPythonPackage rec { + pname = "pydy"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b487a62b55a8c8664009b09bf789254b2c942cd704a380bedb1057418c94fa2"; + }; + + checkInputs = [ + nose + cython + ]; + + propagatedBuildInputs = [ + numpy + scipy + sympy + ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "Python tool kit for multi-body dynamics"; + homepage = http://pydy.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pygbm/default.nix b/pkgs/development/python-modules/pygbm/default.nix new file mode 100644 index 00000000000..6e4c70aaaf1 --- /dev/null +++ b/pkgs/development/python-modules/pygbm/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, scipy +, numpy +, numba +, scikitlearn +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pygbm"; + version = "0.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ogrisel"; + repo = pname; + rev = "v${version}"; + sha256 = "1qg2md86d0z5aa6jn8kj3rxsippsqsccx1dbraspdsdkycncvww3"; + }; + + propagatedBuildInputs = [ + scipy + numpy + numba + scikitlearn + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + # numerical rounding error in test + pytest -k "not test_derivatives" + ''; + + meta = with lib; { + description = "Experimental Gradient Boosting Machines in Python"; + homepage = https://github.com/ogrisel/pygbm; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index dfba421ae58..414c2cccbea 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pyls-mypy"; - version = "0.1.3"; + version = "0.1.6"; src = fetchFromGitHub { owner = "tomv564"; repo = "pyls-mypy"; rev = version; - sha256 = "0v7ghcd1715lxlfq304b7xhchp31ahdd89lf6za4n0l59dz74swh"; + sha256 = "0c1111m9h6f05frkyj6i757q9y2lijpbv8nxmwgp3nqbpkvfnmrk"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index e17ec16f436..8561cbac1b8 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2018.2.5"; + version = "2019.1"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1qgi6diw9m7yldmql9kh08792053ib6zkplh8v2mqv6waaflmrnn"; + sha256 = "04ahndgc5aqm3pqix2j4vzn9n3k762ylf3yq55jdbxm5cicz9nx0"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pyproj/001.proj.patch b/pkgs/development/python-modules/pyproj/001.proj.patch new file mode 100644 index 00000000000..b024c28156c --- /dev/null +++ b/pkgs/development/python-modules/pyproj/001.proj.patch @@ -0,0 +1,47 @@ +diff a/pyproj/datadir.py b/pyproj/datadir.py +--- a/pyproj/datadir.py ++++ b/pyproj/datadir.py +@@ -52,6 +52,7 @@ def get_data_dir(): + str: The valid data directory. + + """ ++ return "@proj@/share/proj" + # to avoid re-validating + global _VALIDATED_PROJ_DATA + if _VALIDATED_PROJ_DATA is not None: +diff a/setup.py b/setup.py +--- a/setup.py ++++ b/setup.py +@@ -16,7 +16,7 @@ INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ + + def check_proj_version(proj_dir): + """checks that the PROJ library meets the minimum version""" +- proj = os.path.join(proj_dir, "bin", "proj") ++ proj = "@proj@/bin/proj" + proj_ver_bytes = subprocess.check_output(proj, stderr=subprocess.STDOUT) + proj_ver_bytes = (proj_ver_bytes.decode("ascii").split()[1]).strip(",") + proj_version = parse_version(proj_ver_bytes) +@@ -33,6 +33,7 @@ def get_proj_dir(): + """ + This function finds the base PROJ directory. + """ ++ return "@proj@" + proj_dir = os.environ.get("PROJ_DIR") + if proj_dir is None and os.path.exists(INTERNAL_PROJ_DIR): + proj_dir = INTERNAL_PROJ_DIR +@@ -56,6 +57,7 @@ def get_proj_libdirs(proj_dir): + """ + This function finds the library directories + """ ++ return ["@proj@/lib"] + proj_libdir = os.environ.get("PROJ_LIBDIR") + libdirs = [] + if proj_libdir is None: +@@ -77,6 +79,7 @@ def get_proj_incdirs(proj_dir): + """ + This function finds the include directories + """ ++ return ["@proj@/include"] + proj_incdir = os.environ.get("PROJ_INCDIR") + incdirs = [] + if proj_incdir is None: diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index f08625f62b6..ddfecbe8ec5 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -1,38 +1,49 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, python -, nose2 +{ lib, buildPythonPackage, fetchPypi, python, pkgs, pythonOlder, substituteAll +, aenum , cython -, proj ? null +, pytest +, mock +, numpy }: -buildPythonPackage (rec { +buildPythonPackage rec { pname = "pyproj"; - version = "unstable-2018-11-13"; + version = "2.2.1"; - src = fetchFromGitHub { - owner = "jswhit"; - repo = pname; - rev = "78540f5ff40da92160f80860416c91ee74b7643c"; - sha256 = "1vq5smxmpdjxialxxglsfh48wx8kaq9sc5mqqxn4fgv1r5n1m3n9"; + src = fetchPypi { + inherit pname version; + sha256 = "0yigcxwmx5cczipf2mpmy2gq1dnl0635yjvjq86ay47j1j5fd2gc"; }; - buildInputs = [ cython ]; + # force pyproj to use ${pkgs.proj} + patches = [ + (substituteAll { + src = ./001.proj.patch; + proj = pkgs.proj; + }) + ]; - checkInputs = [ nose2 ]; + buildInputs = [ cython pkgs.proj ]; + propagatedBuildInputs = [ + numpy + ] ++ lib.optional (pythonOlder "3.6") aenum; + + checkInputs = [ pytest mock ]; + + # ignore rounding errors, and impure docgen + # datadir is ignored because it does the proj look up logic, which isn't relevant checkPhase = '' - runHook preCheck - pushd unittest # changing directory should ensure we're importing the global pyproj - ${python.interpreter} test.py && ${python.interpreter} -c "import doctest, pyproj, sys; sys.exit(doctest.testmod(pyproj)[0])" - popd - runHook postCheck + pytest . -k 'not alternative_grid_name \ + and not transform_wgs84_to_alaska \ + and not repr' \ + --ignore=test/test_doctest_wrapper.py \ + --ignore=test/test_datadir.py ''; meta = { description = "Python interface to PROJ.4 library"; - homepage = https://github.com/jswhit/pyproj; + homepage = "https://github.com/jswhit/pyproj"; license = with lib.licenses; [ isc ]; }; -} // (if proj == null then {} else { PROJ_DIR = proj; })) +} diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 9512fce4f45..1528623aa0e 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "4.7.0"; + version = "4.8.0"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "1bpfvy2xd3aqf79ihglmxlxnv7406184p99h5mn5h9ifs54vvhhl"; + sha256 = "1nnmk7apg169bawqi06jbx3p0x4sq12kszzl7k6j39273hqq5ii4"; }; patches = [ diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix new file mode 100644 index 00000000000..4a59e22d136 --- /dev/null +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, six +, pytest +, astropy +}: + +buildPythonPackage rec { + pname = "pytest-arraydiff"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "de2d62f53ecc107ed754d70d562adfa7573677a263216a7f19aa332f20dc6c15"; + }; + + propagatedBuildInputs = [ + numpy + six + pytest + ]; + + checkInputs = [ + pytest + astropy + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pytest plugin to help with comparing array output from tests"; + homepage = https://github.com/astrofrog/pytest-arraydiff; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix new file mode 100644 index 00000000000..272b1fa56b9 --- /dev/null +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pytest-doctestplus +, pytest-remotedata +, pytest-openfiles +, pytest-arraydiff +}: + +buildPythonPackage rec { + pname = "pytest-astropy"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6f28fb81dcdfa745f423b8f6d0303d97357d775b4128bcc2b3668f1602fd5a0b"; + }; + + propagatedBuildInputs = [ + pytest + pytest-doctestplus + pytest-remotedata + pytest-openfiles + pytest-arraydiff + ]; + + # pytest-astropy is a meta package and has no tests + doCheck = false; + + meta = with lib; { + description = "Meta-package containing dependencies for testing"; + homepage = https://astropy.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix new file mode 100644 index 00000000000..a132fdd26f8 --- /dev/null +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, pytest +, numpy +}: + +buildPythonPackage rec { + pname = "pytest-doctestplus"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "4e641bc720661c08ec3afe44a7951660cdff5e187259c433aa66e9ec2d5ccea1"; + }; + + propagatedBuildInputs = [ + six + numpy + pytest + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pytest plugin with advanced doctest features"; + homepage = https://astropy.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix new file mode 100644 index 00000000000..0baaa9c5dfc --- /dev/null +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, matplotlib +, nose +}: + +buildPythonPackage rec { + pname = "pytest-mpl"; + version = "0.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "7006e63bf1ca9c50bea3d189c0f862751a16ce40bb373197b218f57af5b837c0"; + }; + + propagatedBuildInputs = [ + matplotlib + nose + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + export HOME=$(mktemp -d) + mkdir -p $HOME/.config/matplotlib + echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc + + pytest + ''; + + meta = with lib; { + description = "Pytest plugin to help with testing figures output from Matplotlib"; + homepage = https://github.com/matplotlib/pytest-mpl; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix new file mode 100644 index 00000000000..dbce114d7bf --- /dev/null +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, psutil +}: + +buildPythonPackage rec { + pname = "pytest-openfiles"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "e51c91889eb9e4c75f47735efc57a1435f3f1182463600ba7bce7f2556a46884"; + }; + + propagatedBuildInputs = [ + pytest + psutil + ]; + + checkInputs = [ + pytest + ]; + + postConfigure = '' + # remove on next release + substituteInPlace setup.cfg \ + --replace "[pytest]" "[tool:pytest]" + ''; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pytest plugin for detecting inadvertent open file handles"; + homepage = https://astropy.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix new file mode 100644 index 00000000000..2bf3a7f6cac --- /dev/null +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-remotedata"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15b75a38431da96a4da5e48b20a18e4dcc40d191abc199b17cb969f818530481"; + }; + + propagatedBuildInputs = [ + six + pytest + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + # these tests require a network connection + pytest --ignore tests/test_strict_check.py + ''; + + meta = with lib; { + description = "Pytest plugin for controlling remote data access"; + homepage = https://astropy.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix new file mode 100644 index 00000000000..a28970a8ec4 --- /dev/null +++ b/pkgs/development/python-modules/pytest-socket/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-socket"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "miketheman"; + repo = pname; + rev = version; + sha256 = "1jbzkyp4xki81h01yl4vg3nrg9b6shsk1ryrmkaslffyhrqnj8zh"; + }; + + propagatedBuildInputs = [ + pytest + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + # unsurprisingly pytest-socket require network for majority of tests + # to pass... + doCheck = false; + + meta = with lib; { + description = "Pytest Plugin to disable socket calls during tests"; + homepage = https://github.com/miketheman/pytest-socket; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest/3.10.nix b/pkgs/development/python-modules/pytest/3.10.nix index f24cab8af1c..2b4dd41bc2e 100644 --- a/pkgs/development/python-modules/pytest/3.10.nix +++ b/pkgs/development/python-modules/pytest/3.10.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" + $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" --ignore testing/test_assertion.py --ignore testing/test_config.py runHook postCheck ''; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 167da239fd1..bbd05b6757b 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1rwkl36n1synyggg2li7r075fq5k3cmpgyazinw24bkf7z2kpc56"; + sha256 = "1p0i6gsl4mcv6w1sm0rsxq9bq2cmmg3n7c0dniqlvqmzkk62qqhx"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 54c5418ae67..084432061d1 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -21,13 +21,13 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "003fy8bbvwibnsnyxw1qwg2rxnhbfylqs67ixr6fdnw6mmrzd6fg"; + sha256 = "158wxj2w880jrab7mi4fb3xqnjhmfixqacxjp7whf7jy3zxqrq38"; }; # The tests require all the providers, disable otherwise. diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix new file mode 100644 index 00000000000..5f2aee1b42a --- /dev/null +++ b/pkgs/development/python-modules/regional/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, matplotlib +, pytest +}: + +buildPythonPackage rec { + pname = "regional"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "freeman-lab"; + repo = pname; + rev = "e3a29c58982e5cd3d5700131ac96e5e0b84fb981"; # no tags in repo + sha256 = "03qgm35q9sa5cy0kkw4bj60zfylw0isfzb96nlhdfrsigzs2zkxv"; + }; + + propagatedBuildInputs = [ + numpy + scipy + matplotlib + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Simple manipualtion and display of spatial regions"; + homepage = https://github.com/freeman-lab/regional; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix new file mode 100644 index 00000000000..7a0ae68993a --- /dev/null +++ b/pkgs/development/python-modules/ripser/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, numpy +, scipy +, scikitlearn +, persim +, pytest +}: + +buildPythonPackage rec { + pname = "ripser"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ff9f50fba911f0e9212077b78014f83e30c97526194dd6bd1df3d81896e6cb58"; + }; + + checkInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + cython + numpy + scipy + scikitlearn + persim + ]; + + checkPhase = '' + # specifically needed for darwin + export HOME=$(mktemp -d) + mkdir -p $HOME/.matplotlib + echo "backend: ps" > $HOME/.matplotlib/matplotlibrc + + pytest + ''; + + meta = with lib; { + description = "A Lean Persistent Homology Library for Python"; + homepage = https://ripser.scikit-tda.org; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index be8b0b9454d..97bc9de0bf7 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -7,25 +7,44 @@ , pathpy , six , zetup +, modeled +, pytest }: buildPythonPackage rec { - version = "0.1a115"; + version = "0.1rc4"; pname = "robotframework-tools"; src = fetchPypi { inherit pname version; - sha256 = "04gkn1zpf3rsvbqdxrrjqqi8sa0md9gqwh6n5w2m03fdwjg4lc7q"; + sha256 = "0377ikajf6c3zcy3lc0kh4w9zmlqyplk2c2hb0yyc7h3jnfnya96"; }; - nativeBuildInputs = [ zetup ]; + nativeBuildInputs = [ + zetup + ]; - propagatedBuildInputs = [ robotframework moretools pathpy six ]; + propagatedBuildInputs = [ + robotframework + moretools + pathpy + six + modeled + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + # tests require network + pytest test --ignore test/remote/test_remote.py + ''; meta = with stdenv.lib; { description = "Python Tools for Robot Framework and Test Libraries"; homepage = https://bitbucket.org/userzimmermann/robotframework-tools; license = licenses.gpl3; - broken = isPy3k; # 2019-03-15, missing dependency robotframework-python3 + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 6d19feed3fb..09d98c91203 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,11 +2,12 @@ buildPythonPackage rec { pname = "robotframework"; - version = "3.0.4"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "ab94257cbd848dfca7148e092d233a12853cc7e840ce8231af9cbb5e7f51aa47"; + sha256 = "f10dd7c0c8c7962a4f80dd1e026b5db731b9391bc6e1f9ebb96d685eb1230dbc"; + extension = "zip"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 0a974133252..157549a6f17 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "0.2.1"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "2146aae91ba3a06d7bfa7130688219599f8696d2825fb00f62923bb56f6e7ed3"; + sha256 = "1l3vdy3h6l03kjjzq1vq7h252749f8dg7kkz65s890y4xxvjxlyw"; }; buildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix new file mode 100644 index 00000000000..f82dc947b06 --- /dev/null +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, scikitlearn +, pyaml +, pytest +}: + +buildPythonPackage rec { + pname = "scikit-optimize"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "scikit-optimize"; + repo = "scikit-optimize"; + rev = "v${version}"; + sha256 = "1srbb20k8ddhpcfxwdflapfh6xfyrd3dnclcg3bsfq1byrcmv0d4"; + }; + + propagatedBuildInputs = [ + numpy + scipy + scikitlearn + pyaml + ]; + + checkInputs = [ + pytest + ]; + + # remove --ignore at next release > 0.6 + checkPhase = '' + pytest skopt --ignore skopt/tests/test_searchcv.py + ''; + + meta = with lib; { + description = "Sequential model-based optimization toolbox"; + homepage = https://scikit-optimize.github.io/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix new file mode 100644 index 00000000000..0c33f7a0dab --- /dev/null +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, scikitlearn +, matplotlib +, numba +, umap-learn +, cython +, ripser +, persim +, pillow +, kmapper +, tadasets +, pytest +, isPy27 +}: + +buildPythonPackage rec { + pname = "scikit-tda"; + version = "0.0.4"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "scikit-tda"; + repo = "scikit-tda"; + rev = version; + sha256 = "0a90k6i9fkmc9gf250b4fidx2fzd2qrn025l74mjk51fvf23q13a"; + }; + + propagatedBuildInputs = [ + numpy + scipy + scikitlearn + matplotlib + numba + umap-learn + cython + ripser + persim + pillow + kmapper + tadasets + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest test + ''; + + # tests will be included in next release + doCheck = false; + + meta = with lib; { + description = "Topological Data Analysis for humans"; + homepage = https://github.com/scikit-tda/scikit-tda; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/showit/default.nix b/pkgs/development/python-modules/showit/default.nix new file mode 100644 index 00000000000..4060b1a4fc5 --- /dev/null +++ b/pkgs/development/python-modules/showit/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, matplotlib +, pytest +}: + +buildPythonPackage rec { + pname = "showit"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "freeman-lab"; + repo = pname; + rev = "ef76425797c71fbe3795b4302c49ab5be6b0bacb"; # no tags in repo + sha256 = "0xd8isrlwwxlgji90lly1sq4l2a37rqvhsmyhv7bd3aj1dyjmdr6"; + }; + + propagatedBuildInputs = [ + numpy + matplotlib + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "simple and sensible display of images"; + homepage = https://github.com/freeman-lab/showit; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index 63a048abdb2..c54997a21fe 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -1,17 +1,25 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, deap, scikitlearn, python, isPy3k }: +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }: buildPythonPackage rec { pname = "sklearn-deap"; - version = "0.2.2"; + version = "0.2.3"; # No tests in Pypi src = fetchFromGitHub { owner = "rsteca"; repo = pname; rev = "${version}"; - sha256 = "01ynmzxg181xhv2d7bs53zjvk9x2qpxix32sspq54mpigxh13ava"; + sha256 = "1yqnmy8h08i2y6bb2s0a5nx9cwvyg45293whqh420c195gpzg1x3"; }; + patches = [ + # Fix for newer versions of scikit-learn. See: https://github.com/rsteca/sklearn-deap/pull/62 + (fetchpatch { + url = "https://github.com/rsteca/sklearn-deap/commit/3ae62990fc87f36b59382e7c4db3c74cf99ec3bf.patch"; + sha256 = "1na6wf4v0dcmyz3pz8aiqkmv76d1iz3hi4iyfq9kfnycgzpv1kxk"; + }) + ]; + propagatedBuildInputs = [ numpy scipy deap scikitlearn ]; checkPhase = '' @@ -23,7 +31,6 @@ buildPythonPackage rec { homepage = https://github.com/rsteca/sklearn-deap; license = licenses.lgpl3; maintainers = with maintainers; [ psyanticy ]; - broken = isPy3k; # https://github.com/rsteca/sklearn-deap/issues/65 }; } diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix new file mode 100644 index 00000000000..3b9aa19062b --- /dev/null +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, boto3 +, diskcache +, enum34 +, packaging +, pathlib +, numpy +, requests +, scikitimage +, six +, pytest +, isPy27 +}: + +buildPythonPackage rec { + pname = "slicedimage"; + version = "3.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "adab09457e22465f05998fdcf8ea14179185f8e780a4021526ba163dd476cd02"; + }; + + propagatedBuildInputs = [ + boto3 + diskcache + packaging + numpy + requests + scikitimage + six + ] ++ lib.optionals isPy27 [ pathlib enum34 ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Library to access sliced imaging data"; + homepage = https://github.com/spacetx/slicedimage; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 178be8bd86a..2a8e5a264cf 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.1.4"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "03m4c59aaqpqr2x5yhv7y37z0vxhmmkfi6dv4cbp9nxsq9wv100d"; + sha256 = "1s0a0vir9lg5q8n832kkadbajb4i4zl20zmdg3g20qlp4mcbn25p"; }; prePatch = '' @@ -72,6 +72,6 @@ buildPythonPackage rec { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = https://github.com/explosion/spaCy; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; + maintainers = with maintainers; [ danieldk sdll ]; }; } diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 5d863192b2b..274a5148d8a 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "1x5g7pfj813rnci7dc46y01bq24qzw5qwlzm4iw61hg66q2kg7rd"; + sha256 = "0ddv80dv54rraa18lg9v7m9z61wzfwv6ww9ld83mr32gy3a2238p"; }; propagatedBuildInputs = [ selenium ]; diff --git a/pkgs/development/python-modules/starfish/default.nix b/pkgs/development/python-modules/starfish/default.nix new file mode 100644 index 00000000000..d7989d80e8e --- /dev/null +++ b/pkgs/development/python-modules/starfish/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, fetchPypi +, click +, dataclasses +, jsonschema +, matplotlib +, numpy +, pandas +, regional +, semantic-version +, scikitimage +, scikitlearn +, scipy +, showit +, slicedimage +, sympy +, tqdm +, trackpy +, validators +, xarray +, ipywidgets +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "starfish"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "19bec2a869affbca0a7e3fc0aee1b9978ff7f0f1a2a8551c2d4ae148a7ddc251"; + }; + + propagatedBuildInputs = [ + click + jsonschema + matplotlib + numpy + pandas + regional + semantic-version + scikitimage + scikitlearn + scipy + showit + slicedimage + sympy + tqdm + trackpy + validators + xarray + ipywidgets + ] ++ lib.optionals (pythonOlder "3.7") [ dataclasses ]; + + checkInputs = [ + pytest + ]; + + postConfigure = '' + substituteInPlace REQUIREMENTS.txt \ + --replace "slicedimage==3.1.1" "slicedimage" + ''; + + checkPhase = '' + # a few tests < 5% require + rm -rf starfish/test/full_pipelines/* + pytest starfish \ + --ignore starfish/core/config/test/test_config.py \ + --ignore starfish/core/experiment/builder/test/test_build.py \ + --ignore starfish/core/experiment/test/test_experiment.py \ + --ignore starfish/core/image/_filter/test/test_reduce.py \ + --ignore starfish/core/image/_registration/_apply_transform/test/test_warp.py \ + --ignore starfish/core/image/_registration/_learn_transform/test/test_translation.py \ + --ignore starfish/core/image/_registration/test/test_transforms_list.py \ + --ignore starfish/core/imagestack/test/test_max_proj.py \ + --ignore starfish/core/recipe/test/test_recipe.py \ + --ignore starfish/core/recipe/test/test_runnable.py \ + --ignore starfish/core/test/test_profiler.py + ''; + + meta = with lib; { + description = "Pipelines and pipeline components for the analysis of image-based transcriptomics data"; + homepage = https://spacetx-starfish.readthedocs.io/en/latest/; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix new file mode 100644 index 00000000000..967e365dde0 --- /dev/null +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, numba +, pandas +, dask +, distributed +, coverage +, flake8 +, black +, pytest +, codecov +}: + +buildPythonPackage rec { + pname = "stumpy"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "TDAmeritrade"; + repo = "stumpy"; + rev = "115e477c1eec9291ab7c1fd8da30d67a70854f8e"; # no git version tag + sha256 = "0s2s3y855jjwdb7p55zx8lknplz58ghpw547yzmqisacr968b67w"; + }; + + propagatedBuildInputs = [ + numpy + scipy + numba + ]; + + checkInputs = [ + pandas + dask + distributed + coverage + flake8 + black + pytest + codecov + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "A powerful and scalable library that can be used for a variety of time series data mining tasks"; + homepage = https://github.com/TDAmeritrade/stumpy; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix new file mode 100644 index 00000000000..252eafec465 --- /dev/null +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -0,0 +1,80 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, matplotlib +, pandas +, astropy +, parfive +, pythonOlder +, sqlalchemy +, scikitimage +, glymur +, beautifulsoup4 +, drms +, python-dateutil +, zeep +, tqdm +, asdf +, astropy-helpers +, hypothesis +, pytest-astropy +, pytestcov +, pytest-mock +}: + +buildPythonPackage rec { + pname = "sunpy"; + version = "1.0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "sunpy"; + repo = pname; + rev = "v${version}"; + sha256 = "0dmfzxxsjjax9wf2ljyl4z07pxbshrj828zi5qnsa9rgk4148q9x"; + }; + + propagatedBuildInputs = [ + numpy + scipy + matplotlib + pandas + astropy + astropy-helpers + parfive + sqlalchemy + scikitimage + glymur + beautifulsoup4 + drms + python-dateutil + zeep + tqdm + asdf + ]; + + checkInputs = [ + hypothesis + pytest-astropy + pytestcov + pytest-mock + ]; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" + export HOME=$(mktemp -d) + ''; + + checkPhase = '' + pytest sunpy -k "not test_rotation" + ''; + + meta = with lib; { + description = "SunPy: Python for Solar Physics"; + homepage = https://sunpy.org; + license = licenses.bsd2; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/tadasets/default.nix b/pkgs/development/python-modules/tadasets/default.nix new file mode 100644 index 00000000000..61f6b866455 --- /dev/null +++ b/pkgs/development/python-modules/tadasets/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, matplotlib +, pytest +, scipy +}: + +buildPythonPackage rec { + pname = "tadasets"; + version = "0.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "a0e6c14678750315febd97fcf334bbbfd2695ebd91b4fe7707bb1220d7348416"; + }; + + propagatedBuildInputs = [ + numpy + matplotlib + ]; + + checkInputs = [ + pytest + scipy + ]; + + meta = with lib; { + description = "Great data sets for Topological Data Analysis"; + homepage = https://tadasets.scikit-tda.org; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index 395deff2226..a8c20a0eeac 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,16 +5,16 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "2b60a5304ccfbeac80ffae7350d7c2f5d7a24e9aab5036d0f82489746419d9b2"; + sha256 = "1x5l77akfc20x52jma9573qp8l8r07q103pm4l0pbizvh4vp1wzg"; }; - meta = { + meta = with lib; { description = "A module to generate a formatted text table, using ASCII characters"; - homepage = http://foutaise.org/code/; - license = lib.licenses.lgpl2; + homepage = "https://github.com/foutaise/texttable"; + license = licenses.lgpl2; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index ebca1346dfb..ac8ab3fd864 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.0.6"; + version = "7.0.8"; src = fetchPypi { inherit pname version; - sha256 = "12d0766z7ksqpqrvldi46mx0z4zsbgncda4fpvxra1d6vbchf8ba"; + sha256 = "191admjvhqsbxpqn73q42i0i8kvlblj0k6p0z9p7n3pcxzl75nsw"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix new file mode 100644 index 00000000000..2e26679ebf2 --- /dev/null +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, six +, pandas +, pyyaml +, matplotlib +, pytest +}: + +buildPythonPackage rec { + pname = "trackpy"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "soft-matter"; + repo = pname; + rev = "v${version}"; + sha256 = "01fdv93f6z16gypmvqnlbjmcih7dmr7a63n5w9swmp11x3if4iyq"; + }; + + propagatedBuildInputs = [ + numpy + scipy + six + pandas + pyyaml + matplotlib + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + ${stdenv.lib.optionalString (stdenv.isDarwin) '' + # specifically needed for darwin + export HOME=$(mktemp -d) + mkdir -p $HOME/.matplotlib + echo "backend: ps" > $HOME/.matplotlib/matplotlibrc + ''} + + pytest trackpy --ignore trackpy/tests/test_motion.py \ + --ignore trackpy/tests/test_feature_saving.py \ + --ignore trackpy/tests/test_feature.py \ + --ignore trackpy/tests/test_legacy_linking.py + ''; + + meta = with stdenv.lib; { + description = "Particle-tracking toolkit"; + homepage = https://github.com/soft-matter/trackpy; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index f76939603d3..bc9837dc23c 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -9,6 +9,7 @@ , pyopenssl , trustme , sniffio +, stdenv , jedi , pylint }: @@ -37,6 +38,9 @@ buildPythonPackage rec { sniffio ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; + # tests are failing on Darwin + doCheck = !stdenv.isDarwin; + meta = { description = "An async/await-native I/O library for humans and snake people"; homepage = https://github.com/python-trio/trio; diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 6daa99aca6a..e2ba008d3a0 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -1,4 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, cryptography, futures, pytest, pyopenssl, service-identity }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, cryptography +, futures +, pytest +, pyopenssl +, service-identity +, idna +}: buildPythonPackage rec { pname = "trustme"; @@ -9,18 +19,25 @@ buildPythonPackage rec { sha256 = "103f8n0c60593r0z8hh1zvk1bagxwnhrv3203xpiiddwqxalr04b"; }; - checkInputs = [ pytest pyopenssl service-identity ]; - checkPhase = '' - py.test - ''; + checkInputs = [ + pytest + pyopenssl + service-identity + ]; + propagatedBuildInputs = [ cryptography + idna ] ++ lib.optionals (!isPy3k) [ futures ]; + checkPhase = '' + pytest + ''; + meta = { - description = "#1 quality TLS certs while you wait, for the discerning tester"; + description = "High quality TLS certs while you wait, for the discerning tester"; homepage = https://github.com/python-trio/trustme; license = with lib.licenses; [ mit asl20 ]; maintainers = with lib.maintainers; [ catern ]; diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index daaafbd7b3e..ef5fed68912 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.7.2"; + version = "3.7.4"; src = fetchPypi { inherit pname version; - sha256 = "0wfsv71pvkyf2na938l579jh0v3kzl6g744ijgnahcwd4d9x0b7v"; + sha256 = "15bx773a5zkk4hkwjl8nb5f8y5741vyyqb9q3jac6kxm1frk5mif"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix new file mode 100644 index 00000000000..ff0c61c5e07 --- /dev/null +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -0,0 +1,47 @@ +{ CFNetwork +, Security +, buildPythonPackage +, certifi +, cmake +, enum34 +, fetchPypi +, isPy3k +, lib +, openssl +, stdenv +, six +}: + +buildPythonPackage rec { + pname = "uamqp"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "d3d4ff94bf290adb82fe8c19af709a21294bac9b27c821b9110165a34b922015"; + }; + + buildInputs = [ + openssl + certifi + six + ] ++ lib.optionals (!isPy3k) [ + enum34 + ] ++ lib.optionals stdenv.isDarwin [ + CFNetwork Security + ]; + + nativeBuildInputs = [ + cmake + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "An AMQP 1.0 client library for Python"; + homepage = https://github.com/Azure/azure-uamqp-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix new file mode 100644 index 00000000000..1fbdbd3782a --- /dev/null +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, numpy +, scikitlearn +, scipy +, numba +}: + +buildPythonPackage rec { + pname = "umap-learn"; + version = "0.3.9"; + + src = fetchFromGitHub { + owner = "lmcinnes"; + repo = "umap"; + rev = version; + sha256 = "1cdc7hs3vwzxvzs34l9a06q8rvks29wj6swyj8zvwr32knxch8a9"; + }; + + checkInputs = [ + nose + ]; + + propagatedBuildInputs = [ + numpy + scikitlearn + scipy + numba + ]; + + postConfigure = '' + substituteInPlace umap/tests/test_umap.py \ + --replace "def test_umap_transform_on_iris()" "@SkipTest +def test_umap_transform_on_iris()" + ''; + + checkPhase = '' + nosetests -s umap + ''; + + meta = with lib; { + description = "Uniform Manifold Approximation and Projection"; + homepage = http://github.com/lmcinnes/umap; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix new file mode 100644 index 00000000000..bbcca388c93 --- /dev/null +++ b/pkgs/development/python-modules/validators/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, decorator +, pytest +, isort +, flake8 +}: + +buildPythonPackage rec { + pname = "validators"; + version = "0.13.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "ea9bf8bf22aa692c205e12830d90b3b93950e5122d22bed9eb2f2fece0bba298"; + }; + + propagatedBuildInputs = [ + six + decorator + ]; + + checkInputs = [ + pytest + flake8 + isort + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Python Data Validation for Humans™"; + homepage = https://github.com/kvesteri/validators; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix new file mode 100644 index 00000000000..0f49ffd05c6 --- /dev/null +++ b/pkgs/development/python-modules/vsts/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, lib +, python +, fetchPypi +, msrest +}: + +buildPythonPackage rec { + version = "0.1.25"; + pname = "vsts"; + + src = fetchPypi { + inherit pname version; + sha256 = "15sgwqa72ynpahj101r2kc15s3dnsafg5gqx0sz3hnqz29h925ys"; + }; + + propagatedBuildInputs = [ msrest ]; + + # Tests are highly impure + checkPhase = '' + ${python.interpreter} -c 'import vsts.version; print(vsts.version.VERSION)' + ''; + + meta = with lib; { + description = "Python APIs for interacting with and managing Azure DevOps"; + homepage = https://github.com/microsoft/azure-devops-python-api; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index 498c1c401f8..102496582a0 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "whichcraft"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "fecddd531f237ffc5db8b215409afb18fa30300699064cca4817521b4fc81815"; + sha256 = "1614vs0iwm9abina70vgvxaabi8xbz83yxgqfqi1syrzrhaalk6m"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 78e97014189..abff04f2372 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.27.0"; + version = "0.28.0"; src = fetchPypi { inherit pname version; - sha256 = "18a7n85xv0qrab2ck94kw92ncjq2l8vl0k34pm22rjvd8h6gixil"; + sha256 = "06x409cgr5im9cppzypj1kqy1fsry906vn5slv7i9hd7fshvd53g"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix new file mode 100644 index 00000000000..c98bc1f303e --- /dev/null +++ b/pkgs/development/python-modules/yappi/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "yappi"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gs48c5sy771lsjhca3m4j8ljc6yhk5qnim3n5idnlaxa4ql30bz"; + }; + + patches = [ ./tests.patch ]; + + checkInputs = [ nose ]; + + meta = with lib; { + homepage = https://github.com/sumerc/yappi; + description = "Python profiler that supports multithreading and measuring CPU time"; + license = licenses.mit; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/development/python-modules/yappi/tests.patch b/pkgs/development/python-modules/yappi/tests.patch new file mode 100644 index 00000000000..bff4b28295b --- /dev/null +++ b/pkgs/development/python-modules/yappi/tests.patch @@ -0,0 +1,12 @@ +--- a/tests/test_functionality.py ++++ b/tests/test_functionality.py +@@ -74,2 +74,3 @@ class BasicUsage(utils.YappiUnitTestCase): + ++ @_unittest.skip('wall-clock-time-sensitive') + def test_get_clock(self): +--- a/tests/test_hooks.py ++++ b/tests/test_hooks.py +@@ -124,2 +124,3 @@ class ContextIdCallbackTest(utils.YappiUnitTestCase): + ++ @unittest.skip('wall-clock-time-sensitive') + def test_pause_resume(self): diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix new file mode 100644 index 00000000000..845fba749d6 --- /dev/null +++ b/pkgs/development/python-modules/yt/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, matplotlib +, setuptools +, sympy +, numpy +, ipython +, hdf5 +, nose +, cython +, python +}: + +buildPythonPackage rec { + pname = "yt"; + version = "3.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "c8ef8eceb934dc189d63dc336109fad3002140a9a32b19f38d1812d5d5a30d71"; + }; + + buildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + matplotlib + setuptools + sympy + numpy + ipython + hdf5 + ]; + + checkInputs = [ + nose + ]; + + checkPhase = '' + cd $out/${python.sitePackages} + HOME=$(mktemp -d) nosetests yt + ''; + + meta = with lib; { + description = "An analysis and visualization toolkit for volumetric data"; + homepage = https://github.com/yt-project/yt; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 89e9e969140..ee9270f3596 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; checkPhase = '' - py.test test + py.test test -k "not TestObject" ''; checkInputs = [ pytest_3 pathpy nbconvert ]; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index d4edbf44a79..4bd95a8d745 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.6.8"; + version = "1.6.9"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "1lqc071v5f8dy1da669l0bfw9p8l6yavzlizzig9m441zcrmbj5d"; + sha256 = "1fi5j0kcndq00x72d8bkx6qiy9nh2i6c6m29gzfqql52qgbq1fd0"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 2ab9f12c779..88d84ad1d11 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.15.0"; + version = "6.16.0"; nativeBuildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0im64lg18bv764i14g3p42dzd7kqq9j5an8dkz1vanypb1jf5j3s"; + sha256 = "0h4818dxd9nq925asa9g3g9i2i5hg85ziapacyiqq4bhab67ysy4"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index c92cdb19ae2..a528a849ad7 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -7,17 +7,15 @@ , r2-for-cutter , python3 }: -let - version = "1.8.0"; -in stdenv.mkDerivation rec { - name = "radare2-cutter-${version}"; + pname = "radare2-cutter"; + version = "1.8.3"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1z3lpzl7k3qn5xabi0qxl83rdbwi00h45blnljx8yfw0am5vfphc"; + sha256 = "03f3cdckh51anx9gd1b0ndb2fg7061hqngvygf32ky29mm2m2lyv"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 0c383b5f83f..24253da1e29 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -109,7 +109,7 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "22227"; + version_commit = "22265"; gittap = "3.6.0"; gittip = "ff3bb6e3b2e6a519b4c975d05758c171a5186389"; rev = "3.6.0"; @@ -119,12 +119,12 @@ in { cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "22227"; - gittap = "3.3.0"; - gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; - rev = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; - version = "2019-02-19"; - sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri"; + version_commit = "22265"; + gittap = "3.6.0"; + gittip = "ff3bb6e3b2e6a519b4c975d05758c171a5186389"; + rev = "ff3bb6e3b2e6a519b4c975d05758c171a5186389"; + version = "2019-06-24"; + sha256 = "0vp94qzznqv87vvjbyyj6swkm6gl7byqvb1jv23i8i42zi5n7qmd"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index aab6869ecb8..44b015ed8e0 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "wata727"; repo = pname; rev = "v${version}"; - sha256 = "1k050kcgvy21jk01mkgscfl7hlfgaa1621920w111fghqxibssan"; + sha256 = "1p6859lax6cmk2q4pvqw4sm78k80gs2561nxa1gwdna3af211fbp"; }; - modSha256 = "17pm6v34gya8bgz8g5hh1cijjldk78j53x9yvsjpcjnqm7l0clcd"; + modSha256 = "021iqy5a703cymcc66rd1rxnpqa3rnzj37y400s0rmiq0zpkm2nc"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix new file mode 100644 index 00000000000..ee2367d28bb --- /dev/null +++ b/pkgs/development/tools/avro-tools/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, makeWrapper, jre, lib }: + +stdenv.mkDerivation rec { + version = "1.9.0"; + name = "avro-tools-${version}"; + + src = fetchurl { + url = + "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${name}.jar"; + sha256 = "164mcz7ljd2ikwsq9ba98galcjar4g4n6ag7kkh466nwrpbmd2zi"; + }; + + dontUnpack = true; + + buildInputs = [ jre ]; + nativeBuildInputs = [ makeWrapper ]; + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/libexec/avro-tools + mv $src ${name}.jar + cp ${name}.jar $out/libexec/avro-tools + + makeWrapper ${jre}/bin/java $out/bin/avro-tools \ + --add-flags "-jar $out/libexec/avro-tools/${name}.jar" + ''; + + meta = with stdenv.lib; { + homepage = https://avro.apache.org/; + description = "Avro command-line tools and utilities"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nequissimus ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index bad0023eef3..1a383b76d5d 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -19,11 +19,11 @@ }: let - version = "0.27.0"; + version = "0.28.0"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0yn662dzgfr8ls4avfl12k5sr4f210bab12wml18bh4sjlxhs263"; + sha256 = "26ad8cdadd413b8432cf46d9fc3801e8db85d9922f85dd8a7f5a92fec876557f"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -33,7 +33,6 @@ let let srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { - name = d.name; urls = d.urls; sha256 = d.sha256; }); @@ -42,12 +41,13 @@ let srcs.io_bazel_skydoc srcs.bazel_skylib srcs.io_bazel_rules_sass + srcs.platforms (if stdenv.hostPlatform.isDarwin then srcs.${"java_tools_javac11_darwin-v2.0.zip"} else srcs.${"java_tools_javac11_linux-v2.0.zip"}) srcs.${"coverage_output_generator-v1.0.zip"} srcs.build_bazel_rules_nodejs - srcs.${"android_tools_pkg-0.4.tar.gz"} + srcs.${"android_tools_pkg-0.7.tar.gz"} ]); distDir = runCommand "bazel-deps" {} '' @@ -136,8 +136,6 @@ stdenv.mkDerivation rec { # This is breaking the build of any C target. This patch removes the last # argument if it's found to be an empty string. ./trim-last-argument-to-gcc-if-empty.patch - - ./python-stub-path-fix.patch ] ++ lib.optional enableNixHacks ./nix-hacks.patch; @@ -220,13 +218,13 @@ stdenv.mkDerivation rec { cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; }; java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; }; protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; }; - pythonBinPath = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; }; + pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; }; bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; }; # update the list of workspace dependencies @@ -310,9 +308,8 @@ stdenv.mkDerivation rec { genericPatches = '' # Substitute python's stub shebang to plain python path. (see TODO add pr URL) # See also `postFixup` where python is added to $out/nix-support - substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\ - --replace "/usr/bin/env python" "${python3}/bin/python" \ - --replace "NIX_STORE_PYTHON_PATH" "${python3}/bin/python" \ + patchShebangs src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt \ + --replace "#!/usr/bin/env python" "#!${python3}/bin/python" # md5sum is part of coreutils sed -i 's|/sbin/md5|md5sum|' \ @@ -332,6 +329,11 @@ stdenv.mkDerivation rec { substituteInPlace tools/build_rules/test_rules.bzl \ --replace /bin/bash ${customBash}/bin/bash + for i in $(find tools/cpp/ -type f) + do + substituteInPlace $i \ + --replace /bin/bash ${customBash}/bin/bash + done # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ @@ -339,8 +341,8 @@ stdenv.mkDerivation rec { # add nix environment vars to .bazelrc cat >> .bazelrc < 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.5.3) + cocoapods (1.7.4) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.3) - cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.0, < 2.0) + cocoapods-core (= 1.7.4) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.5.7, < 2.0) - cocoapods-core (1.5.3) + ruby-macho (~> 1.4) + xcodeproj (>= 1.10.0, < 2.0) + cocoapods-core (1.7.4) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -45,20 +45,20 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.5) escape (0.0.4) - ffi (1.10.0) - fourflusher (2.0.1) + ffi (1.11.1) + fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.9.6) - cocoapods (~> 1.5.3) - mustache (~> 1.1.0) + jazzy (0.10.0) + cocoapods (~> 1.5) + mustache (~> 1.1) open4 - redcarpet (~> 3.4.0) + redcarpet (~> 3.4) rouge (>= 2.0.6, < 4.0) - sass (~> 3.6.0) - sqlite3 (~> 1.3.13) + sass (~> 3.6) + sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) liferaft (0.0.6) minitest (5.11.3) @@ -72,20 +72,20 @@ GEM rb-inotify (0.10.0) ffi (~> 1.0) redcarpet (3.4.0) - rouge (3.3.0) + rouge (3.6.0) ruby-macho (1.4.0) - sass (3.6.0) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sqlite3 (1.3.13) + sqlite3 (1.4.1) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.8.2) + xcodeproj (1.11.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix index 981c9c1d060..7fff98e0325 100644 --- a/pkgs/development/tools/jazzy/default.nix +++ b/pkgs/development/tools/jazzy/default.nix @@ -6,6 +6,8 @@ bundlerApp rec { gemdir = ./.; exes = [ "jazzy" ]; + passthru.updateScript = ./update; + meta = with lib; { description = "A command-line utility that generates documentation for Swift or Objective-C"; homepage = https://github.com/realm/jazzy; diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix index 0a8ea5f9a50..ae544229a50 100644 --- a/pkgs/development/tools/jazzy/gemset.nix +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -44,10 +44,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5cz19p0j9k1hvn35lxnv3dn8i65n4qvi5nzjaf53pdgh52401h"; + sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc"; type = "gem"; }; - version = "1.5.3"; + version = "1.7.4"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -55,10 +55,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnxcd2xnvf60f8w27glq5jcn9wdhzch9nkdb24ihhmpxfgj3f39"; + sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c"; type = "gem"; }; - version = "1.5.3"; + version = "1.7.4"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -157,18 +157,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.1"; }; fourflusher = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dzmkxyzrk475c1yk5zddwhhj28b6fnj4jkk1h5gr1c2mrar72d5"; + sha256 = "1afabh3g3gwj0ad53fs62waks815xcckf7pkci76l6vrghffcg8v"; type = "gem"; }; - version = "2.0.1"; + version = "2.3.1"; }; fuzzy_match = { source = { @@ -205,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09df1mkf8fhzj0hmgdifnyvd8lhgxr1ps8yjyxfk8n2jkkbiyj7i"; + sha256 = "0sljk5v4823h7kzf0yag7f1vf6sahpqip62xngvrhm3il9dx3j72"; type = "gem"; }; - version = "0.9.6"; + version = "0.10.0"; }; liferaft = { source = { @@ -316,10 +318,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "0bxjfg6bgc6zpczc5nsmpd6406b97fg0hldl968rgxkz1m6hblda"; type = "gem"; }; - version = "3.3.0"; + version = "3.6.0"; }; ruby-macho = { groups = ["default"]; @@ -337,10 +339,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18c6prbw9wl8bqhb2435pd9s0lzarl3g7xf8pmyla28zblvwxmyh"; + sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.4"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -352,12 +354,14 @@ version = "4.0.0"; }; sqlite3 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; + sha256 = "1v903nbcws3ifm6jnxrdfcpgl1qg2x3lbif16mhlbyfn0npzb494"; type = "gem"; }; - version = "1.3.13"; + version = "1.4.1"; }; thread_safe = { source = { @@ -393,9 +397,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ji3wmpr6xm4172vxh9y6731vm2xrvv7ccwk4ijd5n4if1dakm03"; + sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; type = "gem"; }; - version = "1.8.2"; + version = "1.11.0"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/jazzy/update b/pkgs/development/tools/jazzy/update index ff0e1686836..1f0d11c7dde 100755 --- a/pkgs/development/tools/jazzy/update +++ b/pkgs/development/tools/jazzy/update @@ -3,6 +3,8 @@ set -e +cd "$(dirname "${BASH_SOURCE[0]}")" + rm -f Gemfile.lock bundler lock bundix diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index cb00111b2b4..19ed711f1f4 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { - name = "babeltrace-1.5.6"; + name = "babeltrace-1.5.7"; src = fetchurl { url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2"; - sha256 = "1dxv2pwyqx2p7kzhcfansij40m9kanl85x2r68dmgp98g0hvq22k"; + sha256 = "0yw05cnk5w8b5nbznycglyn4h3hq56a1n8rlb9k9rlzz4ph32lr1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index 43d86966694..e4a6416129e 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pkgconf"; - version = "1.6.1"; + version = "1.6.3"; src = fetchurl { url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1310va0nm8iyb4ghgz9qlx7qb00iha1523hq1zbgj0c98cwfxf92"; + sha256 = "04525vv0y849vvc2pi60g5wd9fjp1wbhra2lniifi82y1ldv7w31"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 49b12b60b14..acdc712786f 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "5.1"; + version = "5.2"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "12wsga1v3rab24gr0mpfip7j7gwr90m8f9h6fviqxa3xgnwl38zm"; + sha256 = "1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 3b176541f51..67acf874baf 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.1"; + version = "3.3.2"; minimumOCamlVersion = "4.02.1"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "ocaml"; repo = pname; rev = "v${version}"; - sha256 = "1z2m6jykgn3nylh4bfirhxlb0bwamifv4fgml6j34ggk1drs8xrl"; + sha256 = "1z9mcxflraj15sbz6q7f84n31n9fsialw7z8bi3r1biz68nypva9"; }; buildInputs = [ yojson ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index f844b369eb3..452f162b235 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -7,7 +7,7 @@ assert lib.versionAtLeast ocaml.version "4.02.3"; let srcs = { cmdliner = fetchurl { - url = "https://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz"; + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz"; sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; }; cppo = fetchurl { @@ -23,16 +23,16 @@ let sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"; }; dune-local = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/1.2.1/dune-1.2.1.tbz"; - sha256 = "00c5dbm4hkdapc2i7pg07b2lj8sv6ly38qr7zid58cdmbmzq21z9"; + url = "https://github.com/ocaml/dune/releases/download/1.6.3/dune-1.6.3.tbz"; + sha256 = "0dmf0wbfmgdy5plz1bjiisc2hjgblvxsnrqjmw2c8y45v1h23mdz"; }; extlib = fetchurl { url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz"; sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; }; mccs = fetchurl { - url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+9.tar.gz"; - sha256 = "0gf86c65jdxxcwd96kcmrqxrmnnzc0570gb9ad6c57rl3fyy8yhv"; + url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+10.tar.gz"; + sha256 = "003kam22plnh88liyxi4d1065j2rys1mpdla20rxps53ah1xwmxg"; }; ocamlgraph = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz"; @@ -55,13 +55,13 @@ let sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.4.zip"; - sha256 = "1312nc9s4h0vksiimz7jsv3zw17fa05p6mdx23s5sii0qspvnx8c"; + url = "https://github.com/ocaml/opam/archive/2.0.5.zip"; + sha256 = "0arv5zaikvcqbicdk47jpfgvjrqhqm71yq2zmj7pp6zf7bm0js6s"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "2.0.4"; + version = "2.0.5"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -117,4 +117,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.4 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.0.5 -p opam-shebangs.patch diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index 20996537c32..71633a8a885 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -1,19 +1,19 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "05dk2y223fjaw49sj0pia9ddccs1j0x4fdyz0bnss38dgf1njygx"; + sha256 = "1g011c98vix0285ws8xby5v50272v15zfyaj948vazsb4zl0gxbm"; }; cargoSha256 = "0bpy8888zbqy9b8hkbfsdxqcs88dn2r7p3qnhfn7a6ri4bw7ihhw"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; homepage = "https://github.com/RazrFalcon/cargo-bloat"; license = licenses.mit; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index bce1e273cc4..ca4b6825a38 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,19 +2,22 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.8.3"; + version = "0.8.7"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "08zlnk1k1nddjciccfdcplxqngsnz6ml3zxm57mijabzybry8zz1"; + sha256 = "040rivayr0dgmrhlly5827c850xbr0j5ngiy6rvwyba5j9iv2x0y"; }; cargoSha256 = "1nig4891p7ii4z4f4j4d4pxx39f501g7yrsygqbpkr1nrgjip547"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + # https://github.com/eqrion/cbindgen/issues/338 + RUSTC_BOOTSTRAP = 1; + meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; homepage = https://github.com/eqrion/cbindgen; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 50e2bd8dad8..715aa552ae5 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { name = "sauce-connect-${version}"; - version = "4.5.1"; + version = "4.5.3"; src = fetchurl ( if stdenv.hostPlatform.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "0lpfvlax7k8r65bh01i3kzrlmx0vnm9vhhir8k1gp2f4rv6z4lyx"; + sha256 = "05fv9rggibx6dbdw8ywwwq45i9gdc53b7i7jhvl01m1sn2ygrrqd"; } else if stdenv.hostPlatform.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; sha256 = "1h9n1mzmrmlrbd0921b0sgg7m8z0w71pdb5sif6h1b9f97cp353x"; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix new file mode 100644 index 00000000000..e36b950f1f2 --- /dev/null +++ b/pkgs/development/web/cypress/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip }: + +stdenv.mkDerivation rec{ + pname = "cypress"; + version = "3.4.0"; + + src = fetchzip { + url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; + sha256 = "1j59az9j37a61ryvh975bc7bj43qi3dq0871fyambh1j2mby00qn"; + }; + + # don't remove runtime deps + dontPatchELF = true; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = with xorg; [ + libXScrnSaver libXdamage libXtst + ] ++ [ + nss gtk2 alsaLib gnome2.GConf gtk3 unzip + ]; + + runtimeDependencies = [ udev.lib ]; + + installPhase = '' + mkdir -p $out/bin $out/opt/cypress + cp -vr * $out/opt/cypress/ + # Let's create the file binary_state ourselves to make the npm package happy on initial verification. + echo '{"verified": true}' > $out/opt/cypress/binary_state.json + ln -s $out/opt/cypress/Cypress $out/bin/Cypress + ''; + + meta = with stdenv.lib; { + description = "Fast, easy and reliable testing for anything that runs in a browser"; + homepage = "https://www.cypress.io"; + license = licenses.mit; + platforms = ["x86_64-linux"]; + maintainers = with maintainers; [ tweber mmahut ]; + }; +} diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 018c7f96969..24f56789198 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "grails-${version}"; - version = "3.3.10"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "1lykawfi47c2k6lq4vrnghlz8gcnmqsslxsnaq4d2n78g0y3yyr2"; + sha256 = "13y0q3gcdpfwib3ahrgh36rhr4smbrq2g4xgvnk8c0a6wvmz85sx"; }; buildInputs = [ unzip ]; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 2fd27d2f9d6..91969a335f8 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz"; - sha256 = "1r8i6yzgww7aw8iibqagahg1gqgw7305g07agy0dpszzvp0mi0gz"; + sha256 = "0jjnnzp1a2l8j1cla28pr460lx6cg4ql3acqfxhxv8a5a4jqrzzr"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 8b05975c167..2a0a4369860 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.23.0"; + version = "1.25.0"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "1lyzxf03kdfvkbb6p7hxlarbb35lq5bh094g49v3bz9z4z9065p2"; + sha256 = "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 764e60ac13b..b977b2c0c15 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.6.1"; + version = "0.4.7"; src = fetchFromGitHub { owner = "kozec"; repo = pname; rev = "v${version}"; - sha256 = "1kcqsnrlwl4s94j6ahgkz3w4sy9hsr95y624zab6g10w0fl5sqrc"; + sha256 = "1dskjh5qcjf4x21n4nk1zvdfivbgimsrc2lq1id85bibzps29499"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index e86db53c88a..8edf7ad3959 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -95,10 +95,25 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ((map (links "share/wine/gecko") geckos) ++ (map (links "share/wine/mono") monos))} '' + lib.optionalString supportFlags.gstreamerSupport '' - for i in wine ; do - if [ -e "$out/bin/$i" ]; then - wrapProgram "$out/bin/$i" \ + # Wrapping Wine is tricky. + # https://github.com/NixOS/nixpkgs/issues/63170 + # https://github.com/NixOS/nixpkgs/issues/28486 + # The main problem is that wine-preloader opens and loads the wine(64) binary, and + # breakage occurs if it finds a shell script instead of the real binary. We solve this + # by setting WINELOADER to point to the original binary. Additionally, the locations + # of the 32-bit and 64-bit binaries must differ only by the presence of "64" at the + # end, due to the logic Wine uses to find the other binary (see get_alternate_loader + # in dlls/kernel32/process.c). Therefore we do not use wrapProgram which would move + # the binaries to ".wine-wrapped" and ".wine64-wrapped", but use makeWrapper directly, + # and move the binaries to ".wine" and ".wine64". + for i in wine wine64 ; do + prog="$out/bin/$i" + if [ -e "$prog" ]; then + hidden="$(dirname "$prog")/.$(basename "$prog")" + mv "$prog" "$hidden" + makeWrapper "$hidden" "$prog" \ --argv0 "" \ + --set WINELOADER "$hidden" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" fi done diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index edfafc4e9d3..ca90c2c8884 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -193,12 +193,12 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2019-06-13"; + version = "2019-07-11"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "05c6b113dd82d2ad4d424b696b14a2b89a337541"; - sha256 = "1s56f8pqn5hldmi54qybjldi3lwyyznwf4jk2qnvp77civk8mjn9"; + rev = "59d1bbdec7d82740811806c4d4da1963089064a8"; + sha256 = "0yfh6if7zch7zrq7f6a0npfhqg2vsa8gilvbj5a6whhvhay3pcw3"; }; }; @@ -292,12 +292,12 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-07-08"; + version = "2019-07-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "5551aa4af056b790467aafc3ab734eb5f5e9a8f1"; - sha256 = "0rzyrlhrkvi7nzwbq2bina1j9ml22kxddj76ykwbxqkb6wxlzjqn"; + rev = "9cdc2b918bbbcadb580d9635ab6ee1accfc140dc"; + sha256 = "0nqv110n8ybh980yhxfcpzwg5bjzpiw9586bn700pw5xgnb9sf5r"; }; }; @@ -336,23 +336,23 @@ let coc-imselect = buildVimPluginFrom2Nix { pname = "coc-imselect"; - version = "2019-05-07"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-imselect"; - rev = "21b40909211767701f639b2c55662e841ea34138"; - sha256 = "188db3lw4n7m0ahkij43cvmrni4rji6gwxdsy5vydh30af0p4br7"; + rev = "e5df00d935757adb2c8f86dbc7b3bc0380adbecd"; + sha256 = "0k2dxvgr5kq1kq4w5y986yv2xz1zcbd55cwcncy64zjkfcffmjl7"; }; }; coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2019-06-17"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "fb8309d745a075370654bcb810350e5accf590b6"; - sha256 = "14mvfsp7k5m7591j2j9cvp56dyxr8s679jyjidb41v7jshqgh16g"; + rev = "8d1fe4278e4cfada080f023d71b9233dbfdfc41e"; + sha256 = "0h26x35gnrjhd3dqbza98317jjwsc70fv1sd99xhcshxfszal6vd"; }; }; @@ -369,23 +369,23 @@ let coc-json = buildVimPluginFrom2Nix { pname = "coc-json"; - version = "2019-06-21"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-json"; - rev = "fafaa178b3b4df80a4a6f3a23522fa1a7d16bccb"; - sha256 = "1s9yr5pqk76bb6qsw05qzywm8k65b9wplg4kxn65vs1a9zl7m296"; + rev = "ed9743a6cfe1db5139e3a42f6aea01d3004be01b"; + sha256 = "0h3dwcv931xs5y87kqyq2my5z85xv904cbmr41bj8mn1myw8chsf"; }; }; coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-07-04"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "6d6da810f24484278cd227f1907f6f94931092d6"; - sha256 = "143a0rxcpml30nbaig17c5vn076qscj48qcpb4pjdh0qkfk9mvp0"; + rev = "1f9583616b426267db941ea23ef3cef5b780b9c6"; + sha256 = "0ldvx2skl9ln04jpz84nyvyrp1im5mw4dri1m8x1ayzvzrvqig5d"; }; }; @@ -424,12 +424,12 @@ let coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2019-06-28"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "bfa80768fe1cb417c8d6a117f300378e2cab0cee"; - sha256 = "1vqwcjjxkdf6q0rzj7ps2b05dsvccf0xphgb2hl3lgsw2dqdn24y"; + rev = "f36feb0251aa668a84f027bd937c93f69bf98c84"; + sha256 = "1hc6hn5qlsvbyc52f0m398kjqw4j4sdqhjzpkxcdssa541fvn7pz"; }; }; @@ -446,34 +446,34 @@ let coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2019-06-19"; + version = "2019-07-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "1053500ba968c685e96e55b536a7e1ba679dc822"; - sha256 = "02ldgiay99vmi3033h8y40iz6fhqyjhxl63yvyp8ylr7x76lg0a0"; + rev = "0c005a817016412e6fba56ab81d20a949c42fbd1"; + sha256 = "0h5a1a9s9rarafmfy2i77rrsmg9393hdk53v3hfzs0f00q9qk7wn"; }; }; coc-smartf = buildVimPluginFrom2Nix { pname = "coc-smartf"; - version = "2019-06-26"; + version = "2019-07-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-smartf"; - rev = "a77e6573be47d237957f0272a368f48c44b337a8"; - sha256 = "0k2f4xa223yzbp32828f5j766v61dkl2yp87qd0dxsgzgcwigdzi"; + rev = "56252948dc0839765a9b57adbf52c293b599fe05"; + sha256 = "1mabawpfmlhhlkc5f0h15dci6b1i9ndpiry6fi0gcl3j6m76w02d"; }; }; coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2019-07-03"; + version = "2019-07-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "aa77cb797953fdd8d41708701753f974663f94fc"; - sha256 = "1c4rylcvhrnicaq6v9l8pgyhlic6m1p92z6061z2cj9m09lv2rc0"; + rev = "bbc7ce11471cb48751d436193e4bacafed65e773"; + sha256 = "1imhjb6djy66zx5qj9spg2nddg77c4ygxs0jx3z9kiddqsajg7af"; }; }; @@ -501,12 +501,12 @@ let coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-07-05"; + version = "2019-07-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "50504d07788c890c77675d8ca284ef219d72ee98"; - sha256 = "0ha4yrj455icr2m4nflh0vqhc917xhn9732qlc1hg9rzhfk3a3zd"; + rev = "f94a00ecb957fb7537dc68179c78adea0f1c4aca"; + sha256 = "0s0jip0prapizq4pp46dayq21v4mjqkkv9x2hi3xmxrc7w8g5ndq"; }; }; @@ -523,34 +523,34 @@ let coc-tslint-plugin = buildVimPluginFrom2Nix { pname = "coc-tslint-plugin"; - version = "2019-06-19"; + version = "2019-07-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tslint-plugin"; - rev = "c2134f487f892ff3beb60b856d21c6791486d460"; - sha256 = "0jldrh5vlfijarmzz0zhpc8k9dwngxcsygfqr3nirmj8dcx7zccb"; + rev = "9076fb5f1bb185110eb79189d17f03e82f2d0f9c"; + sha256 = "1mxnpgvi12dvbhf9l1zwdlbmvqq8j311z4rfcgsi1p9kxm2dv56r"; }; }; coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-06-27"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "f574fc35bde261970455022eeb8202e387bfad90"; - sha256 = "143pb96bfc1y7s2hnrp29dmy1rlwqv5ypj1vx0dy60qaymyvznwp"; + rev = "ee7f86fdf9c21001a1b322f219ec7c150d64d337"; + sha256 = "06yzqd5m3bz8lnqhrxsxmbz9n587vqjafwdfs9jkb3974ry88r5b"; }; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2019-06-28"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "56d3cd6cc30b160252f9c32cdbb4851ace2f10de"; - sha256 = "16j89n0fkqxvs0ld44zlbm0w4xqfl0zsd82z2xa0dgj9hxqmpfyb"; + rev = "ebd982bde36db01d85e02ca48898be303d878d38"; + sha256 = "0dxwvx9mwhlxpa1wn1cy3psb2s2rafibmvin4rnzxb467bkwbgiz"; }; }; @@ -600,12 +600,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2019-07-09"; + version = "2019-07-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "b24601e6af3677dd5fd0d70bdcdc97a30591ae37"; - sha256 = "0zxbrjy141ci02hwds200b6v1gj1bm98wbhr5wjmir8r9k4hrqg9"; + rev = "f3072ec53565b6725504a37f19617ce7d2c8f0ed"; + sha256 = "0v41wh9qd5gvvi345yk2ajq5xbrwb56gziycqa9pgwa9b9bxck7k"; }; }; @@ -788,12 +788,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-07-09"; + version = "2019-07-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "0538a6449e9d1237d6df738ec612b7c3fe01b6f1"; - sha256 = "0jznqn9hpiy3z2smss7z7lv0d37brm6a104cagbxbk7qar6dl97w"; + rev = "f80fc06a5455dbfb3691dce4f224c8cf8d9ffde2"; + sha256 = "09x0rhv4aplgpbhjqms6w9xwhx1w5zlpprxzx0yjx554mrc0lhia"; }; }; @@ -1422,12 +1422,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2019-07-05"; + version = "2019-07-12"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "a265823c00098cda2e2a3d29eb40d244a3b6103f"; - sha256 = "00i37ng5v3wabjmhlx7a0cdpn6k49dy99ar8bmh4c7r82894qf2j"; + rev = "08465b99774fe43d832492d7c354a317fc81f9bf"; + sha256 = "1gi10wnsqk6a58yy27qdn7hsy1gz2qrib5g59h8hchahdkmhgl2d"; }; }; @@ -1642,12 +1642,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-07-05"; + version = "2019-07-12"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "5be5c1e6eeea2a26f706a54c5b9bab8746763e89"; - sha256 = "1chi9qkg06jv79vp3y9c4y49qijrbsn62xjgkwjpvm7hiay4b6z3"; + rev = "ccad9c528ad6fdbb4a249f4898f67b51e41b04c3"; + sha256 = "1gjglx90nbx9mjl4ggda1db9alq3zsxwi3ydfwfs23hyifihlsws"; }; }; @@ -1686,12 +1686,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2019-05-28"; + version = "2019-07-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "c5bb9211f3050e405ec9e03cf655624c205b9e94"; - sha256 = "1shai9198krqqdqsxiyypbfc5h49npzixyh9xp520y1a1ml0dcba"; + rev = "eac39588c45bda3bcd46f386e063309449f23ff5"; + sha256 = "105w3qfyjbmx8w8cxcq476zy8yyblkzz3gs8jpl2dl453zs2qli6"; }; }; @@ -1763,12 +1763,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-07-07"; + version = "2019-07-10"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "2f0d48d632dc303095084b382cb665ae57ad2e63"; - sha256 = "0zlfam5kvz3cyl40hk5g6bpmmwm62g6l73wf408q0v8k0zn87mb7"; + rev = "4ac07f52a312a24d82deba715ee489e6c5b00259"; + sha256 = "0fwaf38064qawclay95ncydj2faz3krhiz23ghzikdxzx8bvjrmg"; }; }; @@ -2390,12 +2390,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-06-11"; + version = "2019-07-12"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "ce382caed5aed6a8b8b26a4ad7a750bfd9529869"; - sha256 = "18sxnf9k3bpyk6fsy3qhiy56k5w5d9izb1wazz9gyfwwbygq455c"; + rev = "a30c11ee96cd402e0044a2c3dde6d6e5cc4d6273"; + sha256 = "01zncza0b7bm7f4dna88pq42fq4ajg8zhyk1kzzrf4n1fid3nljz"; }; }; @@ -2500,12 +2500,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-06-11"; + version = "2019-07-10"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "42a51ef8d9656b7d126ce8ad554045da16fe37da"; - sha256 = "03cxaxm2yvxa80lj78aqycj09crikpwdr8151w1l5rhlwwbg18n9"; + rev = "86712dc2de083e91a78bddddbb7fe7defe818c79"; + sha256 = "171fyxv09nikb5w2bmy3j5fmhb7mmqgsmjp9v3mc03hdxbf68kfk"; }; }; @@ -2786,12 +2786,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2018-12-19"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "4f993fad63f98b844a5bd728c5a963c0da404e1a"; - sha256 = "12c8yqwwm7n63r3gpl5zc5qd9mq3xdzk4rj4s91ni5x6njirpjzf"; + rev = "a7009a968869319bf0811110fd2006738ba27370"; + sha256 = "1c0zdsxv3x0bvjbvbr633g16464lhq66yy4jpw6pwsw6h2p78iha"; }; }; @@ -3160,12 +3160,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-07-07"; + version = "2019-07-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "7c7641d18a8c530b70363e19f3f258b597b42484"; - sha256 = "0fpiv936qisadl87p9rim1y5qw0wwvl9clmy27rhy5bbspwr8pdr"; + rev = "e289d119906796550beedc133419109820b05bda"; + sha256 = "18963xg6cv3wkrx044lxsvwdc08sw3jg2r0ns5si61hh35rq065j"; }; }; @@ -3226,12 +3226,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-07-09"; + version = "2019-07-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5f9602e12f27bd59e38a0814c524c7c385ef4137"; - sha256 = "1w12n7m607sa8rl704m1wq763zzz556ii1izsqnlyyrag0ld51cq"; + rev = "d0049b4417cf20af6d98b8f1e0febcc7c6a6f2bb"; + sha256 = "1j27kbwlfbsymd1aqa0zb8hp4v7ks927x2256qwp2f87a8j14bq0"; }; }; @@ -3303,12 +3303,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-07-09"; + version = "2019-07-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "09edd7a4ff02895ffe48a51b6c83e104b7cd013a"; - sha256 = "0mki5zy1r36vbs8fn2arb6nbw4b88iqsgdw00lw3263c8bdw23z7"; + rev = "b5874d4b7c3a612351187c24deaf628276f6cece"; + sha256 = "1rdvjzcd8wm1v1x86gr3hj5zbfyk867hdpcs05wgh1bjl6ymbbxx"; }; }; @@ -3755,12 +3755,12 @@ let vim-multiple-cursors = buildVimPluginFrom2Nix { pname = "vim-multiple-cursors"; - version = "2019-06-26"; + version = "2019-07-11"; src = fetchFromGitHub { owner = "terryma"; repo = "vim-multiple-cursors"; - rev = "730a11cee6deedc6f4ccc02e2c1d990f8629da25"; - sha256 = "1m21bjdkah5b7pw5nl5r6lvj1dl4l7yhz05hwzhy43a31nbba2y3"; + rev = "2609c9b054b562b6bf46936f3e80a25042c5d572"; + sha256 = "1vd7rcns8r52vaaamfz5p23vmrz6j2b3z3yqjlc46s4pmzxdvpgh"; }; }; @@ -4393,12 +4393,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-07-06"; + version = "2019-07-12"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "113c3bd92a18a0b20b0c63f8335139021afc8b0f"; - sha256 = "0ijxnbgz5l3y5gdavh0z7173dn7930xyn2rzz0sbja9m53f8yik7"; + rev = "6781cc1dbfec16efc7a67bf8f8c118898664da11"; + sha256 = "0iqbb5ycl33q0542gj7kr3dyalvha59y0dyyzymzs5lqa1q0y7in"; }; }; @@ -4679,12 +4679,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-07-07"; + version = "2019-07-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "bdc7ba470e477255ddb26c84c8934da58904c475"; - sha256 = "0hazv9xqjag6fgg7y34ilcnjd3pah259r1jazxwbkdxrzgc0pmhw"; + rev = "407ca82011b6d99ec84932730f21491b954b3d29"; + sha256 = "15mcj3kv8iiyphgzv7gzzpqwlrz7r05fzwpqm1sb38fazklcvg2q"; }; }; @@ -4745,12 +4745,12 @@ let webapi-vim = buildVimPluginFrom2Nix { pname = "webapi-vim"; - version = "2019-07-08"; + version = "2019-07-11"; src = fetchFromGitHub { owner = "mattn"; repo = "webapi-vim"; - rev = "263e31b11948de7b20290b6ffc118e2c3223e2d2"; - sha256 = "08dd6qqvf24y5c49j2rirwfp78q6i5b7f6ng93gfkrx6adacin5d"; + rev = "4d1e59c4fe01dec9d3008704dd06977a7bc3b0f2"; + sha256 = "15k9h4nhsiwasv8l4mq6m8mw989pmpdfsinv9bdwh41q1pmkv551"; }; }; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index ec513c5a7b9..c4742253120 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -62,7 +62,9 @@ rec { ms-vscode.cpptools = callPackage ./cpptools {}; - ms-python.python = callPackage ./python {}; + ms-python.python = callPackage ./python { + extractNuGet = callPackage ./python/extract-nuget.nix { }; + }; vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 65130da9095..f05afcc1928 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -1,5 +1,5 @@ -{ lib, vscode-utils - +{ lib, stdenv, fetchurl, vscode-utils, extractNuGet +, icu, curl, openssl, lttng-ust, autoPatchelfHook , pythonUseFixed ? false, python # When `true`, the python default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. # Defaults to `false` as we expect it to be project specific most of the time. @@ -14,16 +14,48 @@ assert ctagsUseFixed -> null != ctags; let pythonDefaultsTo = if pythonUseFixed then "${python}/bin/python" else "python"; ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags"; -in -vscode-utils.buildVscodeMarketplaceExtension { + # The arch tag comes from 'PlatformName' defined here: + # https://github.com/Microsoft/vscode-python/blob/master/src/client/activation/types.ts + arch = + if stdenv.isLinux && stdenv.isx86_64 then "linux-x64" + else if stdenv.isDarwin then "osx-x64" + else throw "Only x86_64 Linux and Darwin are supported."; + + languageServerSha256 = { + "linux-x64" = "0mqjl3l1zk1zd7n0rrb2vdsrx6czhl4irdm4j5jishg9zp03gkkd"; + "osx-x64" = "1csq8q8fszv9xk9qiabg12zybxnzn8y2jsnvjrlg4b8kvm63sz40"; + }."${arch}"; + + # version is languageServerVersion in the package.json + languageServer = extractNuGet rec { + name = "Python-Language-Server"; + version = "0.2.82"; + + src = fetchurl { + url = "https://pvsc.azureedge.net/python-language-server-stable/${name}-${arch}.${version}.nupkg"; + sha256 = languageServerSha256; + }; + }; +in vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2018.12.1"; - sha256 = "1cf3yll2hfililcwq6avscgi35caccv8m8fdsvzqdfrggn5h41h4"; + version = "2019.6.22090"; + sha256 = "11q4ac7acp946h43myjmp2f2vh10m1c4hn1n0s5pqgjvn0i6bi3i"; }; + buildInputs = [ + icu + curl + openssl + lttng-ust + ]; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + postPatch = '' # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`. substituteInPlace "./package.json" \ @@ -34,8 +66,14 @@ vscode-utils.buildVscodeMarketplaceExtension { --replace "\"default\": \"ctags\"" "\"default\": \"${ctagsDefaultsTo}\"" ''; - meta = with lib; { - license = licenses.mit; - maintainers = [ maintainers.jraygauthier ]; - }; + postInstall = '' + mkdir -p "$out/$installPrefix/languageServer.${languageServer.version}" + cp -R --no-preserve=ownership ${languageServer}/* "$out/$installPrefix/languageServer.${languageServer.version}" + chmod -R +wx "$out/$installPrefix/languageServer.${languageServer.version}" + ''; + + meta = with lib; { + license = licenses.mit; + maintainers = [ maintainers.jraygauthier ]; + }; } diff --git a/pkgs/misc/vscode-extensions/python/extract-nuget.nix b/pkgs/misc/vscode-extensions/python/extract-nuget.nix new file mode 100644 index 00000000000..e4d3b6a0ed1 --- /dev/null +++ b/pkgs/misc/vscode-extensions/python/extract-nuget.nix @@ -0,0 +1,15 @@ +{ stdenv, unzip }: +{ name, version, src, ... }: + +stdenv.mkDerivation { + inherit name version src; + + buildInputs = [ unzip ]; + dontBuild = true; + unpackPhase = "unzip $src"; + installPhase = '' + mkdir -p "$out" + chmod -R +w . + find . -mindepth 1 -maxdepth 1 | xargs cp -a -t "$out" + ''; +} diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index 82d39dbfec6..2216e425897 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -33,11 +33,17 @@ let inherit vscodeExtUniqueId; inherit configurePhase buildPhase dontPatchELF dontStrip; + installPrefix = "share/${extendedPkgName}/extensions/${vscodeExtUniqueId}"; + buildInputs = [ unzip ] ++ buildInputs; installPhase = '' - mkdir -p "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}" - find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/" + runHook preInstall + + mkdir -p "$out/$installPrefix" + find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/$installPrefix/" + + runHook postInstall ''; }); diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 00183f18332..0e8377141ed 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "eventstat-${version}"; - version = "0.04.05"; + version = "0.04.06"; src = fetchzip { url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "1s9d6wl7f8cyn21fwj894dhfvl6f6f2h5xv26hg1yk3zfb5rmyn7"; + sha256 = "1w0lb94rmyrcl03s6ajn7mcdbhh2s6xhsg7kfchy1bpwqcjh2yli"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index 82ce6d12395..5b398bcec9a 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "fnotifystat-${version}"; - version = "0.02.01"; + version = "0.02.02"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "18p6rqb3bhs2ih6mnp57j0cyawjm0iwky6y3ays54alkxqaz8gmx"; + sha256 = "14d6cikny9rn7fcc6ncwh02mg6jrgfi1abpxifr46gyvp3w38w55"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index 8a2a6414949..8432f72e0c9 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "forkstat-${version}"; - version = "0.02.09"; + version = "0.02.10"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"; - sha256 = "1h5ha9w6rawh9kx39swjxs029202qxi0j9w38y7ilwq5pj447bxw"; + sha256 = "1nmnvgajvpas1azbr27nlgq5v3cwgrfwdhln3mr7dvhikz6rn0xg"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 57eb09e40cf..0d27d5d97fc 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -59,5 +59,19 @@ in stdenv.mkDerivation { license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ]; platforms = platforms.linux; maintainers = with maintainers; [ primeos lheckemann ]; + + longDescription = '' + A set of small useful utilities for Linux networking including: + + arping + clockdiff + ninfod + ping + rarpd + rdisc + tftpd + tracepath + traceroute6 + ''; }; } diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index 0e99dd976c7..67a123a3764 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ipvsadm-${version}"; - version = "1.29"; + version = "1.30"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/ipvsadm/${name}.tar.xz"; - sha256 = "c3de4a21d90a02c621f0c72ee36a7aa27374b6f29fd4178f33fbf71b4c66c149"; + sha256 = "033srm20n3114aci3b6cwxnkm7n68k09di2aziiryg27vxq3smwm"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index b9d05c9fe6e..b244f48f24c 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.58"; + version = "4.19.59"; # 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 = "1waqk2ggnnaqa5pxhdbvxkkchvxxz9pbkqnr5pn5rj6h2v5644az"; + sha256 = "0nxkr196q0b1hs3a3zavpsjp0jgbqmcwdf0y0f3hbpirshjiid5q"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index e0e64fdc5d4..958aca39048 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.17"; + version = "5.1.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0gf4jqmq6b66jrlygmvn2z8xif3n83yq85jldbm3r257crww6dar"; + sha256 = "0spkk3pqp5fhvchgjhcm53zl1qqwsvdy7p4filb1nz4xypfff4v0"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 094c5abf244..512fb351200 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2"; + version = "5.2.1"; # 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 = "1ry11b5sc20jh7flnp94m20627jzl3l09rzmfjsk3a71fbv6dbal"; + sha256 = "01k5v3kdwk65cfx6bw4cl32jbfvf976jbya7q4a8lab3km7fi09m"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 111b5a4cc90..76a0ae2fcf1 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "5.1.2019.07.11"; + version = "5.1.2019.07.13"; modDirVersion = "5.1.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "44dc1f269553f33cce43628444970efb85a7e802"; - sha256 = "1i32s15r0a844dnp3h9ac37xm9h69g0jn75pqz2gbfrafpk3pac1"; + rev = "22776fe9902b0b06d6aa18cd4c7f0c5ad35a95fa"; + sha256 = "0ly4vxawj8skh55c541zll3b8g6igiaq7aj33fklfjh0icmgzs60"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index a8668313465..e834a769c78 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -67,6 +67,17 @@ stdenv.mkDerivation rec { postInstall = '' wrapPythonPrograms + + completions=( + lxc-attach lxc-cgroup lxc-console lxc-destroy lxc-device lxc-execute + lxc-freeze lxc-info lxc-monitor lxc-snapshot lxc-stop lxc-unfreeze + ) + pushd $out/share/bash-completion/completions/ + mv lxc lxc-start + for completion in ''${completions[@]}; do + ln -sfn lxc-start $completion + done + popd ''; meta = { diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 3953ff1915a..4299a8e9b37 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-3.0.3"; + name = "lxcfs-3.0.4"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "0imn031qpi1qfr1qw0ggpgcg8y6v0ykdr3m7f2czkiz3l7qqx2in"; + sha256 = "0wav2l8i218yma655870hvg96b5mxdcrsczjawjwv7qxcj5v98pw"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 0e90a081476..078f894f73e 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "multipath-tools-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { name = "${name}.tar.gz"; url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz"; - sha256 = "0669zl4dpai63dl04lf8vpwnpsff6qf19fifxfc4frawnh699k95"; + sha256 = "0x6cjlb9mjrmpaqk5v6v47qz6n9zyqmw13i7pq5x6ppwyqdxhn5s"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index 9354811fd6f..da2f73ec1b3 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pagemon-${version}"; - version = "0.01.14"; + version = "0.01.15"; src = fetchFromGitHub { - sha256 = "1gkyfn1jbrs6w83sxa33csj62a6pyqqsmn92932qf7ns6y00dyk4"; + sha256 = "0vbwpyik26zavpqsanmg8p7snk44nyz66flvkkqmhwx1ada9d181"; rev = "V${version}"; repo = "pagemon"; owner = "ColinIanKing"; diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index d25ac0139b7..88134da46a1 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -1,17 +1,21 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "powerstat-${version}"; - version = "0.02.18"; + pname = "powerstat"; + version = "0.02.19"; + src = fetchurl { - url = "https://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; - sha256 = "1glryfmq9h7h8hsasg5ffl9vrcbjkkq3xqdxmbdhxmn137w7vgm5"; + url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; + sha256 = "0yh6l2mx5gfdgrfx406hxbi03c12cgi29pwlzgdfrpz6zs2icaw5"; }; - installFlags = [ "DESTDIR=$(out)" ]; + + installFlags = [ "DESTDIR=${placeholder "out"}" ]; + postInstall = '' mv $out/usr/* $out rm -r $out/usr ''; + meta = with lib; { description = "Laptop power measuring tool"; homepage = https://kernel.ubuntu.com/~cking/powerstat/; diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index 06c668acc96..55336e3b2a0 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "smemstat-${version}"; - version = "0.02.03"; + version = "0.02.04"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz"; - sha256 = "04q06wb37n4g1dlsjl8j2bwzd7qis4wanm0f4xg8y29br6skljx1"; + sha256 = "1kkdlnn3gahzd3ra2qc9vmc4ir5lydc3lyyqa269sb3nv9v2v30h"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 3d36202e861..7e571480419 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.15"; + version = "3.7.16"; src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "14ipnvcrwln9mwr4r32461js2gdlrr4h4hy92393ixbkscf9wdir"; + sha256 = "12s1s4zz3fxvb5ah5v6gmaq1kgd41pv9nahsdswa7svbgdc8lykz"; }; buildInputs = diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix new file mode 100644 index 00000000000..6a1d8a75cc1 --- /dev/null +++ b/pkgs/servers/blockbook/default.nix @@ -0,0 +1,51 @@ +{ buildGoPackage +, lib +, fetchFromGitHub +, rocksdb +, bzip2 +, zlib +, packr +, snappy +, pkg-config +, zeromq +, lz4 +}: + +buildGoPackage rec { + pname = "blockbook"; + version = "0.3.1"; + + goPackagePath = "blockbook"; + + src = fetchFromGitHub { + owner = "trezor"; + repo = "blockbook"; + rev = "v${version}"; + sha256 = "0qgd1f3b4vavw55mvpvwvlya39dx1c3kjsc7n46nn7kpc152jv1l"; + }; + + goDeps = ./deps.nix; + + buildInputs = [ bzip2 zlib snappy zeromq lz4 ]; + + nativeBuildInputs = [ pkg-config packr ]; + + preBuild = '' + export CGO_CFLAGS="-I${rocksdb}/include" + export CGO_LDFLAGS="-L${rocksdb}/lib -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy -llz4" + packr clean && packr + ''; + + postInstall = '' + rm $bin/bin/{scripts,templates,trezor-common} + ''; + + meta = with lib; { + description = "Trezor address/account balance backend"; + homepage = "https://github.com/trezor/blockbook"; + license = licenses.agpl3; + maintainers = with maintainers; [ mmahut ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/servers/blockbook/deps.nix b/pkgs/servers/blockbook/deps.nix new file mode 100644 index 00000000000..90ff098581a --- /dev/null +++ b/pkgs/servers/blockbook/deps.nix @@ -0,0 +1,309 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/Groestlcoin/go-groestl-hash"; + fetch = { + type = "git"; + url = "https://github.com/Groestlcoin/go-groestl-hash"; + rev = "790653ac190c4029ee200e82a8f21b5d1afaf7d6"; + sha256 = "02davg672v9sz8l7a8s0b8m87154p42hkm5r6pavf4gqziw8bmr4"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/bsm/go-vlq"; + fetch = { + type = "git"; + url = "https://github.com/bsm/go-vlq"; + rev = "ec6e8d4f5f4ec0f6e808ffc7f4dcc7516d4d7d49"; + sha256 = "13nhgpigaqdvcksi6jrav0rqr5mzqkx3wrsans9ql89nva51r9sz"; + }; + } + { + goPackagePath = "github.com/martinboehm/btcd"; + fetch = { + type = "git"; + url = "https://github.com/martinboehm/btcd"; + rev = "8e7c0427fee5d4778c5d4eb987150369e3ca1d0e"; + sha256 = "10fwzl8hzqpsq1rk5iz3xs8hbn3wqans12hszvlxlmm2xb0f6z9b"; + }; + } + { + goPackagePath = "github.com/btcsuite/btclog"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btclog"; + rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"; + sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk"; + }; + } + { + goPackagePath = "github.com/deckarep/golang-set"; + fetch = { + type = "git"; + url = "https://github.com/deckarep/golang-set"; + rev = "1d4478f51bed434f1dadf96dcd9b43aabac66795"; + sha256 = "01kaqrc5ywbwa46b6lz3db7kkg8q6v383h4lnxds4z3kjglkqaff"; + }; + } + { + goPackagePath = "github.com/ethereum/go-ethereum"; + fetch = { + type = "git"; + url = "https://github.com/ethereum/go-ethereum"; + rev = "8bbe72075e4e16442c4e28d999edee12e294329e"; + sha256 = "0q0w0vz85d94wym3xni8y22vly886j6g6zn9hizcww1nanvk4nl6"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"; + sha256 = "0irkqifyj84cbnq4n66ax2r591id2285diw5hzcz2k3bga8d8lqr"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packr"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packr"; + rev = "5a2cbb54c4e7d482e3f518c56f1f86f133d5204f"; + sha256 = "0hs62w1bv96zzfqqmnq18w71v0kmh4qrqpkf2y8qngvwgan761gd"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "1adfc126b41513cc696b209667c8656ea7aac67c"; + sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "553a641470496b2327abcac10b36396bd98e45c9"; + sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; + sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; + }; + } + { + goPackagePath = "github.com/martinboehm/bchutil"; + fetch = { + type = "git"; + url = "https://github.com/martinboehm/bchutil"; + rev = "6373f11b6efe1ea81e8713b8788a695b2c144d38"; + sha256 = "1wp7ixa0n0jj7y9phxm6p3fymc2555fb2k71s91jhis14fil2jim"; + }; + } + { + goPackagePath = "github.com/martinboehm/btcutil"; + fetch = { + type = "git"; + url = "https://github.com/martinboehm/btcutil"; + rev = "225ed00dbbd5cb8d8b3949a0ee7c9ea540754585"; + sha256 = "0dn5s6h1524q38glp6fcdws97lyvmchq26dhbd3dqazrq61dhdvy"; + }; + } + { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "c7d06af17c68cd34c835053720b21f6549d9b0ee"; + sha256 = "1dmj8wkpmkw4z4c7wmnscs4ykrcv7p8lgwb75g5akahwqjaf9zcp"; + }; + } + { + goPackagePath = "github.com/martinboehm/golang-socketio"; + fetch = { + type = "git"; + url = "https://github.com/martinboehm/golang-socketio"; + rev = "f60b0a8befde091474a624a8ffd81ee9912957b3"; + sha256 = "1zln03qgzzbkr7zwm7ah1iikjdnipacp60bbg9lzkxsdcw2h1vd5"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "3247c84500bff8d9fb6d579d800f20b3e091582c"; + sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d"; + }; + } + { + goPackagePath = "github.com/mr-tron/base58"; + fetch = { + type = "git"; + url = "https://github.com/mr-tron/base58"; + rev = "c1bdf7c52f59d6685ca597b9955a443ff95eeee6"; + sha256 = "1dq6i8619manxdhb0fwhdm9ar23kx88pc2xwl1pjla9djrgql6a8"; + }; + } + { + goPackagePath = "github.com/pebbe/zmq4"; + fetch = { + type = "git"; + url = "https://github.com/pebbe/zmq4"; + rev = "5b443b6471cea4b4f9f85025530c04c93233f76a"; + sha256 = "0vnwlabrlrzszqyfbw4vypalhsxi4l4ywcbjhfhwl1fpvcph5dar"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "c5b7fccd204277076155f10851dad72b76a49317"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; + sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "d0f7cd64bda49e08b22ae8a730aa57aa0db125d6"; + sha256 = "1d4hfbb66xsf0wq317fwhgrwakqzhvryw4d7ip851lwrpql5fqcx"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"; + sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf"; + }; + } + { + goPackagePath = "github.com/rs/cors"; + fetch = { + type = "git"; + url = "https://github.com/rs/cors"; + rev = "feef513b9575b32f84bafa580aad89b011259019"; + sha256 = "0wjm0yjsnxhnp6924mq8v04srqa8sxrlnd7rkb19h4j6b9zagsik"; + }; + } + { + goPackagePath = "github.com/schancel/cashaddr-converter"; + fetch = { + type = "git"; + url = "https://github.com/schancel/cashaddr-converter"; + rev = "0a38f5822f795dc3727b4caacc298e02938d9eb1"; + sha256 = "0d0dsn029yckgjp26vkmg7r476hb6b9ayf2njcgdi648ln8rrad8"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/goleveldb"; + rev = "714f901b98fdb3aa954b4193d8cbd64a28d80cad"; + sha256 = "0fn70vzqmww5v2xy0lamc319vrmfpza085d196cffhfw0jzw9i18"; + }; + } + { + goPackagePath = "github.com/tecbot/gorocksdb"; + fetch = { + type = "git"; + url = "https://github.com/tecbot/gorocksdb"; + rev = "214b6b7bc0f06812ab5602fdc502a3e619916f38"; + sha256 = "1mqpp14z4igr9jip39flpd7nf4rhr3z85y8mg74jjl1yrnwrwsld"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "d6449816ce06963d9d136eee5a56fca5b0616e7e"; + sha256 = "17dkprbbk84q165275zwhcn0s6pcarigq37zlhsxj23pq2qz3aqy"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "61147c48b25b599e5b561d2e9c4f3e1ef489ca41"; + sha256 = "1520pdlw9a9s41ad1cf1z6y2ff4j96zbn82qffrxqk02bqlr9f5w"; + }; + } + { + goPackagePath = "gopkg.in/karalabe/cookiejar.v2"; + fetch = { + type = "git"; + url = "https://github.com/karalabe/cookiejar"; + rev = "8dcd6a7f4951f6ff3ee9cbb919a06d8925822e57"; + sha256 = "1dbizcklsfn6b5i182nf9pgkk4ac8jnmq8zix73si7x2n53wyb3b"; + }; + } + { + goPackagePath = "gopkg.in/natefinch/npipe.v2"; + fetch = { + type = "git"; + url = "https://github.com/natefinch/npipe"; + rev = "c1b8fa8bdccecb0b8db834ee0b92fdbcfa606dd6"; + sha256 = "1qplrvhks05pay169d9lph3hl7apdam4vj1kx3yzik7cphx6b24f"; + }; + } +] \ No newline at end of file diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index b1233b76464..c18e71977d8 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "19.05.0.1"; + version = "19.05.1.2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "0cc1lac7x00s1zz8p9sbaj6zg4yf4ngr0ldszhpxpvykhx9wzfay"; + sha256 = "1r2hxfshz929fcys90rmnj8s7f204q364m6bazhiy8hhm3bsf42k"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index a646fb0b7a4..718028b2bc0 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "00d24361a2406392c508904fad943536bae6369981686b4951378fc1c9a5a137"; + sha256 = "8a62d81e5cf3df938f469b60ed4e46d9161007c2b89fbf7ae07525fa68368bad"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 4d840462f79..105e9f232c1 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.1.9"; + version = "4.1.10"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "1dmx37xzg7qckq166jr7swcnw3m9wjh5169844ad59qhspfzflnk"; + sha256 = "1iqmrg0dhf39gr2mq9d8r3s5c6yqkb5mm8grbbla5anajbgcyijs"; }; nativeBuildInputs = [ pkgconfig ]; @@ -35,13 +35,14 @@ stdenv.mkDerivation rec { ) ''; + enableParallelBuilding = true; doCheck = true; meta = with stdenv.lib; { description = "Authoritative DNS server"; homepage = https://www.powerdns.com; - platforms = platforms.linux; - # cannot find postgresql libs on macos x + platforms = platforms.unix; + broken = stdenv.isDarwin; license = licenses.gpl2; maintainers = with maintainers; [ mic92 disassembler ]; }; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index c639a9a26cb..17286f8ec24 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.6"; + name = "dovecot-2.3.7"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "1irnalplb47nlc26dn7zzdi95zhrxxi3miza7p3wdsgapv0qs7gd"; + sha256 = "1al382ykm94if5agasb9h2442a8s7wn43hlwh292ir1rhnp5dq8i"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 634bba2e57c..10d3b397b26 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.4.5"; + version = "3.4.6"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "17riwr21i9p1h17wpagfiwkpx9bbx7dy4gpdl219a11akm7saawb"; + sha256 = "09p3vg2xlh6iq45gp6zanbp1728fc31r7zz71r131vh20ssajx6n"; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index dde0a547693..f1820d65ed0 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.32.2"; + version = "0.32.9"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1df2cvlqm0pz7w5094fv20308m0d2z4szlv46dzsfdw03hny50xn"; + sha256 = "08iybb1m2pmimn0fs95kd948yf6c1xmg5kkzm9ykx4cpb9pn1yw0"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 3523c3b0817..8806a88693b 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -48,7 +48,7 @@ in rec { }; prometheus_2 = buildPrometheus { - version = "2.11.0"; - sha256 = "0x5q2zv8nvqdns8780rsbdhv44azg1fz631ji2rlmiy1l6n1q3hb"; + version = "2.11.1"; + sha256 = "1d4kiv88v1p74cm1wg6wk1cs963xg2rlhkxw86slf9hmldlgww2l"; }; } diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 55994846850..4bb46693b46 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,8 +4,8 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoPackage rec { inherit pname; - version = "5.10.0"; - shortRev = "c7551ba"; # for internal version info + version = "5.11.0"; + shortRev = "dd8f160"; # for internal version info goPackagePath = "github.com/sensu/sensu-go"; @@ -13,7 +13,7 @@ let owner = "sensu"; repo = "sensu-go"; rev = version; - sha256 = "1hma54mdh150d51rwz5csqbn0h24qk6hydjmib68j7zd7kp92yb5"; + sha256 = "05dx0nxcjl6fy68br2a37j52iz71kvqnqp29swcif2nwvq7w8mxx"; }; inherit subPackages postInstall; @@ -44,7 +44,14 @@ in "''${!outputBin}/share/zsh/site-functions" ''${!outputBin}/bin/sensuctl completion bash > ''${!outputBin}/share/bash-completion/completions/sensuctl - ''${!outputBin}/bin/sensuctl completion zsh > ''${!outputBin}/share/zsh/site-functions/_sensuctl + + # https://github.com/sensu/sensu-go/issues/3132 + ( + echo "#compdef sensuctl" + ''${!outputBin}/bin/sensuctl completion zsh + echo '_complete sensuctl 2>/dev/null' + ) > ''${!outputBin}/share/zsh/site-functions/_sensuctl + ''; }; diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix new file mode 100644 index 00000000000..4465febf39a --- /dev/null +++ b/pkgs/servers/mumsi/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, boost +, log4cpp, pjsip, openssl, alsaLib, mumlib }: +with lib; stdenv.mkDerivation rec { + pname = "mumsi"; + version = "unstable-2018-12-12"; + + src = fetchFromGitHub { + owner = "slomkowski"; + repo = "mumsi"; + rev = "961b75792f8da22fb5502e39edb286e32172d0b0"; + sha256 = "0vrivl1fiiwjsz4v26nrn8ra3k9v0mcz7zjm2z319fw8hv6n1nrk"; + }; + + buildInputs = [ boost log4cpp pkgconfig pjsip mumlib openssl alsaLib ]; + nativeBuildInputs = [ cmake pkgconfig ]; + installPhase = '' + install -Dm555 mumsi $out/bin/mumsi + ''; + + meta = { + description = "SIP to Mumble gateway/bridge using PJSUA stack"; + homepage = "https://github.com/slomkowski/mumsi"; + maintainers = with maintainers; [ das_j ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/mxisd/default.nix b/pkgs/servers/mxisd/default.nix index 5d3a220d9b1..7166a57747d 100644 --- a/pkgs/servers/mxisd/default.nix +++ b/pkgs/servers/mxisd/default.nix @@ -2,14 +2,14 @@ let name = "mxisd-${version}"; - version = "1.4.4"; - rev = "92f10347d1c8495b7409360c927ccc0ce3586064"; + version = "1.4.5"; + rev = "a964b073bfa7552e94fe51f48e18830b1051b0b7"; src = fetchFromGitHub { inherit rev; owner = "kamax-matrix"; repo = "mxisd"; - sha256 = "06j4wh4vx5gziiifyaaijz2nlaa2yah8gzvf7ykfcm72m878rrkl"; + sha256 = "1h1lx531rjswh0m2zdsmfizrkkx9bh414v9m321hbbfzk3f98fkk"; }; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 7a0994ef814..1b7a57e8b50 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.18.14"; + version = "0.20.0"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "0sw436zbsaxwy58lfkgw6gb6hapxxxl4wipkpzd80dgaz7bvd7c3"; + sha256 = "1zg95szvfbmwinx1z5nlbmyck7ximvyna0x71yflmadkgf88nv0k"; }; dontBuild = true; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -R {autoProcessTV,gui,lib,sickbeard,SickBeard.py} $out/ + cp -R {autoProcessTV,gui,lib,sickbeard,sickgear.py,SickBeard.py} $out/ makeWrapper $out/SickBeard.py $out/bin/sickgear ''; @@ -30,6 +30,6 @@ in stdenv.mkDerivation rec { description = "The most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation"; license = licenses.gpl3; homepage = "https://github.com/SickGear/SickGear"; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ rembo10 ]; }; } diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index ef8b77ad117..3b4a0543e18 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgbouncer-${version}"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz"; - sha256 = "012zh9l68r1ramrd66yam6y3al0i85dvvg4wwwkn6qwq6dhskv1r"; + sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q"; }; buildInputs = [ libevent openssl ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 40fcaeb7cca..d2d2a00ffd5 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 mkdir -p $out/{lib,share/extension} cp *.so $out/lib diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 85ff50e2eae..301160ce132 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation { buildInputs = [ postgresql gcc ]; buildPhase = "USE_PGXS=1 make"; installPhase = '' - mkdir -p $out/bin # for buildEnv to setup proper symlinks install -D pg_similarity.so -t $out/lib/ install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension ''; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index 69c7a4513b6..c68ba9b1728 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { buildPhase = ":"; installPhase = '' - mkdir -p $out/bin # current postgresql extension mechanism in nixos requires bin directory mkdir -p $out/share/postgresql/extension cp pg*sql *.control $out/share/postgresql/extension ''; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 9058c443e37..b8396f67478 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { makeFlags = [ "HAVE_MSGPACK=1" ]; installPhase = '' - mkdir -p $out/bin install -D pgroonga.so -t $out/lib/ install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/postgresql/extension ''; diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 9f4eda2bde9..6e1c6e3a4fc 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/bin # for buildEnv, see https://github.com/NixOS/nixpkgs/issues/22653 install -D lib/*.so -t $out/lib install -D sql/pgrouting--${version}.sql -t $out/share/postgresql/extension install -D sql/common/pgrouting.control -t $out/share/postgresql/extension diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index b3befc58295..89138baa91c 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 install -D plv8*.so -t $out/lib install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/postgresql/extension ''; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 5f2facf449e..8e97e47e2fb 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -36,13 +36,6 @@ stdenv.mkDerivation rec { done ''; - postInstall = '' - # work around an annoying bug, by creating $out/bin, so buildEnv doesn't freak out later - # see https://github.com/NixOS/nixpkgs/issues/22653 - - mkdir -p $out/bin - ''; - meta = with stdenv.lib; { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = https://www.timescale.com/; diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 87c82dd8207..7be23003b58 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ postgresql ]; installPhase = '' - mkdir -p $out/bin install -D tsearch_extras.so -t $out/lib/ install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/postgresql/extension ''; diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix index f4abc1f3208..69a46533ba5 100644 --- a/pkgs/servers/squid/4.nix +++ b/pkgs/servers/squid/4.nix @@ -2,11 +2,11 @@ , expat, libxml2, openssl }: stdenv.mkDerivation rec { - name = "squid-4.7"; + name = "squid-4.8"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; - sha256 = "0kimbvp2mzask9k58va4s829vv3m54fzxrj7ryqshw5bfxgzd752"; + sha256 = "0432m0ix046rkja7r7qpydgsm2kf1w393xym15nx6h9kv4jb7kbq"; }; buildInputs = [ diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 2fdbc29caed..fde29dc7e80 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap -, expat, libxml2, openssl }: +, expat, libxml2, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "squid-3.5.28"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1n4f55g56b11qz4fazrnvgzx5wp6b6637c4qkbd1lrjwwqibchgx"; }; + patches = [ + (fetchpatch { + name = "3.5-CVE-2019-13345.patch"; + url = "https://github.com/squid-cache/squid/commit/5730c2b5cb56e7639dc423dd62651c8736a54e35.patch"; + sha256 = "0955432g9a00vwxzcrwpjzx6vywspx1cxhr7bknr7jzbzam5sxi3"; + }) + ]; + buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 1530480dc4b..ba628360aaa 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.11"; + version = "4.10"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "06kb4h10n5nvmv79fs5nwk40pc4vl4xqidksy9fxasgn6md87p1d"; + sha256 = "14pjhc8a8fgm5cyy93r693nrjinaps6642v00jpwrjf7h2p8mfli"; }; buildInputs = [ openssl ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index d019457ab8a..48c8fd0815e 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl }: let - version = "0.6.pre15"; + version = "0.6.0"; in stdenv.mkDerivation { name = "oil-${version}"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1azdmicv39rp30msl6fpw6921gi6ib8lxiyc8kanljqk5d7zg4p6"; + sha256 = "1dw4mgnlmaxlfygasfihgvbj32d3m9w6k5j7azb9d9lp35f3l7hl"; }; postPatch = '' diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 38439b4427c..53a4d4b9087 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-07-01"; + version = "2019-07-13"; name = "oh-my-zsh-${version}"; - rev = "b259cdf7e71ad6c3cc1a66a48c6c79cf63f38590"; + rev = "17f4cfca99398cb5511557b8515a17bf1bf2948a"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1vk9misnvjs1lxlwzy4ld30vh67nhghzra1y5ckgxa019l9cvann"; + sha256 = "19f29mrvnhvndvl48fd5kdiixfs0apmb27h4mck5v95p6yw27b6f"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 46f2cb33bb0..1b6c540b3d8 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "ckbcomp-${version}"; - version = "1.191"; + version = "1.192"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0wplhjadk530fqxhfnizil32rcvkcl5m2r18yskspcib53r4pmim"; + sha256 = "1s570y8qwwy71ag9wgpznrhakps6rmw6j7p05hibns1spn2mxd5x"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/X11/libstrangle/default.nix b/pkgs/tools/X11/libstrangle/default.nix new file mode 100644 index 00000000000..d24654ce3ad --- /dev/null +++ b/pkgs/tools/X11/libstrangle/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libstrangle"; + version = "2017-02-22"; + + src = fetchFromGitHub { + owner = "milaq"; + repo = pname; + rev = "6020f9e375ba747c75eb7996b7d5f0214ac3221e"; + sha256 = "04ikacbjcq9phdc8q5y1qjjpa1sxmzfm0idln9ys95prg289zp4h"; + }; + + makeFlags = [ "prefix=" "DESTDIR=$(out)" ]; + + patches = [ ./nixos.patch ]; + + postPatch = '' + substituteAllInPlace src/strangle.sh + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/milaq/libstrangle"; + description = "Frame rate limiter for Linux/OpenGL"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aske ]; + }; +} diff --git a/pkgs/tools/X11/libstrangle/nixos.patch b/pkgs/tools/X11/libstrangle/nixos.patch new file mode 100644 index 00000000000..912bdded6da --- /dev/null +++ b/pkgs/tools/X11/libstrangle/nixos.patch @@ -0,0 +1,29 @@ +diff --git a/makefile b/makefile +index eb13054..a3a1125 100644 +--- a/makefile ++++ b/makefile +@@ -27,12 +27,10 @@ $(BUILDDIR)libstrangle32.so: $(BUILDDIR) + $(CC) $(CFLAGS) $(LDFLAGS) -m32 -o $(BUILDDIR)libstrangle32.so $(SOURCES) + + install: all +- install -m 0644 -D -T $(BUILDDIR)libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf + install -m 0755 -D -T $(BUILDDIR)libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so + install -m 0755 -D -T $(BUILDDIR)libstrangle64.so $(DESTDIR)$(LIB64_PATH)/libstrangle.so + install -m 0755 -D -T $(SOURCEDIR)strangle.sh $(DESTDIR)$(bindir)/strangle + install -m 0644 -D -T COPYING $(DESTDIR)$(DOC_PATH)/LICENSE +- ldconfig + + clean: + rm -f $(BUILDDIR)libstrangle64.so +diff --git a/src/strangle.sh b/src/strangle.sh +index e280e86..b2dd42b 100755 +--- a/src/strangle.sh ++++ b/src/strangle.sh +@@ -31,6 +31,5 @@ if [ "$#" -eq 0 ]; then + exit 1 + fi + +-# Execute the strangled program under a clean environment + # pass through the FPS and overriden LD_PRELOAD environment variables +-exec env FPS="${FPS}" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" "$@" ++FPS="${FPS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" exec "$@" diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 5d94943daf9..a9ebbff8203 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.0.7"; + version = "6.0.8"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "14qk7kmi37ppxh2m69g7wb7w2wh62nbsy3z4ns7hsns3p21va7y3"; + sha256 = "1c4iyy4db7zhbfnng8h1r7d2fmng4zspgl9zfr8vc86sk5wmfnjc"; }; buildInputs = [ diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index fae2d56fbbe..8b0c18c8618 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -1,30 +1,29 @@ { stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xorgproto, libXi }: -let - baseName = "xcape"; - version = "1.2"; -in - stdenv.mkDerivation rec { - name = "${baseName}-${version}"; + pname = "xcape"; + version = "unstable-20180301"; src = fetchFromGitHub { owner = "alols"; - repo = baseName; - rev = "v${version}"; - sha256 = "09a05cxgrip6nqy1qmwblamp2bhknqnqmxn7i2a1rgxa0nba95dm"; + repo = pname; + rev = "a34d6bae27bbd55506852f5ed3c27045a3c0bd9e"; + sha256 = "04grs4w9kpfzz25mqw82zdiy51g0w355gpn5b170p7ha5972ykc8"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXtst xorgproto libXi ]; - makeFlags = [ "PREFIX=$(out)" "MANDIR=/share/man/man1" ]; + makeFlags = [ + "PREFIX=$(out)" + "MANDIR=/share/man/man1" + ]; - postInstall = "install -D --target-directory $out/share/doc README.md"; + postInstall = "install -Dm444 --target-directory $out/share/doc README.md"; - meta = { + meta = with stdenv.lib; { description = "Utility to configure modifier keys to act as other keys"; longDescription = '' xcape allows you to use a modifier key as another key when @@ -35,8 +34,8 @@ stdenv.mkDerivation rec { released on its own. ''; homepage = https://github.com/alols/xcape; - license = stdenv.lib.licenses.gpl3 ; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; + license = licenses.gpl3 ; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index bb4c89dd4dc..520fffa9750 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.1.39"; + version = "0.1.40"; src = fetchFromGitHub { owner = "weaveworks"; - repo = "eksctl"; + repo = pname; rev = version; - sha256 = "11y2pb5jn64v89a9hwi25rakrnsvhyjyr8kdrjk81d6hhrfkz3g0"; + sha256 = "08r4p2brs9gxxqnyv44zi1agv5q3ss8292201z9vh5ji9fmck2vb"; }; modSha256 = "1lmkwx0r19c2wg9nm85k92nlxjzr8q917jf3f333yf3csfyiix2f"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 880ff331c93..9d55e6bdefa 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -3,6 +3,7 @@ , squashfsTools, iproute, iptables, ebtables, libcap, dqlite , sqlite-replication , writeShellScriptBin, apparmor-profiles, apparmor-parser +, criu , bash }: @@ -33,11 +34,14 @@ buildGoPackage rec { rm $bin/bin/{deps,macaroon-identity,generate} wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ - acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash + acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') ]} + + mkdir -p "$bin/share/bash-completion/completions/" + cp -av go/src/github.com/lxc/lxd/scripts/bash/lxd-client "$bin/share/bash-completion/completions/lxc" ''; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 5e75346e46b..e3ee04f6e2e 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "bcachefs-tools"; - version = "2019-07-11"; + version = "2019-07-13"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "33c91e2ff4e228cb618ca22d642a34ec1c2cf0ef"; - sha256 = "0glldbnda61xwf7309mk48qmxqnipjmcgsibab77nr6v3bg13ip1"; + rev = "692eadd6ca9b45f12971126b326b6a89d7117e67"; + sha256 = "0d2kqy5p89qjrk38iqfk9zsh14c2x40d21kic9kcybdhalfq5q31"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index dd44f16c3fe..6a9d17772c8 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.0"; + version = "1.14.1"; name = "bindfs-${version}"; src = fetchurl { url = "https://bindfs.org/downloads/${name}.tar.gz"; - sha256 = "1f1znixdaz4wnr9j6rkrplhbnkz7pdw9927yfikbjvxz8cl6qsdz"; + sha256 = "111i4ba4px3idmrr5qhgq01926fas1rs2yx2shnwgdk3ziqcszxl"; }; dontStrip = true; diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index d923dba0bc0..0e48da746b8 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -2,13 +2,13 @@ { stdenv, buildGoPackage, fetchFromGitHub, openssl, pandoc, pkgconfig }: let - version = "v1.6.1"; goFuseVersion = with stdenv.lib; substring 0 7 (head (filter ( d: d.goPackagePath == "github.com/hanwen/go-fuse" ) (import ./deps.nix))).fetch.rev; in buildGoPackage rec { - name = "gocryptfs-${version}"; + pname = "gocryptfs"; + version = "1.7"; # TODO: Drop `patches` with next release. Remove `fix-unix2syscall_darwin.go-build-failure.patch`. goPackagePath = "github.com/rfjakob/gocryptfs"; @@ -17,11 +17,15 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "rfjakob"; - repo = "gocryptfs"; - rev = version; - sha256 = "0aqbl25g48b4jp6l09k6kic6w3p0q7d9ip2wvrcvh8lhnrbdkhzd"; + repo = pname; + rev = "v${version}"; + sha256 = "1sr3i73haw07faqpw785cdda2kna8q3a0zhwab1p3i935rvp4qaa"; }; + # Fixes build on darwin + # Source: https://github.com/rfjakob/gocryptfs/commit/b1468a732fa26550f2a6f8a21cc7bd47b65a8c96 + patches = [ ./fix-unix2syscall_darwin.go-build-failure.patch ]; + postPatch = "rm -r tests"; buildFlagsArray = '' diff --git a/pkgs/tools/filesystems/gocryptfs/deps.nix b/pkgs/tools/filesystems/gocryptfs/deps.nix index 2589b41a0a5..50f6e89908e 100644 --- a/pkgs/tools/filesystems/gocryptfs/deps.nix +++ b/pkgs/tools/filesystems/gocryptfs/deps.nix @@ -1,39 +1,12 @@ # file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ - { - goPackagePath = "github.com/conejoninja/hid"; - fetch = { - type = "git"; - url = "https://github.com/conejoninja/hid"; - rev = "3a959b87ebefc18767a31fa567eea402eb37239e"; - sha256 = "1i1x7fhs3g9a48h2wxjczshx7gzmj9p6pd71l22ky998zgjadlim"; - }; - } - { - goPackagePath = "github.com/conejoninja/tesoro"; - fetch = { - type = "git"; - url = "https://github.com/conejoninja/tesoro"; - rev = "e0e839b6a6f14bce56d1bfac9a86311a1646a6a3"; - sha256 = "19q1ibj6l6pk2a3iwcyrj60sscvkqw450psd9zdflvb293cjsx8v"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } { goPackagePath = "github.com/hanwen/go-fuse"; fetch = { type = "git"; url = "https://github.com/hanwen/go-fuse"; - rev = "95c6370914ac7822973d1893680e878e156f8d70"; - sha256 = "1h701c1hxrw7ljh7kc0rjx18bfw2mzdbpmqqilb5wb0ngpdjpqxp"; + rev = "a533f0a5a633cccc0928c81985b13fa24407a211"; + sha256 = "0kc2jjjyhnrd934jn7hzfx8kd4z2yq5yblwrxr6xcjjql1vb1n9k"; }; } { @@ -41,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/jacobsa/crypto"; - rev = "c73681c634de898c869684602cf0c0d2ce938c4d"; - sha256 = "02jbiy6szshbzcmp4j3gpc577hrhikxqvm4kzxixp27k9f2cx5si"; + rev = "d95898ceee0769dac9bf74c46f8f68d3d3d79100"; + sha256 = "0dgcvms7if672f09y0cj49n711i9r0609p5f1s27i53yah4qlm19"; }; } { @@ -50,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/pkg/xattr"; - rev = "f5b647e257e19d63831e7c7adb95dfb79d9ff4d9"; - sha256 = "0cqxibbfllhs6ffxq65gn08088g7g7aw752p9g3vbnj35jk2p8i9"; + rev = "7782c2d6871d6e659e1563dc19c86b845264a6fc"; + sha256 = "1j3z5b9nwgkxia925rkiq8n5avhf4zhmsdbpn2s3xb16a2w66prd"; }; } { @@ -63,40 +36,13 @@ sha256 = "0c227ly3z8pqaqg22lpd8nzgqrfsbjx5gi9rp9ks1cmd11dv2gl9"; }; } - { - goPackagePath = "github.com/trezor/trezord-go"; - fetch = { - type = "git"; - url = "https://github.com/trezor/trezord-go"; - rev = "bae9c40e5d71c459bde056d42d4b19ab318c90c2"; - sha256 = "12j7b4vjs8n68214zrh5ivpqm3fcifk27bj6rszd9x2839nk3hy8"; - }; - } - { - goPackagePath = "github.com/xaionaro-go/cryptoWallet"; - fetch = { - type = "git"; - url = "https://github.com/xaionaro-go/cryptoWallet"; - rev = "47f9f6877e4324a8bc47fc5661c32d2fe6d29586"; - sha256 = "14h2vnl2jm2wj10znizdf2f0mxsk27rsjskjw5qffy8nf5a0i3i6"; - }; - } - { - goPackagePath = "github.com/zserge/hid"; - fetch = { - type = "git"; - url = "https://github.com/zserge/hid"; - rev = "c86e7adeabafd6fcb3371ad64d6ed366b04d55db"; - sha256 = "1y2zqndq6mafgsdai5gnkw4g8dzl9vmjcxq0i8xspaj4dmck19c4"; - }; - } { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; - sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; + rev = "8dd112bcdc25174059e45e07517d9fc663123347"; + sha256 = "0gbcz7gxmgg88s28vb90dsp1vdq0har7zvg2adsqbp8bm05x9q6b"; }; } { @@ -104,8 +50,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + rev = "e225da77a7e68af35c70ccbf71af2b83e6acac3c"; + sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; }; } { @@ -113,17 +59,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "14742f9018cd6651ec7364dc6ee08af0baaa1031"; - sha256 = "17k06vwhnlb18n9rb1cdcdqyjcn353znfrr4c90xb3carz1sqfq5"; + rev = "61b9204099cb1bebc803c9ffb9b2d3acd9d457d9"; + sha256 = "110carnw1rxk9awbcdbg5is0zl28vynm649y7rza36pg1vlv8rrh"; }; } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } -] \ No newline at end of file +] diff --git a/pkgs/tools/filesystems/gocryptfs/fix-unix2syscall_darwin.go-build-failure.patch b/pkgs/tools/filesystems/gocryptfs/fix-unix2syscall_darwin.go-build-failure.patch new file mode 100644 index 00000000000..1adbc2c4d23 --- /dev/null +++ b/pkgs/tools/filesystems/gocryptfs/fix-unix2syscall_darwin.go-build-failure.patch @@ -0,0 +1,14 @@ +--- a/internal/syscallcompat/unix2syscall_darwin.go ++++ b/internal/syscallcompat/unix2syscall_darwin.go +@@ -19,8 +19,8 @@ func Unix2syscall(u unix.Stat_t) syscall.Stat_t { + Size: u.Size, + Blksize: u.Blksize, + Blocks: u.Blocks, +- Atimespec: syscall.Timespec(u.Atimespec), +- Mtimespec: syscall.Timespec(u.Mtimespec), +- Ctimespec: syscall.Timespec(u.Ctimespec), ++ Atimespec: syscall.Timespec(u.Atim), ++ Mtimespec: syscall.Timespec(u.Mtim), ++ Ctimespec: syscall.Timespec(u.Ctim), + } + } diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 853d30b8e35..58743d948b4 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "2.2.1"; + version = "2.2.2"; pname = "oxipng"; src = fetchFromGitHub { owner = "shssoichiro"; repo = pname; rev = "v${version}"; - sha256 = "1r195x3wdkshjwy23fpqsyyrw7iaj7yb39nhcnx9d4nhgq8w0pcl"; + sha256 = "07amczmyqs09zfp564nk8jy1n65y8pvk89qq6jv5k8npai8zvixn"; }; - cargoSha256 = "1mjqkjrnh5gw39qjni574qh7k4p891xbb4ip2q69cm177ffbghiz"; + cargoSha256 = "1fkghjzsyg27n6k2yki0yhbdmmb1whgy5fjpydpjm4yv448nhhbm"; # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ]; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index f5311d378d7..db06c2a1588 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.8.0"; + version = "8.8.1"; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "17wz4rxn3jb171lrh8v3dxiykjhzwwzs5r7ly651dspcbi6s3r6c"; + sha256 = "1wnfn92rvafx1g9vvhbvxssifzydx9y95kszg6i4c1p5sv5nhfd2"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 8c310310d43..af9ad77bdda 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.191"; + version = "1.192"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "0bqhn9rwrjipj7wd6c8i7rq39fc5jj5nc3mir931mfakknakkimk"; + sha256 = "0yjylbj88p2a7qi1wicicl1ivrhp52pnzy44mc1yg6l3n7zifcwn"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/chrome-export/default.nix b/pkgs/tools/misc/chrome-export/default.nix new file mode 100644 index 00000000000..8639f6f6f79 --- /dev/null +++ b/pkgs/tools/misc/chrome-export/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub +, python3 +}: + +stdenv.mkDerivation rec { + pname = "chrome-export"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "bdesham"; + repo = pname; + rev = "v${version}"; + sha256 = "0p1914wfjggjavw7a0dh2nb7z97z3wrkwrpwxkdc2pj5w5lv405m"; + }; + + buildInputs = [ python3 ]; + + dontBuild = true; + installPhase = '' + mkdir -p $out/bin + cp export-chrome-bookmarks export-chrome-history $out/bin + mkdir -p $out/share/man/man1 + cp man_pages/*.1 $out/share/man/man1 + ''; + doInstallCheck = true; + installCheckPhase = '' + bash test/run_tests $out/bin + ''; + + meta = with stdenv.lib; { + description = "Scripts to save Google Chrome's bookmarks and history as HTML bookmarks files"; + homepage = "https://github.com/bdesham/chrome-export"; + license = [ licenses.isc ]; + maintainers = [ maintainers.bdesham ]; + platforms = python3.meta.platforms; + }; +} diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index ddd0053f529..3613905db48 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.8.6.1"; - name = "debianutils-${version}"; + pname = "debianutils"; + version = "4.8.6.2"; src = fetchurl { - url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz"; - sha256 = "1vamrgzsfdb2183xgj1qmfzh710iqj2dlbdsl92n3ckqfa51x7q9"; + url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz"; + sha256 = "1fhbn62v85ydcap4pjx6jb37bly42lf3l64ig4ppr7yiaax8i8xc"; }; - meta = { + meta = with stdenv.lib; { description = "Miscellaneous utilities specific to Debian"; longDescription = '' This package provides a number of small utilities which are used primarily by the installation scripts of Debian packages, although you may use them directly. @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which ''; downloadPage = https://packages.debian.org/sid/debianutils; - license = with stdenv.lib.licenses; [ gpl2Plus publicDomain smail ]; + license = with licenses; [ gpl2Plus publicDomain smail ]; maintainers = []; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index fe117492e82..7c43638ea56 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -6,15 +6,15 @@ with rustPlatform; buildRustPackage rec { name = "exa-${version}"; - version = "0.8.0"; + version = "0.9.0"; - cargoSha256 = "0kaldln4fb9n53190m2r130mcblkjx32glzj9rk8hrz6dd6yhfb0"; + cargoSha256 = "1hgjp23rjd90wyf0nq6d5akjxdfjlaps54dv23zgwjvkhw24fidf"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; rev = "v${version}"; - sha256 = "0jy11a3xfnfnmyw1kjmv4ffavhijs8c940kw24vafklnacx5n88m"; + sha256 = "14qlm9zb9v22hxbbi833xaq2b7qsxnmh15s317200vz5f1305hhw"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; @@ -52,6 +52,6 @@ buildRustPackage rec { ''; homepage = https://the.exa.website; license = licenses.mit; - maintainers = [ maintainers.ehegnes ]; + maintainers = with maintainers; [ ehegnes lilyball ]; }; } diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index a9cddcc5ff8..219c03f263c 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,23 +1,28 @@ -{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl, gnu-efi +{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl, gnu-efi, mtools , embedScript ? null +, additionalTargets ? {} }: let date = "20190318"; rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218"; - targets = (lib.optional stdenv.isx86_64 "bin-x86_64-efi/ipxe.efi") ++ [ - "bin/ipxe.dsk" - "bin/ipxe.usb" - "bin/ipxe.iso" - "bin/ipxe.lkrn" - "bin/undionly.kpxe" - ]; + targets = additionalTargets // lib.optionalAttrs stdenv.isx86_64 { + "bin-x86_64-efi/ipxe.efi" = null; + "bin-x86_64-efi/ipxe.efirom" = null; + "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb"; + } // { + "bin/ipxe.dsk" = null; + "bin/ipxe.usb" = null; + "bin/ipxe.iso" = null; + "bin/ipxe.lkrn" = null; + "bin/undionly.kpxe" = null; + }; in stdenv.mkDerivation { name = "ipxe-${date}-${builtins.substring 0 7 rev}"; - buildInputs = [ perl cdrkit syslinux xz openssl gnu-efi ]; + nativeBuildInputs = [ perl cdrkit syslinux xz openssl gnu-efi mtools ]; src = fetchgit { url = https://git.ipxe.org/ipxe.git; @@ -37,7 +42,12 @@ stdenv.mkDerivation { ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; - enabledOptions = [ "DOWNLOAD_PROTO_HTTPS" ]; + enabledOptions = [ + "PING_CMD" + "IMAGE_TRUST_CMD" + "DOWNLOAD_PROTO_HTTP" + "DOWNLOAD_PROTO_HTTPS" + ]; configurePhase = '' runHook preConfigure @@ -49,11 +59,14 @@ stdenv.mkDerivation { preBuild = "cd src"; - buildFlags = targets; + buildFlags = lib.attrNames targets; installPhase = '' mkdir -p $out - cp ${lib.concatStringsSep " " targets} $out + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (from: to: + if to == null + then "cp -v ${from} $out" + else "cp -v ${from} $out/${to}") targets)} # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending # let's provide it as a symlink to be compatible in this case. @@ -67,6 +80,6 @@ stdenv.mkDerivation { homepage = http://ipxe.org/; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; - platforms = platforms.all; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 67e0c2b21d8..f14fb526997 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -1,28 +1,26 @@ -{ stdenv, fetchgit, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: +{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: -let - version = "0.92.1-unstable"; -in stdenv.mkDerivation rec { name = "osm2pgsql-${version}"; + version = "0.96.0"; - src = fetchgit { - url = "https://github.com/openstreetmap/osm2pgsql.git"; - rev = "2b72b2121e91b72b0db6911d65c5165ca46d9d66"; - # Still waiting on release after: - # https://github.com/openstreetmap/osm2pgsql/pull/684 - # https://github.com/openstreetmap/osm2pgsql/issues/634 - #rev = "refs/tags/${version}"; - sha256 = "1v6s863zsv9p2mni35gfamawj0xr2cv2p8a31z7sijf8m6fn0vpy"; + src = fetchFromGitHub { + owner = "openstreetmap"; + repo = "osm2pgsql"; + rev = version; + sha256 = "032cydh8ynaqfhdzmkvgbmqyjql668y6qln1l59l2s3ni9963bbl"; }; - nativeBuildInputs = [cmake]; - buildInputs = [expat proj bzip2 zlib boost postgresql lua]; - meta = { + nativeBuildInputs = [ cmake ]; + + buildInputs = [ expat proj bzip2 zlib boost postgresql lua ]; + + NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + + meta = with stdenv.lib; { description = "OpenStreetMap data to PostgreSQL converter"; - version = "0.92.1-unstable"; homepage = https://github.com/openstreetmap/osm2pgsql; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix index eb46f12c5c2..f3a482baa48 100644 --- a/pkgs/tools/misc/termtosvg/default.nix +++ b/pkgs/tools/misc/termtosvg/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "termtosvg"; - version = "0.8.0"; + version = "0.9.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "e3a0a7bd511028c96d242525df807a23e6f22e55b111a7ee861f294a86224b0c"; + sha256 = "1mf2vlq083mzhja449il78zpvjq6fv36pzakwrqmgxdjbsdyvxbd"; }; - propagatedBuildInputs = with python3Packages; [ lxml pyte ]; + propagatedBuildInputs = with python3Packages; [ lxml pyte wcwidth ]; meta = with lib; { homepage = https://nbedos.github.io/termtosvg/; diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 9ae1ee0b17e..0aa51363ff8 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20190105"; + version = "20190710"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "0wagaywzc6pq59m8gpcblag7gyjjarc0qx050arr1sy8hd3yy0sp"; + sha256 = "00v3a94vpmbdziizdw2dj4bfwzfzfs2lc0ijxv98ln1w01w412q4"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a5dcad2b119..f9b16e5870d 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.07.12"; + version = "2019.07.16"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1mf8nh972hjpxj01q37jghj32rv21y91fpbwwsqmbmh65dr4k1dn"; + sha256 = "06qd6z9swx8aw9v7vi85q44hmzxgy8wx18a9ljfhx7l7wjpm99ky"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index e69e012f644..4b16eb406e3 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }: stdenv.mkDerivation rec { - version = "0.7.3"; + version = "0.7.4"; name = "davix-${version}"; nativeBuildInputs = [ cmake pkgconfig python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; - # using the url below since the 0.7.3 release did carry a broken CMake file, + # using the url below since the 0.7.4 release did carry a broken CMake file, # supposedly fixed in the next release # https://github.com/cern-fts/davix/issues/40 src = fetchurl { url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz"; - sha256 = "12ij7p1ahgvicqmccrvpd0iw1909qmpbc3nk58gdm866f9p2find"; + sha256 = "1k407ckvsw1w212k3lp2867i0sscnrbigsx79l1sp5ymj3n62aih"; }; diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/tools/networking/guardian-agent/default.nix new file mode 100644 index 00000000000..a5e8dc10d34 --- /dev/null +++ b/pkgs/tools/networking/guardian-agent/default.nix @@ -0,0 +1,44 @@ +{ buildGoPackage +, fetchFromGitHub +, lib +, autossh +, makeWrapper +}: + +buildGoPackage rec { + pname = "guardian-agent"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "StanfordSNR"; + repo = pname; + rev = "v${version}-beta"; + sha256 = "05269y944hcabn6dqa66387rdhx81vcqcyjv6m1hdbz5ba8j7mqn"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + goPackagePath = "github.com/StanfordSNR/guardian-agent"; + + goDeps = ./deps.nix; + + postInstall = '' + mkdir -p $bin/bin $out/share/doc/${pname} + cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $bin/bin/ + cp -vr ./go/src/github.com/StanfordSNR/${pname}/{AUTHORS,doc,LICENSE,README.md} $out/share/doc/guardian-agent + ''; + + postFixup = '' + wrapProgram $bin/bin/sga-guard \ + --prefix PATH : "$bin/bin" \ + --prefix PATH : "${autossh}/bin" + ''; + + meta = with lib; { + description = "Secure ssh-agent forwarding for Mosh and SSH"; + homepage = "https://github.com/StanfordSNR/guardian-agent"; + license = licenses.bsd3; + maintainers = with maintainers; [ mmahut ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/guardian-agent/deps.nix b/pkgs/tools/networking/guardian-agent/deps.nix new file mode 100644 index 00000000000..950a346ce8b --- /dev/null +++ b/pkgs/tools/networking/guardian-agent/deps.nix @@ -0,0 +1,58 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/hashicorp/yamux"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/yamux"; + rev = "2f1d1f20f75d5404f53b9edf6b53ed5505508675"; + sha256 = "1fga3p6j2g24ip9qjfwn3nqjr00m4nnjz92app7ms3sz7vgq2a7s"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/sternhenri/interact"; + fetch = { + type = "git"; + url = "https://github.com/sternhenri/interact"; + rev = "dfeb9ef2030483f98cee2c86f5775fe6c729f10b"; + sha256 = "00b09fyy9zhv11mbzm18ngg765g0gyb23bmr4fc83i09w912if7j"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "04f50cda93cbb67f2afa353c52f342100e80e625"; + sha256 = "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://github.com/StanfordSNR/crypto"; + rev = "e451cabda2acd7a416728ee89b75975b8b0c90d7"; + sha256 = "0aj6fc0i1dm6rdgr1mlv2pl4s0i6sj821k2p4gig45h5mn06mhpz"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "c0795c8afcf41dd1d786bebce68636c199b3bb45"; + sha256 = "0xsmr17mrpm9kx34zfzzirwy0n459h975x49p41fs2f6ly6lk9vp"; + }; + } + +] diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index c8e14ad7f69..a4c6e517a75 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.2.1"; name = "htpdate-${version}"; src = fetchurl { url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz"; - sha256 = "00xwppq3aj951m0srjvxmr17kiaaflyjmbfkvpnfs3jvqhzczci2"; + sha256 = "1gqw3lg4wwkn8snf4pf21s3qidhb4h791f2ci7i7i0d6kd86jv0q"; }; makeFlags = [ diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index 805c4bd5520..094bebe628f 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ocserv-${version}"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "072256099l1c6p7dvvzp0gyafh1zvmmgmnpy0fcmv9sy80qg3p44"; + sha256 = "0lybz93ah6n5b82ywshhmsmf65im8rk6gkxnzxfbxpqxra79j517"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index 8893c5e37fe..faeec8523aa 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -6,12 +6,12 @@ in stdenv.mkDerivation rec { pname = "spoofer"; - version = "1.4.2"; + version = "1.4.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz"; - sha256 = "041piwc2r4fig5b4apm2ibq1wyd11ic8p3xv3ss2hrbn5d8inza1"; + sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index a9e9f351aae..61aaa263b35 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.78"; + version = "1.0.79"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "0778silfwvbpqljxdid96nn0vkdii3fszqp6w6w2bn9hdyxhqrjp"; + sha256 = "18bp7fcpv7879q3ppdxlqj7ayqmlh5zwrkz8gch6rq9lkmmrklrf"; }; buildInputs = [ libxslt systemd libaio docbook_xsl ]; diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 5f5edcb23a7..111d40478df 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.15.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "12pq95pw5g777kpgad04n9az1fl8y0x1vismz81mqqij3jr5qwzb"; + sha256 = "07pipvxxa4bw11f0fxm8vjwd5ap7i82nsq93sw1kj353jn1mpwxw"; }; sourceRoot = "source/native"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8749ae009da..aa212d655f8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -195,12 +195,12 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; - suffix = "pre20190612_06010ea"; + suffix = "pre20190712_aa82f8b"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "06010eaf199005a393f212023ec5e8bc97978537"; - sha256 = "1fq99fmlag5hxvgzxrclgfsnc1fhhfwnslyshad1934wi9nzx1s2"; + rev = "aa82f8b2d2a2c42f0d713e8404b668cef1a4b108"; + hash = "sha256-MRY2CCjnTPSWIv0/aguZcg5U+DA+ODLKl9vjB/qXFpU="; }; fromGit = true; diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index fba92bd47ac..5aa4ad47d42 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -1,15 +1,16 @@ -{ fetchFromGitHub, stdenv, pythonPackages, gnupg, perl }: +{ fetchFromGitHub, stdenv, python3Packages, gnupg, perl }: -let version = "2.2.7"; in -pythonPackages.buildPythonApplication { - name = "pius-${version}"; +let version = "3.0.0"; in +python3Packages.buildPythonApplication { + pname = "pius"; namePrefix = ""; + inherit version; src = fetchFromGitHub { owner = "jaymzh"; repo = "pius"; rev = "v${version}"; - sha256 = "1kjj44lf9di4ylvmc949dxncllzd8afp0yknr3152dmxkw1vl127"; + sha256 = "0l87dx7n6iwy8alxnhvval8h1kl4da6a59hsilbi65c6bpj4dh3y"; }; patchPhase = '' @@ -18,8 +19,7 @@ pythonPackages.buildPythonApplication { done ''; - nativeBuildInputs = [ perl ]; - propagatedBuildInputs = with pythonPackages; [ six ]; + buildInputs = [ perl ]; meta = { homepage = https://www.phildev.net/pius/; diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix index e3f5f72c141..3d3bd4eef84 100644 --- a/pkgs/tools/security/shc/default.nix +++ b/pkgs/tools/security/shc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "shc-${version}"; - version = "4.0.2"; + version = "4.0.3"; rev = "${version}"; src = fetchFromGitHub { inherit rev; owner = "neurobin"; repo = "shc"; - sha256 = "1vd9dldm6h234awn5fhpgq4lb85ylcawr2p2108332ffy70kvdix"; + sha256 = "0bfn404plsssa14q89k9l3s5lxq3df0sny5lis4j2w75qrkqx694"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index 25470af9bb3..77ba6689b0d 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -1,17 +1,28 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, perl }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, perl }: stdenv.mkDerivation rec { - name = "fakechroot-${version}"; - version = "2.19"; + pname = "fakechroot"; + version = "2.20.1"; - # TODO: move back to mainline once https://github.com/dex4er/fakechroot/pull/46 is merged src = fetchFromGitHub { - owner = "copumpkin"; - repo = "fakechroot"; - rev = "dcc0cfe3941e328538f9e62b2c0b15430d393ec1"; - sha256 = "1ls3y97qqfcfd3z0balz94xq1gskfk04pg85x6b7wjw8dm4030qd"; + owner = "dex4er"; + repo = pname; + rev = version; + sha256 = "0xgnwazrmrg4gm30xjxdn6sx3lhqvxahrh6gmy3yfswxc30pmg86"; }; + # Use patch from https://github.com/dex4er/fakechroot/pull/46 , remove once merged! + # Courtesy of one of our own, @copumpkin! + patches = [ + (fetchpatch { + url = "https://github.com/dex4er/fakechroot/pull/46/commits/dcc0cfe3941e328538f9e62b2c0b15430d393ec1.patch"; + sha256 = "1mk8j2njd94s7vf2wggi08xxxzx8dxrvdricl9cbspvkyp715w2m"; + # Don't bother trying to reconcile conflicts for NEWS entries, as they will continue to occur + # and are uninteresting as well as unimportant for our purposes (since NEWS never leaves the build env). + excludes = [ "NEWS.md" ]; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ perl ]; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 6dfc0991ed3..694a71d8ec1 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fio-${version}"; - version = "3.14"; + version = "3.15"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "1qpv9saar0ik9mqpdyv93miyllfn7n7czcpffhk13lcrxasmjcp9"; + sha256 = "0wzy5byc2qx5mbnwkcyjkrzc662n4wkrzpcg4h611q4ix494zka9"; }; buildInputs = [ python zlib ] diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 282729f3145..f4238e27248 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "monit-5.25.3"; + name = "monit-5.26.0"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "0s8577ixcmx45b081yx6cw54iq7m5yzpq3ir616qc84xhg45h0n1"; + sha256 = "1hpk0agxi7g9vmfqvrwr5wk7pr52wdlv3vs0j3l2p6mgldl4bz47"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 729a90aa317..2899837f3f8 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -11,11 +11,11 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.1905.0"; + name = "rsyslog-8.1907.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "1r0nf5j4y8p1hbay3kdgkggr76qm7sw10pnl4anxd3vninmlzgcn"; + sha256 = "1dcz0w5xalqsi2xjb5j7c9mq5kf9s9kq9j2inpv4w5wkrrg569zb"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index efe126fe042..c1345fc9537 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.8.0"; + version = "3.9.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1lwzg1mghjfggjyf35vqakfwkd4xcvcx2xfqnz0m3imlxk729kdl"; + sha256 = "0326fh72nihq4svgw7zvacij193ya66p102y1c7glpjq75kcx6a1"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index f62fdd2f78f..6ed545deb67 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "amazon-ecs-cli-${version}"; - version = "1.14.1"; + version = "1.15.1"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "12q167pbpxw38p1bzcy9z4ix7yh9giwkyrc4vq2qln3pjn9d31rj"; + sha256 = "0p0z12b6z00sxzjfsvb37czgczrsi61klr5azan0f8wf32x6wc28"; }; dontUnpack = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d7dac46711..4c4f43d7090 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -128,6 +128,8 @@ in addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; + avro-tools = callPackage ../development/tools/avro-tools { }; + # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; @@ -1054,6 +1056,8 @@ in blink = callPackage ../applications/networking/instant-messengers/blink { }; + blockbook = callPackage ../servers/blockbook { }; + blockhash = callPackage ../tools/graphics/blockhash { }; bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; @@ -5610,6 +5614,8 @@ in jack2 = jack2Full; }; + qt-box-editor = libsForQt5.callPackage ../applications/misc/qt-box-editor { }; + recutils = callPackage ../tools/misc/recutils { }; recoll = callPackage ../applications/search/recoll { }; @@ -8053,6 +8059,10 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + cargo-flamegraph = callPackage ../development/tools/cargo-flamegraph { + inherit (darwin.apple_sdk.frameworks) Security; + }; + carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; @@ -8898,15 +8908,11 @@ in buildozer = bazel-buildtools; unused_deps = bazel-buildtools; - bazel-deps = callPackage ../development/tools/build-managers/bazel/bazel-deps { - buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; }; - }; + bazel-deps = callPackage ../development/tools/build-managers/bazel/bazel-deps { }; bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { - buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; }; - }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { }; bazelisk = callPackage ../development/tools/bazelisk { }; @@ -9234,6 +9240,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; + fly = callPackage ../development/tools/continuous-integration/fly { }; + foreman = callPackage ../tools/system/foreman { }; goreman = callPackage ../tools/system/goreman { }; @@ -10217,6 +10225,8 @@ in cxxtest = callPackage ../development/libraries/cxxtest { }; + cypress = callPackage ../development/web/cypress { }; + cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { kerberos = if stdenv.isFreeBSD then libheimdal else kerberos; }; @@ -10552,6 +10562,8 @@ in gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; + gdal_2 = callPackage ../development/libraries/gdal/2.4.0.nix { }; + gdcm = callPackage ../development/libraries/gdcm { }; ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; @@ -12377,6 +12389,8 @@ in mueval = callPackage ../development/tools/haskell/mueval { }; + mumlib = callPackage ../development/libraries/mumlib { }; + muparser = callPackage ../development/libraries/muparser { }; mygpoclient = pythonPackages.mygpoclient; @@ -12698,6 +12712,10 @@ in proj = callPackage ../development/libraries/proj { }; + proj_5 = callPackage ../development/libraries/proj/5.2.nix { }; + + proj-datumgrid = callPackage ../development/libraries/proj-datumgrid { }; + proselint = callPackage ../tools/text/proselint { inherit (python3Packages) buildPythonApplication click future six; @@ -13431,6 +13449,8 @@ in tdb = callPackage ../development/libraries/tdb {}; + tdlib = callPackage ../development/libraries/tdlib { }; + tecla = callPackage ../development/libraries/tecla { }; tectonic = callPackage ../tools/typesetting/tectonic { @@ -14391,6 +14411,8 @@ in mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; + mumsi = callPackage ../servers/mumsi { }; + myserver = callPackage ../servers/http/myserver { }; nas = callPackage ../servers/nas { }; @@ -16780,6 +16802,8 @@ in vegur = callPackage ../data/fonts/vegur { }; + victor-mono = callPackage ../data/fonts/victor-mono { }; + vistafonts = callPackage ../data/fonts/vista-fonts { }; vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { }; @@ -18007,6 +18031,8 @@ in wireshark-gtk = throw "Not supported anymore. Use wireshark-qt or wireshark-cli instead."; wireshark-cli = wireshark.override { withQt = false; }; + sngrep = callPackage ../applications/networking/sniffers/sngrep {}; + termshark = callPackage ../tools/networking/termshark { }; fbida = callPackage ../applications/graphics/fbida { }; @@ -18034,6 +18060,7 @@ in firefox-unwrapped = firefoxPackages.firefox; firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52; firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; + firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; tor-browser-unwrapped = firefoxPackages.tor-browser; icecat-unwrapped = firefoxPackages.icecat; @@ -18041,7 +18068,8 @@ in firefox-wayland = wrapFirefox firefox-unwrapped { gdkWayland = true; }; firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { }; firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { }; - firefox-esr = firefox-esr-60; + firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; + firefox-esr = firefox-esr-68; icecat = wrapFirefox icecat-unwrapped { }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { @@ -18341,6 +18369,8 @@ in guake = callPackage ../applications/misc/guake { }; + guardian-agent = callPackage ../tools/networking/guardian-agent { }; + guitone = callPackage ../applications/version-management/guitone { graphviz = graphviz_2_32; }; @@ -18381,6 +18411,7 @@ in hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; hledger = haskell.lib.justStaticExecutables haskellPackages.hledger; + hledger-iadd = haskell.lib.justStaticExecutables haskellPackages.hledger-iadd; hledger-interest = haskell.lib.justStaticExecutables haskellPackages.hledger-interest; hledger-ui = haskell.lib.justStaticExecutables haskellPackages.hledger-ui; hledger-web = haskell.lib.justStaticExecutables haskellPackages.hledger-web; @@ -19047,7 +19078,9 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { + gdal = gdal_2; # https://github.com/openstreetmap/merkaartor/issues/179 + }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -20202,6 +20235,10 @@ in insync = callPackage ../applications/networking/insync { }; + libstrangle = callPackage ../tools/X11/libstrangle { + stdenv = stdenv_32bit; + }; + lightdm = libsForQt5.callPackage ../applications/display-managers/lightdm { }; lightdm_qt = lightdm.override { withQt5 = true; }; @@ -21885,10 +21922,6 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; - saga_2_3_2 = callPackage ../applications/gis/saga/lts.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - samplv1 = callPackage ../applications/audio/samplv1 { }; sauerbraten = callPackage ../games/sauerbraten {}; @@ -22293,10 +22326,10 @@ in solarc-gtk-theme = callPackage ../misc/themes/solarc { }; xfce = xfce4-12; - xfceUnstable = xfce4-13; + xfceUnstable = xfce4-14; xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); - xfce4-13 = recurseIntoAttrs (callPackage ../desktops/xfce4-13 { }); + xfce4-14 = recurseIntoAttrs (callPackage ../desktops/xfce4-14 { }); xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; @@ -24252,6 +24285,8 @@ in vdrPlugins = recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { }); wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {}; + chrome-export = callPackage ../tools/misc/chrome-export {}; + chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 8a987c6cf14..1cbdb6a9f21 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -126,7 +126,7 @@ in rec { version = "8.9.1"; }; coq_8_10 = callPackage ../applications/science/logic/coq { - version = "8.10+beta1"; + version = "8.10+beta2"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3db604b9e32..f78cacd08be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5464,6 +5464,9 @@ let }; buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike SubExporter Throwable TryTiny ]; + postPatch = '' + patchShebangs --build util + ''; meta = { homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; @@ -6220,6 +6223,10 @@ let sha256 = "f1f1820ff44042f6b30e4d6be1db860b9e743b1a9836070ea656ad9829e4eca5"; }; propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; + # restore t/sample-data which is corrupted by patching shebangs + preCheck = '' + tar xf $src */t/sample-data --strip-components=1 + ''; meta = { homepage = https://www.shlomifish.org/open-source/projects/File-Find-Object/; description = "Alternative interface to File::Find::Object"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00e72246f09..43d76a7fa4e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -175,8 +175,12 @@ in { asana = callPackage ../development/python-modules/asana { }; + asdf = callPackage ../development/python-modules/asdf { }; + asciimatics = callPackage ../development/python-modules/asciimatics { }; + asciitree = callPackage ../development/python-modules/asciitree { }; + ase = callPackage ../development/python-modules/ase { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; @@ -242,31 +246,165 @@ in { azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; - azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; + azure-applicationinsights = callPackage ../development/python-modules/azure-applicationinsights { }; - azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; + azure-batch = callPackage ../development/python-modules/azure-batch { }; - azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; + azure-cosmosdb-nspkg = callPackage ../development/python-modules/azure-cosmosdb-nspkg { }; - azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; + azure-cosmosdb-table = callPackage ../development/python-modules/azure-cosmosdb-table { }; - azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; + azure-datalake-store = callPackage ../development/python-modules/azure-datalake-store { }; - azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; + azure-eventgrid = callPackage ../development/python-modules/azure-eventgrid { }; - azure-storage = callPackage ../development/python-modules/azure-storage { }; + azure-graphrbac = callPackage ../development/python-modules/azure-graphrbac { }; + + azure-keyvault = callPackage ../development/python-modules/azure-keyvault { }; + + azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { }; + + azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; + + azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { }; + + azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; + azure-storage = callPackage ../development/python-modules/azure-storage { }; + azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; - azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; + azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; + + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; + + azure-mgmt-advisor = callPackage ../development/python-modules/azure-mgmt-advisor { }; + + azure-mgmt-applicationinsights = callPackage ../development/python-modules/azure-mgmt-applicationinsights { }; + + azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { }; + + azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { }; + + azure-mgmt-batchai = callPackage ../development/python-modules/azure-mgmt-batchai { }; + + azure-mgmt-billing = callPackage ../development/python-modules/azure-mgmt-billing { }; + + azure-mgmt-cdn = callPackage ../development/python-modules/azure-mgmt-cdn { }; + + azure-mgmt-cognitiveservices = callPackage ../development/python-modules/azure-mgmt-cognitiveservices { }; + + azure-mgmt-commerce = callPackage ../development/python-modules/azure-mgmt-commerce { }; + + azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; + + azure-mgmt-consumption = callPackage ../development/python-modules/azure-mgmt-consumption { }; + + azure-mgmt-containerinstance = callPackage ../development/python-modules/azure-mgmt-containerinstance { }; + + azure-mgmt-containerservice = callPackage ../development/python-modules/azure-mgmt-containerservice { }; + + azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { }; + + azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { }; + + azure-mgmt-datalake-analytics = callPackage ../development/python-modules/azure-mgmt-datalake-analytics { }; + + azure-mgmt-datalake-nspkg = callPackage ../development/python-modules/azure-mgmt-datalake-nspkg { }; + + azure-mgmt-datalake-store = callPackage ../development/python-modules/azure-mgmt-datalake-store { }; + + azure-mgmt-datamigration = callPackage ../development/python-modules/azure-mgmt-datamigration { }; + + azure-mgmt-devspaces = callPackage ../development/python-modules/azure-mgmt-devspaces { }; + + azure-mgmt-devtestlabs = callPackage ../development/python-modules/azure-mgmt-devtestlabs { }; + + azure-mgmt-dns = callPackage ../development/python-modules/azure-mgmt-dns { }; + + azure-mgmt-eventgrid = callPackage ../development/python-modules/azure-mgmt-eventgrid { }; + + azure-mgmt-eventhub = callPackage ../development/python-modules/azure-mgmt-eventhub { }; + + azure-mgmt-hanaonazure = callPackage ../development/python-modules/azure-mgmt-hanaonazure { }; + + azure-mgmt-iotcentral = callPackage ../development/python-modules/azure-mgmt-iotcentral { }; + + azure-mgmt-iothub = callPackage ../development/python-modules/azure-mgmt-iothub { }; + + azure-mgmt-iothubprovisioningservices = callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; + + azure-mgmt-keyvault = callPackage ../development/python-modules/azure-mgmt-keyvault { }; + + azure-mgmt-loganalytics = callPackage ../development/python-modules/azure-mgmt-loganalytics { }; + + azure-mgmt-logic = callPackage ../development/python-modules/azure-mgmt-logic { }; + + azure-mgmt-machinelearningcompute = callPackage ../development/python-modules/azure-mgmt-machinelearningcompute { }; + + azure-mgmt-managementgroups = callPackage ../development/python-modules/azure-mgmt-managementgroups { }; + + azure-mgmt-managementpartner = callPackage ../development/python-modules/azure-mgmt-managementpartner { }; + + azure-mgmt-maps = callPackage ../development/python-modules/azure-mgmt-maps { }; + + azure-mgmt-marketplaceordering = callPackage ../development/python-modules/azure-mgmt-marketplaceordering { }; + + azure-mgmt-media = callPackage ../development/python-modules/azure-mgmt-media { }; + + azure-mgmt-monitor = callPackage ../development/python-modules/azure-mgmt-monitor { }; + + azure-mgmt-msi = callPackage ../development/python-modules/azure-mgmt-msi { }; + + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; + + azure-mgmt-notificationhubs = callPackage ../development/python-modules/azure-mgmt-notificationhubs { }; + + azure-mgmt-policyinsights = callPackage ../development/python-modules/azure-mgmt-policyinsights { }; + + azure-mgmt-powerbiembedded = callPackage ../development/python-modules/azure-mgmt-powerbiembedded { }; + + azure-mgmt-rdbms = callPackage ../development/python-modules/azure-mgmt-rdbms { }; + + azure-mgmt-recoveryservices = callPackage ../development/python-modules/azure-mgmt-recoveryservices { }; + + azure-mgmt-recoveryservicesbackup = callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup { }; + + azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { }; + + azure-mgmt-relay = callPackage ../development/python-modules/azure-mgmt-relay { }; + + azure-mgmt-reservations = callPackage ../development/python-modules/azure-mgmt-reservations { }; + + azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; + + azure-mgmt-scheduler = callPackage ../development/python-modules/azure-mgmt-scheduler { }; + + azure-mgmt-search = callPackage ../development/python-modules/azure-mgmt-search { }; + + azure-mgmt-servicebus = callPackage ../development/python-modules/azure-mgmt-servicebus { }; + + azure-mgmt-servicefabric = callPackage ../development/python-modules/azure-mgmt-servicefabric { }; + + azure-mgmt-signalr = callPackage ../development/python-modules/azure-mgmt-signalr { }; + + azure-mgmt-sql = callPackage ../development/python-modules/azure-mgmt-sql { }; + + azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; + + azure-mgmt-subscription = callPackage ../development/python-modules/azure-mgmt-subscription { }; + + azure-mgmt-trafficmanager = callPackage ../development/python-modules/azure-mgmt-trafficmanager { }; + + azure-mgmt-web = callPackage ../development/python-modules/azure-mgmt-web { }; backports_csv = callPackage ../development/python-modules/backports_csv {}; @@ -328,6 +466,10 @@ in { clikit = callPackage ../development/python-modules/clikit { }; + cliff = callPackage ../development/python-modules/cliff { }; + + clifford = callPackage ../development/python-modules/clifford { }; + clustershell = callPackage ../development/python-modules/clustershell { }; cozy = callPackage ../development/python-modules/cozy { }; @@ -346,6 +488,8 @@ in { datasette = callPackage ../development/python-modules/datasette { }; + datashader = callPackage ../development/python-modules/datashader { }; + dbf = callPackage ../development/python-modules/dbf { }; dbfread = callPackage ../development/python-modules/dbfread { }; @@ -438,6 +582,8 @@ in { globus-sdk = callPackage ../development/python-modules/globus-sdk { }; + glymur = callPackage ../development/python-modules/glymur { }; + glom = callPackage ../development/python-modules/glom { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; @@ -702,6 +848,8 @@ in { pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; + pydy = callPackage ../development/python-modules/pydy { }; + pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {})); py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; @@ -714,6 +862,8 @@ in { pygame = callPackage ../development/python-modules/pygame { }; + pygbm = callPackage ../development/python-modules/pygbm { }; + pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; pygdbmi = callPackage ../development/python-modules/pygdbmi { }; @@ -955,6 +1105,8 @@ in { slackclient = callPackage ../development/python-modules/slackclient { }; + slicedimage = callPackage ../development/python-modules/slicedimage { }; + slicerator = callPackage ../development/python-modules/slicerator { }; slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; @@ -971,6 +1123,8 @@ in { statistics = callPackage ../development/python-modules/statistics { }; + stumpy = callPackage ../development/python-modules/stumpy { }; + sumo = callPackage ../development/python-modules/sumo { }; supervise_api = callPackage ../development/python-modules/supervise_api { }; @@ -1002,6 +1156,10 @@ in { toggl-cli = callPackage ../development/python-modules/toggl-cli { }; + uamqp = callPackage ../development/python-modules/uamqp { + inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; + }; + unifi = callPackage ../development/python-modules/unifi { }; uvloop = callPackage ../development/python-modules/uvloop { }; @@ -1020,6 +1178,8 @@ in { yarg = callPackage ../development/python-modules/yarg { }; + yt = callPackage ../development/python-modules/yt { }; + # packages defined here aafigure = callPackage ../development/python-modules/aafigure { }; @@ -1050,6 +1210,8 @@ in { aioh2 = callPackage ../development/python-modules/aioh2 { }; + aioftp = callPackage ../development/python-modules/aioftp { }; + aiohttp = callPackage ../development/python-modules/aiohttp { }; aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; @@ -1325,6 +1487,8 @@ in { circus = callPackage ../development/python-modules/circus {}; + colorcet = callPackage ../development/python-modules/colorcet { }; + colorclass = callPackage ../development/python-modules/colorclass {}; colorlog = callPackage ../development/python-modules/colorlog { }; @@ -1654,6 +1818,8 @@ in { openidc-client = callPackage ../development/python-modules/openidc-client {}; + optuna = callPackage ../development/python-modules/optuna { }; + idna = callPackage ../development/python-modules/idna { }; mahotas = callPackage ../development/python-modules/mahotas { }; @@ -1735,6 +1901,10 @@ in { pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; + pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { }; + + pytest-astropy = callPackage ../development/python-modules/pytest-astropy { }; + pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; pytestcache = callPackage ../development/python-modules/pytestcache { }; @@ -1749,6 +1919,8 @@ in { pytest-django = callPackage ../development/python-modules/pytest-django { }; + pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; + pytest-faulthandler = callPackage ../development/python-modules/pytest-faulthandler { }; pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; @@ -1759,6 +1931,8 @@ in { pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; + pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; + pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; @@ -1767,8 +1941,12 @@ in { pytest-isort = callPackage ../development/python-modules/pytest-isort { }; + pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; + pytest-mock = callPackage ../development/python-modules/pytest-mock { }; + pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; + pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; @@ -1793,6 +1971,8 @@ in { pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; + pytest-socket = callPackage ../development/python-modules/pytest-socket { }; + pytestcov = callPackage ../development/python-modules/pytest-cov { }; pytest-expect = callPackage ../development/python-modules/pytest-expect { }; @@ -1943,6 +2123,8 @@ in { dropbox = callPackage ../development/python-modules/dropbox {}; + drms = callPackage ../development/python-modules/drms { }; + ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; @@ -2213,6 +2395,8 @@ in { lightblue = callPackage ../development/python-modules/lightblue { }; + lightgbm = callPackage ../development/python-modules/lightgbm { }; + lightning = callPackage ../development/python-modules/lightning { }; jupyter = callPackage ../development/python-modules/jupyter { }; @@ -2429,6 +2613,8 @@ in { subliminal = callPackage ../development/python-modules/subliminal {}; + sunpy = callPackage ../development/python-modules/sunpy { }; + hyperlink = callPackage ../development/python-modules/hyperlink {}; zope_copy = callPackage ../development/python-modules/zope_copy {}; @@ -2453,6 +2639,8 @@ in { regex = callPackage ../development/python-modules/regex { }; + regional = callPackage ../development/python-modules/regional { }; + ratelimiter = callPackage ../development/python-modules/ratelimiter { }; pywatchman = callPackage ../development/python-modules/pywatchman { }; @@ -2487,6 +2675,8 @@ in { statsd = callPackage ../development/python-modules/statsd { }; + starfish = callPackage ../development/python-modules/starfish { }; + multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; random2 = callPackage ../development/python-modules/random2 { }; @@ -2505,6 +2695,8 @@ in { zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; + validators = callPackage ../development/python-modules/validators { }; + validictory = callPackage ../development/python-modules/validictory { }; validate-email = callPackage ../development/python-modules/validate-email { }; @@ -2706,7 +2898,7 @@ in { filelock = callPackage ../development/python-modules/filelock {}; - fiona = callPackage ../development/python-modules/fiona { gdal = pkgs.gdal; }; + fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; }; fitbit = callPackage ../development/python-modules/fitbit { }; @@ -3128,6 +3320,8 @@ in { isort = callPackage ../development/python-modules/isort {}; + isoweek = callPackage ../development/python-modules/isoweek {}; + jabberbot = callPackage ../development/python-modules/jabberbot {}; jedi = callPackage ../development/python-modules/jedi { }; @@ -3428,6 +3622,8 @@ in { mockito = callPackage ../development/python-modules/mockito { }; + modeled = callPackage ../development/python-modules/modeled { }; + moderngl = callPackage ../development/python-modules/moderngl { }; modestmaps = callPackage ../development/python-modules/modestmaps { }; @@ -3745,6 +3941,8 @@ in { paramz = callPackage ../development/python-modules/paramz { }; + parfive = callPackage ../development/python-modules/parfive { }; + parsel = callPackage ../development/python-modules/parsel { }; parso = callPackage ../development/python-modules/parso { }; @@ -3821,6 +4019,8 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; + kmapper = callPackage ../development/python-modules/kmapper { }; + kmsxx = (callPackage ../development/libraries/kmsxx { inherit (pkgs.kmsxx) stdenv; inherit (pkgs) pkgconfig; @@ -4020,11 +4220,7 @@ in { pyotp = callPackage ../development/python-modules/pyotp { }; - pyproj = callPackage ../development/python-modules/pyproj { - # pyproj does *work* if you want to use a system supplied proj, but with the current version(s) the tests fail by - # a few decimal places, so caveat emptor. - proj = null; - }; + pyproj = callPackage ../development/python-modules/pyproj { }; pyqrcode = callPackage ../development/python-modules/pyqrcode { }; @@ -4222,7 +4418,9 @@ in { rabbitpy = callPackage ../development/python-modules/rabbitpy { }; - rasterio = callPackage ../development/python-modules/rasterio { }; + rasterio = callPackage ../development/python-modules/rasterio { + gdal = pkgs.gdal_2; # gdal 3.0 not supported yet + }; radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {}; @@ -4306,6 +4504,8 @@ in { python2 = python; })); + ripser = callPackage ../development/python-modules/ripser { }; + rjsmin = callPackage ../development/python-modules/rjsmin { }; pysolr = callPackage ../development/python-modules/pysolr { }; @@ -4423,6 +4623,10 @@ in { scikit-build = callPackage ../development/python-modules/scikit-build { }; + scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; + + scikit-tda = callPackage ../development/python-modules/scikit-tda { }; + scp = callPackage ../development/python-modules/scp {}; seaborn = callPackage ../development/python-modules/seaborn { }; @@ -4447,6 +4651,8 @@ in { should-dsl = callPackage ../development/python-modules/should-dsl { }; + showit = callPackage ../development/python-modules/showit { }; + simplejson = callPackage ../development/python-modules/simplejson { }; simplekml = callPackage ../development/python-modules/simplekml { }; @@ -4531,6 +4737,8 @@ in { tabulate = callPackage ../development/python-modules/tabulate { }; + tadasets = callPackage ../development/python-modules/tadasets { }; + tempita = callPackage ../development/python-modules/tempita { }; terminado = callPackage ../development/python-modules/terminado { }; @@ -4589,6 +4797,8 @@ in { ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; + umap-learn = callPackage ../development/python-modules/umap-learn { }; + umemcache = callPackage ../development/python-modules/umemcache {}; uritools = callPackage ../development/python-modules/uritools { }; @@ -4619,6 +4829,8 @@ in { virtualenv = callPackage ../development/python-modules/virtualenv { }; + vsts = callPackage ../development/python-modules/vsts { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; webassets = callPackage ../development/python-modules/webassets { }; @@ -4689,6 +4901,8 @@ in { persistent = callPackage ../development/python-modules/persistent {}; + persim = callPackage ../development/python-modules/persim { }; + xdot = callPackage ../development/python-modules/xdot { }; zetup = callPackage ../development/python-modules/zetup { }; @@ -4958,6 +5172,8 @@ in { traceback2 = callPackage ../development/python-modules/traceback2 { }; + trackpy = callPackage ../development/python-modules/trackpy { }; + linecache2 = callPackage ../development/python-modules/linecache2 { }; upass = callPackage ../development/python-modules/upass { }; @@ -4996,6 +5212,8 @@ in { xlib = callPackage ../development/python-modules/xlib { }; + yappi = callPackage ../development/python-modules/yappi { }; + zbase32 = callPackage ../development/python-modules/zbase32 { }; zdaemon = callPackage ../development/python-modules/zdaemon { }; @@ -5589,6 +5807,8 @@ in { node-semver = callPackage ../development/python-modules/node-semver { }; + diskcache = callPackage ../development/python-modules/diskcache { }; + distro = callPackage ../development/python-modules/distro { }; bz2file = callPackage ../development/python-modules/bz2file { }; @@ -5753,6 +5973,8 @@ in { flickrapi = callPackage ../development/python-modules/flickrapi { }; aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; + + mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; }); in fix' (extends overrides packages)