diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 15792e7132e..00000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -# These are supported funding model platforms - -open_collective: nixos diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml index ef9198d1de2..196c760251f 100644 --- a/doc/package-specific-user-notes.xml +++ b/doc/package-specific-user-notes.xml @@ -409,11 +409,19 @@ overrides = self: super: rec {
- Citrix Receiver + Citrix Receiver & Citrix Workspace App - The Citrix - Receiver is a remote desktop viewer which provides access to + + + Please note that the citrix_receiver package has been deprecated since its + development was discontinued by upstream + and will be replaced by the citrix workspace app. + + + Citrix Receiver and + Citrix Workspace App + are a remote desktop viewers which provide access to XenDesktop installations. @@ -423,30 +431,35 @@ overrides = self: super: rec { The tarball archive needs to be downloaded manually as the license - agreements of the vendor need to be accepted first. This is available at - the - download - page at citrix.com. Then run nix-prefetch-url - file://$PWD/linuxx64-$version.tar.gz. With the archive available + agreements of the vendor for + Citrix Receiver + or Citrix Workspace + need to be accepted first. + Then run nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz. + With the archive available in the store the package can be built and installed with Nix. - - Note: it's recommended to install Citrix - Receiver using nix-env -i or globally to - ensure that the .desktop files are installed properly - into $XDG_CONFIG_DIRS. Otherwise it won't be possible to - open .ica files automatically from the browser to start - a Citrix connection. - + + Caution with <command>nix-shell</command> installs + + It's recommended to install Citrix Receiver + and/or Citrix Workspace using + nix-env -i or globally to + ensure that the .desktop files are installed properly + into $XDG_CONFIG_DIRS. Otherwise it won't be possible to + open .ica files automatically from the browser to start + a Citrix connection. + +
Custom certificates - The Citrix Receiver in nixpkgs trusts - several certificates + The Citrix Receiver and Citrix Workspace App + in nixpkgs trust several certificates from the Mozilla database by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative @@ -459,7 +472,7 @@ overrides = self: super: rec { { config.allowUnfree = true; }; let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in -citrix_receiver.override { +citrix_workspace.override { # the same applies for `citrix_receiver` if used. inherit extraCerts; }]]> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 339524f703d..5e9c4c5c116 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -333,6 +333,11 @@ github = "andersk"; name = "Anders Kaseorg"; }; + anderslundstedt = { + email = "git@anderslundstedt.se"; + github = "anderslundstedt"; + name = "Anders Lundstedt"; + }; AndersonTorres = { email = "torres.anderson.85@protonmail.com"; github = "AndersonTorres"; @@ -1148,6 +1153,19 @@ github = "cwoac"; name = "Oliver Matthews"; }; + cypherpunk2140 = { + email = "stefan.mihaila@pm.me"; + github = "cypherpunk2140"; + name = "Ștefan D. Mihăilă"; + keys = [ + { longkeyid = "rsa4096/6E68A39BF16A3ECB"; + fingerprint = "CBC9 C7CC 51F0 4A61 3901 C723 6E68 A39B F16A 3ECB"; + } + { longkeyid = "rsa4096/6220AD7846220A52"; + fingerprint = "7EAB 1447 5BBA 7DDE 7092 7276 6220 AD78 4622 0A52"; + } + ]; + }; dalance = { email = "dalance@gmail.com"; github = "dalance"; @@ -2119,6 +2137,11 @@ github = "henrytill"; name = "Henry Till"; }; + herberteuler = { + email = "herberteuler@gmail.com"; + github = "herberteuler"; + name = "Guanpeng Xu"; + }; hhm = { email = "heehooman+nixpkgs@gmail.com"; github = "hhm0"; @@ -2285,6 +2308,11 @@ github = "j-keck"; name = "Jürgen Keck"; }; + j03 = { + email = "github@johannesloetzsch.de"; + github = "johannesloetzsch"; + name = "Johannes Lötzsch"; + }; jagajaga = { email = "ars.seroka@gmail.com"; github = "jagajaga"; @@ -2573,6 +2601,11 @@ github = "jraygauthier"; name = "Raymond Gauthier"; }; + jtobin = { + email = "jared@jtobin.io"; + github = "jtobin"; + name = "Jared Tobin"; + }; jtojnar = { email = "jtojnar@gmail.com"; github = "jtojnar"; @@ -2941,6 +2974,15 @@ github = "listx"; name = "Linus Arver"; }; + livnev = { + email = "lev@liv.nev.org.uk"; + github = "livnev"; + name = "Lev Livnev"; + keys = [{ + longkeyid = "rsa2048/0x68FF81E6A7850F49"; + fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49"; + }]; + }; luis = { email = "luis.nixos@gmail.com"; github = "Luis-Hebendanz"; diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index c8739d04638..bde48bc16af 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -149,9 +149,20 @@ - Several of the apache subservices have been replaced with full NixOS - modules including LimeSurvey, WordPress, and Zabbix. - These modules can be enabled using the , + The httpd service no longer attempts to start the postgresql service. If you have come to depend + on this behaviour then you can preserve the behavior with the following configuration: + systemd.services.httpd.after = [ "postgresql.service" ]; + + + The option has been + marked as deprecated. You may still use this feature, but it will be + removed in a future release of NixOS. You are encouraged to convert any + httpd subservices you may have written to a full NixOS module. + + + Most of the httpd subservices packaged with NixOS have been replaced with + full NixOS modules including LimeSurvey, WordPress, and Zabbix. These + modules can be enabled using the , , and options. @@ -195,6 +206,13 @@ and may break if it relies on those options being set. + + + The prometheus-nginx-exporter package now uses the offical exporter provided by NGINX Inc. + Its metrics are differently structured and are incompatible to the old ones. For information about the metrics, + have a look at the official repo. + +
@@ -347,6 +365,15 @@ The tomcat-connector httpd.extraSubservice has been removed from nixpkgs. + + + It's now possible to change configuration in + services.nextcloud after the initial deploy + since all config parameters are persisted in an additional config file generated by the module. + Previously core configuration like database parameters were set using their imperative + installer after creating /var/lib/nextcloud. + + diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index aad02a9ca4e..74cf74d7418 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -34,7 +34,7 @@ with lib; networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; - pinentry = super.pinentry.override { gtk2 = null; gcr = null; qt = null; }; + pinentry = super.pinentry.override { gtk2 = null; gcr = null; qt4 = null; qt5 = null; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; })); }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1b944199a66..8d63a03dd05 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -198,6 +198,7 @@ ./services/audio/slimserver.nix ./services/audio/snapserver.nix ./services/audio/squeezelite.nix + ./services/audio/spotifyd.nix ./services/audio/ympd.nix ./services/backup/automysqlbackup.nix ./services/backup/bacula.nix @@ -422,6 +423,7 @@ ./services/misc/gollum.nix ./services/misc/gpsd.nix ./services/misc/headphones.nix + ./services/misc/greenclip.nix ./services/misc/home-assistant.nix ./services/misc/ihaskell.nix ./services/misc/irkerd.nix @@ -691,6 +693,7 @@ ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix ./services/networking/tedicross.nix + ./services/networking/thelounge.nix ./services/networking/tinc.nix ./services/networking/tinydns.nix ./services/networking/tftpd.nix diff --git a/nixos/modules/services/audio/spotifyd.nix b/nixos/modules/services/audio/spotifyd.nix new file mode 100644 index 00000000000..e3556b2559c --- /dev/null +++ b/nixos/modules/services/audio/spotifyd.nix @@ -0,0 +1,42 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.spotifyd; + spotifydConf = pkgs.writeText "spotifyd.conf" cfg.config; +in +{ + options = { + services.spotifyd = { + enable = mkEnableOption "spotifyd, a Spotify playing daemon"; + + config = mkOption { + default = ""; + type = types.lines; + description = '' + Configuration for Spotifyd. For syntax and directives, see + https://github.com/Spotifyd/spotifyd#Configuration. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.spotifyd = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" "sound.target" ]; + description = "spotifyd, a Spotify playing daemon"; + serviceConfig = { + ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache_path /var/cache/spotifyd --config ${spotifydConf}"; + Restart = "always"; + RestartSec = 12; + DynamicUser = true; + CacheDirectory = "spotifyd"; + SupplementaryGroups = ["audio"]; + }; + }; + }; + + meta.maintainers = [ maintainers.anderslundstedt ]; +} diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index 02db47568d3..72d4a8249a3 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -52,7 +52,7 @@ Type "help" for help. By default, PostgreSQL stores its databases in - /var/db/postgresql. You can override this using + /var/lib/postgresql/$psqlSchema. You can override this using , e.g. = "/data/postgresql"; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 52589b593b4..9fce9419a1a 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -585,6 +585,7 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = with pkgs; [ + exiftool gitAndTools.git gnutar gzip diff --git a/nixos/modules/services/misc/greenclip.nix b/nixos/modules/services/misc/greenclip.nix new file mode 100644 index 00000000000..9152a782d7f --- /dev/null +++ b/nixos/modules/services/misc/greenclip.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.greenclip; +in { + + options.services.greenclip = { + enable = mkEnableOption "Greenclip daemon"; + + package = mkOption { + type = types.package; + default = pkgs.haskellPackages.greenclip; + defaultText = "pkgs.haskellPackages.greenclip"; + description = "greenclip derivation to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.greenclip = { + enable = true; + description = "greenclip daemon"; + wantedBy = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig.ExecStart = "${cfg.package}/bin/greenclip daemon"; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 20e7eba4341..802281e7164 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -1,8 +1,10 @@ -{ config, pkgs, lib, ... }: - -with lib; +{ config, pkgs, lib, options, ... }: let + inherit (lib) concatStrings foldl foldl' genAttrs literalExample maintainers + mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption + optional types; + cfg = config.services.prometheus.exporters; # each attribute in `exporterOpts` is expected to have specified: @@ -17,25 +19,28 @@ let # Note that `extraOpts` is optional, but a script for the exporter's # systemd service must be provided by specifying either # `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart` - exporterOpts = { - blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; }; - collectd = import ./exporters/collectd.nix { inherit config lib pkgs; }; - dnsmasq = import ./exporters/dnsmasq.nix { inherit config lib pkgs; }; - dovecot = import ./exporters/dovecot.nix { inherit config lib pkgs; }; - fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; }; - json = import ./exporters/json.nix { inherit config lib pkgs; }; - minio = import ./exporters/minio.nix { inherit config lib pkgs; }; - nginx = import ./exporters/nginx.nix { inherit config lib pkgs; }; - node = import ./exporters/node.nix { inherit config lib pkgs; }; - postfix = import ./exporters/postfix.nix { inherit config lib pkgs; }; - snmp = import ./exporters/snmp.nix { inherit config lib pkgs; }; - surfboard = import ./exporters/surfboard.nix { inherit config lib pkgs; }; - tor = import ./exporters/tor.nix { inherit config lib pkgs; }; - unifi = import ./exporters/unifi.nix { inherit config lib pkgs; }; - varnish = import ./exporters/varnish.nix { inherit config lib pkgs; }; - bind = import ./exporters/bind.nix { inherit config lib pkgs; }; - wireguard = import ./exporters/wireguard.nix { inherit config lib pkgs; }; - }; + + exporterOpts = genAttrs [ + "bind" + "blackbox" + "collectd" + "dnsmasq" + "dovecot" + "fritzbox" + "json" + "minio" + "nginx" + "node" + "postfix" + "snmp" + "surfboard" + "tor" + "unifi" + "varnish" + "wireguard" + ] (name: + import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; } + ); mkExporterOpts = ({ name, port }: { enable = mkEnableOption "the prometheus ${name} exporter"; @@ -97,9 +102,10 @@ let }; }); - mkSubModule = { name, port, extraOpts, ... }: { + mkSubModule = { name, port, extraOpts, imports }: { ${name} = mkOption { type = types.submodule { + inherit imports; options = (mkExporterOpts { inherit name port; } // extraOpts); @@ -112,13 +118,15 @@ let mkSubModules = (foldl' (a: b: a//b) {} (mapAttrsToList (name: opts: mkSubModule { inherit name; - inherit (opts) port serviceOpts; + inherit (opts) port; extraOpts = opts.extraOpts or {}; + imports = opts.imports or []; }) exporterOpts) ); mkExporterConf = { name, conf, serviceOpts }: mkIf conf.enable { + warnings = conf.warnings or []; networking.firewall.extraCommands = mkIf conf.openFirewall (concatStrings [ "ip46tables -A nixos-fw ${conf.firewallFilter} " "-m comment --comment ${name}-exporter -j nixos-fw-accept" diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml index 81ac998729b..f6cd1ef57d0 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.xml +++ b/nixos/modules/services/monitoring/prometheus/exporters.xml @@ -17,7 +17,7 @@ exporter, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows: - services.promtheus.exporters.node = { + services.prometheus.exporters.node = { enable = true; enabledCollectors = [ "logind" @@ -113,7 +113,7 @@ specific options and configuration: # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; @@ -184,4 +184,42 @@ in +
+ Updating an exporter module + + Should an exporter option change at some point, it is possible to add + information about the change to the exporter definition similar to + nixpkgs/nixos/modules/rename.nix: + +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.nginx; +in +{ + port = 9113; + extraOpts = { + # additional module options + # ... + }; + serviceOpts = { + # service configuration + # ... + }; + imports = [ + # 'services.prometheus.exporters.nginx.telemetryEndpoint' -> 'services.prometheus.exporters.nginx.telemetryPath' + (mkRenamedOptionModule [ "telemetryEndpoint" ] [ "telemetryPath" ]) + + # removed option 'services.prometheus.exporters.nginx.insecure' + (mkRemovedOptionModule [ "insecure" ] '' + This option was replaced by 'prometheus.exporters.nginx.sslVerify' which defaults to true. + '') + ({ options.warnings = options.warnings; }) + ]; +} + + +
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bind.nix b/nixos/modules/services/monitoring/prometheus/exporters/bind.nix index a9746c4d65d..7bcd03e0706 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/bind.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/bind.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix index d09d1c4f366..bf78cb15ad9 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index 0eba3527162..8c8ea08b5d4 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix index b1fab85109a..1b2ab93b302 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix index c47e87a3dc3..039242b730c 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix index 530206681d3..f2f7dcf06a8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/nixos/modules/services/monitoring/prometheus/exporters/json.nix index a5494e85e01..c0b677f2f62 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/json.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/json.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix index 3cc4ffdbc8f..2ecc62b0d79 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix index 431dd8b4ead..7d819b04ada 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; @@ -16,32 +16,40 @@ in Can be enabled with services.nginx.statusPage = true. ''; }; - telemetryEndpoint = mkOption { + telemetryPath = mkOption { type = types.str; default = "/metrics"; description = '' Path under which to expose metrics. ''; }; - insecure = mkOption { + sslVerify = mkOption { type = types.bool; default = true; description = '' - Ignore server certificate if using https. + Whether to perform certificate verification for https. ''; }; + }; serviceOpts = { serviceConfig = { DynamicUser = true; ExecStart = '' - ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \ - --nginx.scrape_uri '${cfg.scrapeUri}' \ - --telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ - --telemetry.endpoint ${cfg.telemetryEndpoint} \ - --insecure ${toString cfg.insecure} \ + ${pkgs.prometheus-nginx-exporter}/bin/nginx-prometheus-exporter \ + --nginx.scrape-uri '${cfg.scrapeUri}' \ + --nginx.ssl-verify ${toString cfg.sslVerify} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; }; + imports = [ + (mkRenamedOptionModule [ "telemetryEndpoint" ] [ "telemetryPath" ]) + (mkRemovedOptionModule [ "insecure" ] '' + This option was replaced by 'prometheus.exporters.nginx.sslVerify'. + '') + ({ options.warnings = options.warnings; }) + ]; } diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix index 8c4128f9b63..2477e69ea26 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix index efe78ebcba8..963fa759256 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix index 0d919412432..4361c3543ba 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix b/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix index 715dba06a3d..197a0a949e0 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix index e0ae8380242..4a59e83fc2e 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix index 011dcbe208e..696c2fe3535 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix index aaed76175b8..f38221527b3 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; @@ -68,7 +68,6 @@ in serviceOpts = { path = [ pkgs.varnish ]; serviceConfig = { - DynamicUser = true; RestartSec = mkDefault 1; ExecStart = '' ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix index eae7a61297d..5aed4a3a966 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 2097b9a3163..06af4dbcca4 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -33,7 +33,7 @@ let ${cfg.extraConfig} ${ concatMapStrings - ({ name, file, master ? true, slaves ? [], masters ? [] }: + ({ name, file, master ? true, slaves ? [], masters ? [], extraConfig ? "" }: '' zone "${name}" { type ${if master then "master" else "slave"}; @@ -52,6 +52,7 @@ let '' } allow-query { any; }; + ${extraConfig} }; '') cfg.zones } @@ -131,6 +132,7 @@ in file = "/var/dns/example.com"; masters = ["192.168.0.1"]; slaves = []; + extraConfig = ""; }]; }; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index d78a54a3327..8148139c3a8 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -291,7 +291,7 @@ in { group = mkOption { type = types.str; - default = "nogroup"; + default = defaultUser; description = '' Syncthing will be run under this group (group will not be created if it doesn't exist. This can be your user name). @@ -403,18 +403,12 @@ in { Group = cfg.group; ExecStartPre = mkIf (cfg.declarative.cert != null || cfg.declarative.key != null) "+${pkgs.writers.writeBash "syncthing-copy-keys" '' - mkdir -p ${cfg.configDir} - chown ${cfg.user}:${cfg.group} ${cfg.configDir} - chmod 700 ${cfg.configDir} + install -dm700 -o ${cfg.user} -g ${cfg.group} ${cfg.configDir} ${optionalString (cfg.declarative.cert != null) '' - cp ${toString cfg.declarative.cert} ${cfg.configDir}/cert.pem - chown ${cfg.user}:${cfg.group} ${cfg.configDir}/cert.pem - chmod 400 ${cfg.configDir}/cert.pem + install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.cert} ${cfg.configDir}/cert.pem ''} ${optionalString (cfg.declarative.key != null) '' - cp ${toString cfg.declarative.key} ${cfg.configDir}/key.pem - chown ${cfg.user}:${cfg.group} ${cfg.configDir}/key.pem - chmod 400 ${cfg.configDir}/key.pem + install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.key} ${cfg.configDir}/key.pem ''} ''}" ; diff --git a/nixos/modules/services/networking/thelounge.nix b/nixos/modules/services/networking/thelounge.nix new file mode 100644 index 00000000000..b1d23372955 --- /dev/null +++ b/nixos/modules/services/networking/thelounge.nix @@ -0,0 +1,75 @@ +{ pkgs, lib, config, ... }: + +with lib; + +let + cfg = config.services.thelounge; + dataDir = "/var/lib/thelounge"; + configJsData = "module.exports = " + builtins.toJSON ( + { private = cfg.private; port = cfg.port; } // cfg.extraConfig + ); +in { + options.services.thelounge = { + enable = mkEnableOption "The Lounge web IRC client"; + + private = mkOption { + type = types.bool; + default = false; + description = '' + Make your The Lounge instance private. You will need to configure user + accounts by using the (thelounge) command or by adding + entries in ${dataDir}/users. You might need to restart + The Lounge after making changes to the state directory. + ''; + }; + + port = mkOption { + type = types.port; + default = 9000; + description = "TCP port to listen on for http connections."; + }; + + extraConfig = mkOption { + default = {}; + type = types.attrs; + example = literalExample ''{ + reverseProxy = true; + defaults = { + name = "Your Network"; + host = "localhost"; + port = 6697; + }; + }''; + description = '' + The Lounge's config.js contents as attribute set (will be + converted to JSON to generate the configuration file). + + The options defined here will be merged to the default configuration file. + Note: In case of duplicate configuration, options from have priority. + + Documentation: + ''; + }; + }; + + config = mkIf cfg.enable { + users.users.thelounge = { + description = "thelounge service user"; + group = "thelounge"; + }; + users.groups.thelounge = {}; + systemd.services.thelounge = { + description = "The Lounge web IRC client"; + wantedBy = [ "multi-user.target" ]; + environment = { THELOUNGE_HOME = dataDir; }; + preStart = "ln -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js"; + serviceConfig = { + User = "thelounge"; + StateDirectory = baseNameOf dataDir; + ExecStart = "${pkgs.thelounge}/bin/thelounge start"; + }; + }; + + environment.systemPackages = [ pkgs.thelounge ]; + }; +} diff --git a/nixos/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf index 603a5d01acc..2b7523a7346 100644 --- a/nixos/modules/services/system/nscd.conf +++ b/nixos/modules/services/system/nscd.conf @@ -7,46 +7,28 @@ # is not aware of the path in which the nss modules live. As a workaround, we # have `enable-cache yes` with an explicit ttl of 0 server-user nscd -threads 1 -paranoia no -debug-level 0 enable-cache passwd yes positive-time-to-live passwd 0 negative-time-to-live passwd 0 -suggested-size passwd 211 -check-files passwd yes -persistent passwd no shared passwd yes enable-cache group yes positive-time-to-live group 0 negative-time-to-live group 0 -suggested-size group 211 -check-files group yes -persistent group no shared group yes enable-cache netgroup yes positive-time-to-live netgroup 0 negative-time-to-live netgroup 0 -suggested-size netgroup 211 -check-files netgroup yes -persistent netgroup no shared netgroup yes enable-cache hosts yes positive-time-to-live hosts 600 negative-time-to-live hosts 0 -suggested-size hosts 211 -check-files hosts yes -persistent hosts no shared hosts yes enable-cache services yes positive-time-to-live services 0 negative-time-to-live services 0 -suggested-size services 211 -check-files services yes -persistent services no shared services yes diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index fd1570d1198..e11f7e049d8 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -39,11 +39,6 @@ in config = mkIf cfg.enable { environment.etc."nscd.conf".text = cfg.config; - users.users.nscd = - { isSystemUser = true; - description = "Name service cache daemon user"; - }; - systemd.services.nscd = { description = "Name Service Cache Daemon"; @@ -51,22 +46,23 @@ in environment = { LD_LIBRARY_PATH = nssModulesPath; }; - preStart = - '' - mkdir -m 0755 -p /run/nscd - rm -f /run/nscd/nscd.pid - mkdir -m 0755 -p /var/db/nscd - ''; - restartTriggers = [ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source config.environment.etc."nscd.conf".source ]; + # We use DynamicUser because in default configurations nscd doesn't + # create any files that need to survive restarts. However, in some + # configurations, nscd needs to be started as root; it will drop + # privileges after all the NSS modules have read their configuration + # files. So prefix the ExecStart command with "!" to prevent systemd + # from dropping privileges early. See ExecStart in systemd.service(5). serviceConfig = - { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd"; + { ExecStart = "!@${pkgs.glibc.bin}/sbin/nscd nscd"; Type = "forking"; + DynamicUser = true; + RuntimeDirectory = "nscd"; PIDFile = "/run/nscd/nscd.pid"; Restart = "always"; ExecReload = @@ -75,15 +71,6 @@ in "${pkgs.glibc.bin}/sbin/nscd --invalidate hosts" ]; }; - - # Urgggggh... Nscd forks before opening its socket and writing - # its pid. So wait until it's ready. - postStart = - '' - while ! ${pkgs.glibc.bin}/sbin/nscd -g > /dev/null; do - sleep 0.2 - done - ''; }; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index fa9a36d1189..a0214a75d93 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -297,8 +297,23 @@ in { systemd.services = { "nextcloud-setup" = let + c = cfg.config; + writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]"; overrideConfig = pkgs.writeText "nextcloud-config.php" '' [ [ 'path' => '${cfg.home}/apps', 'url' => '/apps', 'writable' => false ], @@ -309,19 +324,27 @@ in { ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"} 'log_type' => 'syslog', 'log_level' => '${builtins.toString cfg.logLevel}', - ${optionalString (cfg.config.overwriteProtocol != null) "'overwriteprotocol' => '${cfg.config.overwriteProtocol}',"} + ${optionalString (c.overwriteProtocol != null) "'overwriteprotocol' => '${c.overwriteProtocol}',"} + ${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"} + ${optionalString (c.dbhost != null) "'dbhost' => '${c.dbhost}',"} + ${optionalString (c.dbport != null) "'dbport' => '${toString c.dbport}',"} + ${optionalString (c.dbuser != null) "'dbuser' => '${c.dbuser}',"} + ${optionalString (c.dbtableprefix != null) "'dbtableprefix' => '${toString c.dbtableprefix}',"} + ${optionalString (c.dbpass != null) "'dbpassword' => '${c.dbpass}',"} + ${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_pwd(),"} + 'dbtype' => '${c.dbtype}', + 'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)}, ]; ''; occInstallCmd = let - c = cfg.config; - adminpass = if c.adminpassFile != null - then ''"$(<"${toString c.adminpassFile}")"'' - else ''"${toString c.adminpass}"''; dbpass = if c.dbpassFile != null then ''"$(<"${toString c.dbpassFile}")"'' else if c.dbpass != null then ''"${toString c.dbpass}"'' else null; + adminpass = if c.adminpassFile != null + then ''"$(<"${toString c.adminpassFile}")"'' + else ''"${toString c.adminpass}"''; installFlags = concatStringsSep " \\\n " (mapAttrsToList (k: v: "${k} ${toString v}") { "--database" = ''"${c.dbtype}"''; diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index d78d866086a..d66e0f0c299 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -42,10 +42,12 @@ services.postgresql = { enable = true; - initialScript = pkgs.writeText "psql-init" '' - CREATE ROLE nextcloud WITH LOGIN; - CREATE DATABASE nextcloud WITH OWNER nextcloud; - ''; + ensureDatabases = [ "nextcloud" ]; + ensureUsers = [ + { name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + ]; }; # ensure that postgres is running *before* running the setup @@ -63,17 +65,22 @@ are used internally to configure an HTTP server using PHP-FPM and nginx. The config attribute set is - used for the config.php which is used for the - application's configuration. Beware: this isn't entirely pure - since the config is modified by the application's runtime! + used by the imperative installer and all values are written to an additional file + to ensure that changes can be applied by changing the module's options. - In case the application serves multiple hosts (those are checked with + In case the application serves multiple domains (those are checked with $_SERVER['HTTP_HOST']) - those can be added using + it's needed to add them to services.nextcloud.config.extraTrustedDomains. + + + Auto updates for Nextcloud apps can be enabled using + services.nextcloud.autoUpdateApps. + +
Pitfalls @@ -87,35 +94,24 @@ - Right now changes to the services.nextcloud.config - attribute set won't take effect after the first install (except - services.nextcloud.config.extraTrustedDomains) - since the actual configuration file is generated by the NextCloud installer - which also sets up critical parts such as the database structure. + All configuration parameters are also stored in + /var/lib/nextcloud/config/override.config.php which is generated by + the module and linked from the store to ensure that all values from config.php + can be modified by the module. + However config.php manages the application's state and shouldn't be touched + manually because of that. - - Warning: don't delete config.php! This file + + Don't delete config.php! This file tracks the application's state and a deletion can cause unwanted - side-effects! - + side-effects! + - - Warning: don't rerun nextcloud-occ + + Don't rerun nextcloud-occ maintenance:install! This command tries to install the application - and can cause unwanted side-effects! - - - - The issues are known and reported in - #49783, - for now it's unfortunately necessary to manually work around these issues. - - - - Right now app installation and configuration is done imperatively in the nextcloud web ui or via the nextcloud-occ command line utility. - You can activate auto updates for your apps via - services.nextcloud.autoUpdateApps. - + and can cause unwanted side-effects! +
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index bf99f6c132a..ea9476a7c91 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -21,10 +21,9 @@ let else [{ip = "*"; port = 80;}]; getListen = cfg: - let list = (lib.optional (cfg.port != 0) {ip = "*"; port = cfg.port;}) ++ cfg.listen; - in if list == [] - then defaultListen cfg - else list; + if cfg.listen == [] + then defaultListen cfg + else cfg.listen; listenToString = l: "${l.ip}:${toString l.port}"; @@ -638,7 +637,7 @@ in message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; } ]; - warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port};}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts); + warnings = map (cfg: "apache-httpd's extraSubservices option is deprecated. Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.") (lib.filter (cfg: cfg.extraSubservices != []) allHosts); users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton { name = "wwwrun"; @@ -672,7 +671,7 @@ in wantedBy = [ "multi-user.target" ]; wants = [ "keys.target" ]; - after = [ "network.target" "fs.target" "postgresql.service" "keys.target" ]; + after = [ "network.target" "fs.target" "keys.target" ]; path = [ httpd pkgs.coreutils pkgs.gnugrep ] diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix index 4bbd041b6e0..536e707137c 100644 --- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -24,14 +24,6 @@ with lib; ''; }; - port = mkOption { - type = types.int; - default = 0; - description = '' - Port for the server. Option will be removed, use instead. - ''; - }; - listen = mkOption { type = types.listOf (types.submodule ( { diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index d4357324c87..c02c9bfd94e 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -7,57 +7,35 @@ let cfg = config.services.compton; - literalAttrs = v: - if isString v then toString v - else if isAttrs v then "{\n" - + concatStringsSep "\n" (mapAttrsToList - (name: value: "${literalAttrs name} = ${literalAttrs value};") - v) - + "\n}" - else generators.toPretty {} v; + pairOf = x: with types; addCheck (listOf x) (y: length y == 2); floatBetween = a: b: with lib; with types; addCheck str (x: versionAtLeast x a && versionOlder x b); - pairOf = x: with types; addCheck (listOf x) (y: length y == 2); + toConf = attrs: concatStringsSep "\n" + (mapAttrsToList + (k: v: let + sep = if isAttrs v then ":" else "="; + # Basically a tinkered lib.generators.mkKeyValueDefault + mkValueString = v: + if isBool v then boolToString v + else if isInt v then toString v + else if isFloat v then toString v + else if isString v then ''"${escape [ ''"'' ] v}"'' + else if isList v then "[ " + + concatMapStringsSep " , " mkValueString v + + " ]" + else if isAttrs v then "{ " + + concatStringsSep " " + (mapAttrsToList + (key: value: "${toString key}=${mkValueString value};") + v) + + " }" + else abort "compton.mkValueString: unexpected type (v = ${v})"; + in "${escape [ sep ] k}${sep}${mkValueString v};") + attrs); - opacityRules = optionalString (length cfg.opacityRules != 0) - (concatMapStringsSep ",\n" (rule: ''"${rule}"'') cfg.opacityRules); - - configFile = pkgs.writeText "compton.conf" - (optionalString cfg.fade '' - # fading - fading = true; - fade-delta = ${toString cfg.fadeDelta}; - fade-in-step = ${elemAt cfg.fadeSteps 0}; - fade-out-step = ${elemAt cfg.fadeSteps 1}; - fade-exclude = ${toJSON cfg.fadeExclude}; - '' + optionalString cfg.shadow '' - - # shadows - shadow = true; - shadow-offset-x = ${toString (elemAt cfg.shadowOffsets 0)}; - shadow-offset-y = ${toString (elemAt cfg.shadowOffsets 1)}; - shadow-opacity = ${cfg.shadowOpacity}; - shadow-exclude = ${toJSON cfg.shadowExclude}; - '' + '' - - # opacity - active-opacity = ${cfg.activeOpacity}; - inactive-opacity = ${cfg.inactiveOpacity}; - - wintypes: - ${literalAttrs cfg.wintypes}; - - opacity-rule = [ - ${opacityRules} - ]; - - # other options - backend = ${toJSON cfg.backend}; - vsync = ${boolToString cfg.vSync}; - refresh-rate = ${toString cfg.refreshRate}; - '' + cfg.extraOptions); + configFile = pkgs.writeText "compton.conf" (toConf cfg.settings); in { @@ -236,23 +214,13 @@ in { ''; }; - package = mkOption { - type = types.package; - default = pkgs.compton; - defaultText = "pkgs.compton"; - example = literalExample "pkgs.compton"; - description = '' - Compton derivation to use. - ''; - }; - - extraOptions = mkOption { - type = types.lines; - default = ""; - example = '' - unredir-if-possible = true; - dbe = true; - ''; + settings = let + configTypes = with types; either bool (either int (either float str)); + # types.loaOf converts lists to sets + loaOf = t: with types; either (listOf t) (attrsOf t); + in mkOption { + type = loaOf (types.either configTypes (loaOf (types.either configTypes (loaOf configTypes)))); + default = {}; description = '' Additional Compton configuration. ''; @@ -260,6 +228,42 @@ in { }; config = mkIf cfg.enable { + services.compton.settings = let + # Hard conversion to float, literally lib.toInt but toFloat + toFloat = str: let + may_be_float = builtins.fromJSON str; + in if builtins.isFloat may_be_float + then may_be_float + else throw "Could not convert ${str} to float."; + in { + # fading + fading = mkDefault cfg.fade; + fade-delta = mkDefault cfg.fadeDelta; + fade-in-step = mkDefault (toFloat (elemAt cfg.fadeSteps 0)); + fade-out-step = mkDefault (toFloat (elemAt cfg.fadeSteps 1)); + fade-exclude = mkDefault cfg.fadeExclude; + + # shadows + shadow = mkDefault cfg.shadow; + shadow-offset-x = mkDefault (elemAt cfg.shadowOffsets 0); + shadow-offset-y = mkDefault (elemAt cfg.shadowOffsets 1); + shadow-opacity = mkDefault (toFloat cfg.shadowOpacity); + shadow-exclude = mkDefault cfg.shadowExclude; + + # opacity + active-opacity = mkDefault (toFloat cfg.activeOpacity); + inactive-opacity = mkDefault (toFloat cfg.inactiveOpacity); + + wintypes = mkDefault cfg.wintypes; + + opacity-rule = mkDefault cfg.opacityRules; + + # other options + backend = mkDefault cfg.backend; + vsync = mkDefault cfg.vSync; + refresh-rate = mkDefault cfg.refreshRate; + }; + systemd.user.services.compton = { description = "Compton composite manager"; wantedBy = [ "graphical-session.target" ]; @@ -271,13 +275,13 @@ in { }; serviceConfig = { - ExecStart = "${cfg.package}/bin/compton --config ${configFile}"; + ExecStart = "${pkgs.compton}/bin/compton --config ${configFile}"; RestartSec = 3; Restart = "always"; }; }; - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ pkgs.compton ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index c0eae1eb8d4..41903b33fae 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -145,8 +145,6 @@ in isSystem = true; }; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - networking.networkmanager.enable = mkDefault true; networking.networkmanager.basePackages = { inherit (pkgs) networkmanager modemmanager wpa_supplicant; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 910a602c61d..22d459ceb04 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -22,7 +22,9 @@ let editor = if cfg.editor then "True" else "False"; - inherit (cfg) consoleMode configurationLimit; + configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; + + inherit (cfg) consoleMode; inherit (efi) efiSysMountPoint canTouchEfiVariables; @@ -58,12 +60,15 @@ in { }; configurationLimit = mkOption { - default = 100; + default = null; example = 120; - type = types.int; + type = types.nullOr types.int; description = '' - Maximum of configurations in boot menu. Otherwise boot partition could - run out of disk space. + Maximum number of latest generations in the boot menu. + Useful to prevent boot partition running out of disk space. + + null means no limit i.e. all generations + that were not garbage collected yet. ''; }; diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 0351d4db69a..8a840a60875 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -27,10 +27,7 @@ in { dbtype = "pgsql"; dbname = "nextcloud"; dbuser = "nextcloud"; - dbhost = "localhost"; - dbpassFile = toString (pkgs.writeText "db-pass-file" '' - hunter2 - ''); + dbhost = "/run/postgresql"; inherit adminuser; adminpassFile = toString (pkgs.writeText "admin-pass-file" '' ${adminpass} @@ -84,10 +81,12 @@ in { services.postgresql = { enable = true; - initialScript = pkgs.writeText "psql-init" '' - create role nextcloud with login password 'hunter2'; - create database nextcloud with owner nextcloud; - ''; + ensureDatabases = [ "nextcloud" ]; + ensureUsers = [ + { name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + ]; }; }; }; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 9a85501d15f..2286d70be28 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -3,10 +3,11 @@ , pkgs ? import ../.. { inherit system config; } }: -with pkgs.lib; -with import ../lib/testing.nix { inherit system pkgs; }; - let + inherit (import ../lib/testing.nix { inherit system pkgs; }) makeTest; + inherit (pkgs.lib) concatStringsSep maintainers mapAttrs mkMerge + removeSuffix replaceChars singleton splitString; + escape' = str: replaceChars [''"'' "$" "\n"] [''\\\"'' "\\$" ""] str; /* @@ -73,7 +74,7 @@ let exporterTest = '' waitForUnit("prometheus-bind-exporter.service"); waitForOpenPort(9119); - succeed("curl -sSf http://localhost:9119/metrics" | grep -q 'bind_query_recursions_total 0'); + succeed("curl -sSf http://localhost:9119/metrics | grep -q 'bind_query_recursions_total 0'"); ''; }; @@ -311,6 +312,7 @@ let }; exporterTest = '' waitForUnit("prometheus-varnish-exporter.service"); + waitForOpenPort(6081); waitForOpenPort(9131); succeed("curl -sSf http://localhost:9131/metrics | grep -q 'varnish_up 1'"); ''; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 23eb9033ed1..5293c1eefa3 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -65,6 +65,8 @@ rec { }; litecoind = litecoin.override { withGui = false; }; + lnd = callPackage ./lnd.nix { }; + masari = callPackage ./masari.nix { boost = boost165; }; memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; }; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index cf0261e01c4..9ef348abc50 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-ethereum"; - version = "1.9.0"; + version = "1.9.1"; goPackagePath = "github.com/ethereum/go-ethereum"; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "03gkrvps1syvyjna7769n4j3mlpxcgdj461gzds2l90k02ajvh7x"; + sha256 = "05vnjdjwahdp2j7c6g81jchpdhxmdpbr20mjzpszylp9824v4cba"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/altcoins/lnd.nix b/pkgs/applications/altcoins/lnd.nix new file mode 100644 index 00000000000..7fcaca487b1 --- /dev/null +++ b/pkgs/applications/altcoins/lnd.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "lnd"; + version = "0.7.0-beta"; + + src = fetchFromGitHub { + owner = "lightningnetwork"; + repo = "lnd"; + rev = "v${version}"; + sha256 = "0d6m1vfy33rg6d7qmkpydiypav1girxsnxan9njyjz0vhinmq0sx"; + }; + + modSha256 = "0akxi7xhyz7xx0vc003abidva02sp940cc2gfjg4fmzkc95cajc9"; + + meta = with lib; { + description = "Lightning Network Daemon"; + homepage = "https://github.com/lightningnetwork/lnd"; + license = lib.licenses.mit; + maintainers = with maintainers; [ cypherpunk2140 ]; + }; +} diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix new file mode 100644 index 00000000000..45054764a10 --- /dev/null +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -0,0 +1,16 @@ +{ fetchurl, bitwig-studio1, + pulseaudio }: + +bitwig-studio1.overrideAttrs (oldAttrs: rec { + name = "bitwig-studio-${version}"; + version = "3.0"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; + sha256 = "0p7wi1srfzalb0rl94vqppfbnxdfwqzgg5blkdwkf4sx977aihpv"; + }; + + runtimeDependencies = [ + pulseaudio + ]; +}) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 22613da7cab..f8e1db4814c 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "010p8nwnmqgj5mw324psig3hxi1g2gylxrigd6sj6sgcpy3kdm23"; + sha256 = "02sa29fdjgwcf7izly685gxvga3bxyyqvskvfiisgm2xg3h9r983"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix new file mode 100644 index 00000000000..bfd211316a7 --- /dev/null +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub +, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 +, pkgconfig, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "helio-workstation"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "helio-fm"; + repo = pname; + rev = version; + fetchSubmodules = true; + sha256 = "16iwj4mjs1nm8dlk70q97svp3vkcgs7hdj9hfda9h67acn4a8vvk"; + }; + + buildInputs = [ + alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr + xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity + ]; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + preBuild = "cd Projects/LinuxMakefile"; + buildFlags = [ "CONFIG=Release64" ]; + + installPhase = '' + mkdir -p $out/bin + install -Dm755 build/Helio $out/bin + wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome3.zenity}/bin + + mkdir -p $out/share + cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share + substituteInPlace $out/share/applications/Helio.desktop \ + --replace "/usr/bin/helio" "$out/bin/Helio" + ''; + + meta = with stdenv.lib; { + description = "One music sequencer for all major platforms, both desktop and mobile"; + homepage = https://helio.fm/; + license = licenses.gpl3; + maintainers = [ maintainers.suhr ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix new file mode 100644 index 00000000000..5e8dc060c28 --- /dev/null +++ b/pkgs/applications/audio/klystrack/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, SDL2, SDL2_image +, pkgconfig +}: + +stdenv.mkDerivation rec { + pname = "klystrack"; + version = "1.7.6"; + + src = fetchFromGitHub { + owner = "kometbomb"; + repo = pname; + rev = version; + fetchSubmodules = true; + sha256 = "1h99sm2ddaq483hhk2s3z4bjbgn0d2h7qna7l7qq98wvhqix8iyz"; + }; + + buildInputs = [ + SDL2 SDL2_image + ]; + nativeBuildInputs = [ pkgconfig ]; + + patches = [ + (fetchpatch { + url = "https://github.com/kometbomb/klystrack/commit/bb537595d02140176831c4a1b8e9121978b32d22.patch"; + sha256 = "06gl9q0jwg039kpxb13lg9x0k59s11968qn4lybgkadvzmhxkgmi"; + }) + ]; + + buildFlags = [ "PREFIX=${placeholder "out"}" "CFG=release" ]; + + installPhase = '' + install -Dm755 bin.release/klystrack $out/bin/klystrack + + mkdir -p $out/lib/klystrack + cp -R res $out/lib/klystrack + cp -R key $out/lib/klystrack + + install -DT icon/256x256.png $out/share/icons/hicolor/256x256/apps/klystrack.png + mkdir -p $out/share/applications + substitute linux/klystrack.desktop $out/share/applications/klystrack.desktop \ + --replace "klystrack %f" "$out/bin/klystrack %f" + ''; + + meta = with stdenv.lib; { + description = "A chiptune tracker"; + homepage = "https://kometbomb.github.io/klystrack"; + license = licenses.mit; + maintainers = with maintainers; [ suhr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 0c1d91254da..2e4658a68c9 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "5.979"; + version = "5.980"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "0v9i7wgl68clwlw5k6rwligk3b3bl6c8xxabklglbxnx5i6iw5ia"; + sha256 = "0ij5cx43gf05q0d57p4slsp7wkq2cdb3ymh2n5iqgqjl9rf26h1q"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 9627e35454e..a8896f3945b 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-19.4"; + name = "snd-19.5"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1g96r1js9rfxxczpaa1ggrz7i1zsj4px4fyz64kbqawzsn9xapg9"; + sha256 = "0sk6iyykwi2mm3f1g4r0iqbsrwk3zmyagp6jjqkh8njbq42cjr1y"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix new file mode 100644 index 00000000000..5f064cf4e88 --- /dev/null +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl +, withALSA ? true, alsaLib ? null +, withPulseAudio ? false, libpulseaudio ? null +, withPortAudio ? false, portaudio ? null +}: + +rustPlatform.buildRustPackage rec { + pname = "spotifyd"; + version = "0.2.11"; + + src = fetchFromGitHub { + owner = "Spotifyd"; + repo = "spotifyd"; + rev = "${version}"; + sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1"; + }; + + cargoSha256 = "0879p1h32259schmy8j3xnwpw3sw80f8mrj8s6b5aihi3yyzz521"; + + cargoBuildFlags = [ + "--no-default-features" + "--features" + "${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}" + ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optional withALSA alsaLib + ++ stdenv.lib.optional withPulseAudio libpulseaudio + ++ stdenv.lib.optional withPortAudio portaudio; + + meta = with stdenv.lib; { + description = "An open source Spotify client running as a UNIX daemon"; + homepage = "https://github.com/Spotifyd/spotifyd"; + license = with licenses; [ gpl3 ]; + maintainers = [ maintainers.anderslundstedt ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile b/pkgs/applications/audio/tree-from-tags/Gemfile new file mode 100644 index 00000000000..24f308f3f42 --- /dev/null +++ b/pkgs/applications/audio/tree-from-tags/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "taglib-ruby" diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile.lock b/pkgs/applications/audio/tree-from-tags/Gemfile.lock new file mode 100644 index 00000000000..2ef77caa6f6 --- /dev/null +++ b/pkgs/applications/audio/tree-from-tags/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + taglib-ruby (0.7.1) + +PLATFORMS + ruby + +DEPENDENCIES + taglib-ruby + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix new file mode 100644 index 00000000000..cdee979768c --- /dev/null +++ b/pkgs/applications/audio/tree-from-tags/default.nix @@ -0,0 +1,37 @@ +{ stdenv, bundlerEnv, ruby, fetchFromGitHub }: +let + version = "1.1"; + gems = bundlerEnv { + name = "tree-from-tags-${version}-gems"; + inherit ruby; + gemdir = ./.; + }; +in stdenv.mkDerivation { + name = "tree-from-tags-${version}"; + src = fetchFromGitHub { + owner = "dbrock"; + repo = "bongo"; + rev = version; + sha256 = "1nszph9mn98flyhn1jq3y6mdh6jymjkvj5ng36ql016dj92apvhv"; + }; + buildInputs = [ gems ruby ]; + installPhase = '' + mkdir -p $out/{bin,share} + cp tree-from-tags.rb $out/share/ + bin=$out/bin/tree-from-tags +# we are using bundle exec to start in the bundled environment + cat > $bin <> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js + asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked + cat <> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js + var fs = require('fs'); document.addEventListener('DOMContentLoaded', function() { - let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}" fs.readFile('${theme}/theme.css', 'utf8', function(err, css) { - \$("").appendTo('head').html(css + tt__customCss); - \$("").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}'); - \$("").appendTo('head').html('.p-channel_sidebar {background: #363636 !important}'); - \$("").appendTo('head').html('#client_body:not(.onboarding):not(.feature_global_nav_layout):before {background: inherit;}'); + let s = document.createElement('style'); + s.type = 'text/css'; + s.innerHTML = css; + document.head.appendChild(s); }); }); EOF + asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 40d23112369..21a98676290 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,13 +1,10 @@ -{ stdenv, fetchurl, makeWrapper, autoPatchelfHook }: +{ stdenv, fetchurl, autoPatchelfHook }: let - version = "3.8.0"; arch = if stdenv.is64bit then "amd64" else "x86"; - libDir = if stdenv.is64bit then "lib64" else "lib"; -in - -stdenv.mkDerivation { - name = "teamspeak-server-${version}"; +in stdenv.mkDerivation rec { + pname = "teamspeak-server"; + version = "3.8.0"; src = fetchurl { urls = [ @@ -19,10 +16,10 @@ stdenv.mkDerivation { else "0p5rqwdsvbria5dzjjm5mj8vfy0zpfs669wpbwxd4g3n4vh03kyw"; }; - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc ]; + nativeBuildInputs = [ autoPatchelfHook ]; + installPhase = '' # Install files. mkdir -p $out/lib/teamspeak diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 807b8116b46..c685a270586 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, full -, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem }: +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full +, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem, mkDerivation }: let - version = "1.1.5-1"; + version = "1.1.6-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -20,16 +20,15 @@ let genericName = "ProtonMail Bridge for Linux"; categories = "Utility;Security;Network;Email"; }; -in stdenv.mkDerivation rec { + +in mkDerivation rec { name = "protonmail-bridge-${version}"; src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "1y5mphrs60zd6km9z64vskk70q9zzw4g6js7qvgl572wv81w2l75"; + sha256 = "108dql9q5znsqjkrs41pc6psjbg5bz09rdmjl036xxbvsdvq4a8r"; }; - nativeBuildInputs = [ wrapQtAppsHook ]; - sourceRoot = "."; unpackCmd = '' @@ -51,6 +50,8 @@ in stdenv.mkDerivation rec { rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib qtbase + qtquickcontrols2 + qtgraphicaleffects qtmultimedia qtsvg qtdeclarative @@ -67,6 +68,8 @@ in stdenv.mkDerivation rec { $out/lib/protonmail-bridge ''; + buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]; + meta = with stdenv.lib; { homepage = "https://www.protonmail.com/bridge"; license = licenses.mit; diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index 4598903d201..745ad7a9c5d 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -22,22 +22,11 @@ , fontconfig , gtk_engines , alsaLib -, libidn , zlib -, version ? "19.3.0" +, version ? "19.6.0" }: let - # In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12. - # Citrix looks for the former so we build version 1.34 to please the binary - libidn_134 = libidn.overrideDerivation (_: rec { - name = "libidn-1.34"; - src = fetchurl { - url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; - }; - }); - versionInfo = let supportedVersions = { "19.3.0" = { @@ -48,13 +37,27 @@ let x86hash = "1hxgj5lk5ghbpssbqjd404qr84gls967vwrh8ww5hg3pn86kyf8w"; x64suffix = "5"; x86suffix = "5"; + homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1903.html; + }; + + "19.6.0" = { + major = "19"; + minor = "6"; + patch = "0"; + x64hash = "0szqlfmigzgf0309i6ikxkizxaf4ri7qmhys75m0zi3bpwx6hzhs"; + x86hash = "16v3kgavrh62z6vxcbw6mn7h0bfishpl7m92k7g1p2882r1f8vaf"; + x64suffix = "60"; + x86suffix = "60"; homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html; }; }; # Copied this file largely from the citrix-receiver package # Leaving this here even though there are no deprecations yet - # for ease of future maintenance + # for ease of future maintenance. + # + # The lifespans of Citrix products can be found here: + # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html deprecatedVersions = let versions = [ ]; in @@ -117,7 +120,6 @@ let xorg.libXinerama xorg.libXfixes libpng12 - libidn_134 zlib gtk_engines freetype @@ -208,6 +210,7 @@ let inherit homepage; description = "Citrix Workspace"; platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; }; }; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index d97f376b9a2..949c85bf942 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "14.3.4730"; + version = "14.4.2669"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; - sha256 = "1k3vrkgkdh5wvws7xajgjvsqnmig64gnmf75sy7qq6lrpgp5l3nf"; + sha256 = "0vk782xpp8plbaz8cfggp0jrw7n8d5p9lv605pzmgxyq5h8z72za"; }; unpackPhase = '' diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 69fb5462ded..02fbf92acbb 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qownnotes"; - version = "19.6.1"; + version = "19.7.3"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "0m56klcs1bq5xhbn2kmlzv8nalscxw6wimrmqjmharif97cyddc6"; + sha256 = "1d4an3yzr77c6pz5cv1vbsrl2v5r62qdckk3l5y5dcv7jikb1l8l"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 6cbdea8c686..7e132efefbb 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -5,7 +5,7 @@ , glog , gmock , openssl -, google-gflags +, gflags , gnuradio , orc , pkgconfig @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { glog gmock openssl.dev - google-gflags + gflags gnuradio orc pkgconfig @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; cmakeFlags = [ - "-DGFlags_ROOT_DIR=${google-gflags}/lib" + "-DGFlags_ROOT_DIR=${gflags}/lib" "-DGLOG_INCLUDE_DIR=${glog}/include" "-DENABLE_UNIT_TESTING=OFF" diff --git a/pkgs/applications/science/biology/est-sfs/default.nix b/pkgs/applications/science/biology/est-sfs/default.nix new file mode 100644 index 00000000000..dcc72523355 --- /dev/null +++ b/pkgs/applications/science/biology/est-sfs/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, gsl }: + +stdenv.mkDerivation rec { + pname = "est-sfs"; + version = "2.03"; + + src = fetchurl { + url = "mirror://sourceforge/est-usfs/${pname}-release-${version}.tar.gz"; + sha256 = "1hvamrgagz0xi89w8qafyd9mjrdpyika8zm22drddnjkp4sdj65n"; + }; + + buildInputs = [ gsl ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/doc/${pname} + cp est-sfs $out/bin + cp est-sfs-documentation.pdf $out/share/doc/${pname} + ''; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/projects/est-usfs; + description = "Estimate the unfolded site frequency spectrum and ancestral states"; + license = licenses.gpl3; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index cd8a3747bea..09801f54e7e 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cryptoverif-${version}"; - version = "2.01"; + version = "2.01pl1"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "122pryci8rsdzv9qszw11g3izh78r2lvd1raahv2j7qmvgi76nab"; + sha256 = "1bkmrv3wsy8mwhrxd3z3br9zgv37c2w6443rm4s9jl0aphcgnbiw"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 153ebaa441f..e8171bcb256 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -3,7 +3,7 @@ , fetchurl , cmake , boost -, google-gflags +, gflags , glog , hdf5-cpp , opencv3 @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost google-gflags glog protobuf hdf5-cpp opencv3 openblas ] + buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 openblas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn ++ lib.optional lmdbSupport lmdb diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix new file mode 100644 index 00000000000..521cb70099b --- /dev/null +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -0,0 +1,150 @@ +{ stdenv +, coreutils +, patchelf +, requireFile +, callPackage +, alsaLib +, dbus +, fontconfig +, freetype +, gcc +, glib +, ncurses +, opencv +, openssl +, unixODBC +, xkeyboard_config +, xorg +, zlib +, libxml2 +, libuuid +, lang ? "en" +, libGL +, libGLU +}: + +let + l10n = + import ./l10ns.nix { + lib = stdenv.lib; + inherit requireFile lang; + majorVersion = "11"; + }; +in +stdenv.mkDerivation rec { + inherit (l10n) version name src; + + buildInputs = [ + coreutils + patchelf + alsaLib + coreutils + dbus + fontconfig + freetype + gcc.cc + gcc.libc + glib + ncurses + opencv + openssl + unixODBC + xkeyboard_config + libxml2 + libuuid + zlib + libGL + libGLU + ] ++ (with xorg; [ + libX11 + libXext + libXtst + libXi + libXmu + libXrender + libxcb + libXcursor + libXfixes + libXrandr + libICE + libSM + ]); + + ldpath = stdenv.lib.makeLibraryPath buildInputs + + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + + phases = "unpackPhase installPhase fixupPhase"; + + unpackPhase = '' + echo "=== Extracting makeself archive ===" + # find offset from file + offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) + dd if="$src" ibs=$offset skip=1 | tar -xf - + cd Unix + ''; + + installPhase = '' + cd Installer + # don't restrict PATH, that has already been done + sed -i -e 's/^PATH=/# PATH=/' MathInstaller + sed -i -e 's/\/bin\/bash/\/bin\/sh/' MathInstaller + + echo "=== Running MathInstaller ===" + ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent + + # Fix library paths + cd $out/libexec/Mathematica/Executables + for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do + sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path + done + + # Fix xkeyboard config path for Qt + for path in mathematica Mathematica; do + line=$(grep -n QT_PLUGIN_PATH $path | sed 's/:.*//') + sed -i -e "$line iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"" $path + done + ''; + + preFixup = '' + echo "=== PatchElfing away ===" + # This code should be a bit forgiving of errors, unfortunately + set +e + find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do + type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') + if [ -z "$type" ]; then + : + elif [ "$type" == "EXEC" ]; then + echo "patching $f executable <<" + patchelf --shrink-rpath "$f" + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ + "$f" \ + && patchelf --shrink-rpath "$f" \ + || echo unable to patch ... ignoring 1>&2 + elif [ "$type" == "DYN" ]; then + echo "patching $f library <<" + patchelf \ + --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ + "$f" \ + && patchelf --shrink-rpath "$f" \ + || echo unable to patch ... ignoring 1>&2 + else + echo "not patching $f <<: unknown elf type" + fi + done + ''; + + # all binaries are already stripped + dontStrip = true; + + # we did this in prefixup already + dontPatchELF = true; + + meta = { + description = "Wolfram Mathematica computational software system"; + homepage = http://www.wolfram.com/mathematica/; + license = stdenv.lib.licenses.unfree; + }; +} diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 165a5660557..ca9a87abe13 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -1,6 +1,7 @@ { stdenv , coreutils , patchelf +, requireFile , callPackage , alsaLib , dbus @@ -24,10 +25,10 @@ let l10n = - with stdenv.lib; - with callPackage ./l10ns.nix {}; - flip (findFirst (l: l.lang == lang)) l10ns - (throw "Language '${lang}' not supported"); + import ./l10ns.nix { + lib = stdenv.lib; + inherit requireFile lang; + }; in stdenv.mkDerivation rec { inherit (l10n) version name src; @@ -72,8 +73,6 @@ stdenv.mkDerivation rec { + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); - phases = "unpackPhase installPhase fixupPhase"; - unpackPhase = '' echo "=== Extracting makeself archive ===" # find offset from file @@ -99,8 +98,7 @@ stdenv.mkDerivation rec { # Fix xkeyboard config path for Qt for path in mathematica Mathematica; do - line=$(grep -n QT_PLUGIN_PATH $path | sed 's/:.*//') - sed -i -e "$line iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"" $path + sed -i -e "2iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"\n" $path done ''; @@ -134,15 +132,19 @@ stdenv.mkDerivation rec { done ''; + dontBuild = true; + # all binaries are already stripped dontStrip = true; # we did this in prefixup already dontPatchELF = true; - meta = { + meta = with stdenv.lib; { description = "Wolfram Mathematica computational software system"; homepage = http://www.wolfram.com/mathematica/; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; + maintainers = with maintainers; [ herberteuler ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 065360a112d..51fb489be7e 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -1,9 +1,18 @@ -{ lib, requireFile }: +{ lib +, requireFile +, lang +, majorVersion ? null +}: -with lib; -{ - l10ns = flip map +let allVersions = with lib; flip map + # N.B. Versions in this list should be ordered from newest to oldest. [ + { + version = "12.0.0"; + lang = "en"; + language = "English"; + sha256 = "b9fb71e1afcc1d72c200196ffa434512d208fa2920e207878433f504e58ae9d7"; + } { version = "11.3.0"; lang = "en"; @@ -30,4 +39,16 @@ with lib; inherit sha256; }; }); -} +minVersion = + with lib; + if majorVersion == null + then elemAt (builtins.splitVersion (elemAt allVersions 0).version) 0 + else majorVersion; +maxVersion = toString (1 + builtins.fromJSON minVersion); +in +with lib; +findFirst (l: (l.lang == lang + && l.version >= minVersion + && l.version < maxVersion)) + (throw "Version ${minVersion} in language ${lang} not supported") + allVersions diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 262ee7d0d5d..21ce53e70c5 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -3,7 +3,7 @@ let name = "scilab-bin-${ver}"; - ver = "6.0.1"; + ver = "6.0.2"; badArch = throw "${name} requires i686-linux or x86_64-linux"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.system == "i686-linux" then "0fgjc2ak3b2qi6yin3fy50qwk2bcj0zbz1h4lyyic9n1n1qcliib" else if stdenv.hostPlatform.system == "x86_64-linux" then - "1scswlznc14vyzg0gqa1q9gcpwx05kz1sbn563463mzkdp7nd35d" + "05clcdgry90drirl3swbxn5q36fmgknnhs6h5pr7mmrzfr6r818w" else badArch; }; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index f44d07d36db..43d57feab71 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake , eigen, opencv, ceres-solver, cgal, boost, vcg -, gmp, mpfr, glog, google-gflags, libjpeg_turbo }: +, gmp, mpfr, glog, gflags, libjpeg_turbo }: stdenv.mkDerivation rec { name = "openmvs-unstable-2018-05-26"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "12dgkwwfdp24581y3i41gsd1k9hq0aw917q0ja5s0if4qbmc8pni"; }; - buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog google-gflags libjpeg_turbo ]; + buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog gflags libjpeg_turbo ]; nativeBuildInputs = [ cmake pkgconfig ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "-DCERES_DIR=${ceres-solver}/lib/cmake/Ceres/" ) ''; - + postFixup = '' rp=$(patchelf --print-rpath $out/bin/DensifyPointCloud) patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/DensifyPointCloud @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { rp=$(patchelf --print-rpath $out/bin/TextureMesh) patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/TextureMesh ''; - + cmakeDir = "./"; dontUseCmakeBuildDir = true; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 2a76cf487b0..b6a6ebde540 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -15,12 +15,12 @@ let in python3Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "2.2.0"; + version = "2.2.1"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "0186c2fjqm3wdr3wik4fcyl5l3gv5j6sxn18d0vclw83w4yrhjz9"; + sha256 = "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 94682893d51..59d64210837 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }: stdenv.mkDerivation rec { name = "x11docker-${version}"; - version = "5.4.4"; + version = "6.0.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "1p45dyd1zfjxlawsy190q71hwl083f90ryaslslhxsadsi9m64dq"; + sha256 = "1sfdxlh50hv8j3dj5bphihqdyf8s7ixm6ckrmvqgr2y3gak1y840"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ nx-libs xorg.xhost xorg.xinit ]; diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index e729f786a56..843c331f91c 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45 +{ stdenv, lib, fetchFromGitHub, pkgconfig, uthash, asciidoc, docbook_xml_dtd_45 , docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja , xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev , dbus, libconfig, libdrm, libGL, pcre, libX11 , libXinerama, libXext, xwininfo, libxdg_basedir }: stdenv.mkDerivation rec { pname = "compton"; - version = "6.2"; + version = "7"; COMPTON_VERSION = "v${version}"; @@ -13,12 +13,14 @@ stdenv.mkDerivation rec { owner = "yshui"; repo = "compton"; rev = COMPTON_VERSION; - sha256 = "03fi9q8zw2qrwpkmy1bnavgfh91ci9in5fdi17g4s5s0n2l7yil7"; + sha256 = "0f23dv2p1snlpzc91v38q6896ncz4zqzmh2d97yf66j78g21awas"; + fetchSubmodules = true; }; nativeBuildInputs = [ meson ninja pkgconfig + uthash asciidoc docbook_xml_dtd_45 docbook_xsl @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { ]; preBuild = '' - git() { echo "v${version}"; } + git() { echo "$COMPTON_VERSION"; } export -f git ''; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 207f3615d1b..d743d2ccbd4 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -2,19 +2,15 @@ stdenv.mkDerivation rec { name = "google-fonts-${version}"; - version = "2018-07-13"; + version = "2019-07-14"; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "3ca591dae7372a26e254ec6d22e7b453813b9530"; - sha256 = "01ak3dzw2kihwa0dy27x8vvpiscd66mnkf61vj1xn29m4g48y0lr"; + rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a"; + sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs"; }; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1pzm26794nwdbsvjnczpfchxiqa1n1zhp517g6g39wfm1nfszz83"; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; patchPhase = '' @@ -29,6 +25,13 @@ stdenv.mkDerivation rec { ofl/siamreap \ ofl/terminaldosislight + # See comment above, the structure of these is a bit odd + # We keep the ofl//static/ variants + rm -rv ofl/comfortaa/*.ttf \ + ofl/mavenpro/*.ttf \ + ofl/muli/*.ttf \ + ofl/oswald/*.ttf + if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then echo "error: duplicate font names" exit 1 diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 621506653d6..2061fc26607 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.32.3"; + version = "3.32.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ghwi4mmx6l28dkjx7ayiqcrvmfakqfiyvdg6946v5dcimgsclxn"; + sha256 = "00hmmg4hfns8rq9rcilmy0gi1xkksld27lfbd9zmw2xw37wjmbqh"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 388808b7d64..f776f4dbe5a 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -1,30 +1,86 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3, - wrapGAppsHook }: +{ stdenv +, fetchurl +, fetchpatch +, pkgconfig +, meson +, ninja +, python3 +, gnome3 +, hicolor-icon-theme +, desktop-file-utils +, appstream-glib +, gettext +, itstool +, libxml2 +, gtk3 +, glib +, atk +, wrapGAppsHook +}: stdenv.mkDerivation rec { - name = "ghex-${version}"; - version = "3.18.3"; + pname = "ghex"; + version = "3.18.4"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/ghex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; + url = "mirror://gnome/sources/ghex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ + desktop-file-utils + gettext + hicolor-icon-theme # for setup-hook + itstool + meson + ninja + pkgconfig + python3 + wrapGAppsHook + ]; - buildInputs = [ gtk3 intltool itstool libxml2 ]; + buildInputs = [ + gtk3 + atk + glib + ]; + + checkInputs = [ + appstream-glib + desktop-file-utils + ]; + + patches = [ + # Fixes for darwin. Drop in next release. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/ghex/commit/b0af26666cd990d99076c242b2abb3efc6e98671.patch"; + sha256 = "1zwdkgr2nqrn9q3ydyvrrpn5x55cdi747fhbq6mh6blp9cbrk9b5"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/ghex/commit/cc8ef9e67b23604c402460010dc0b5dccb85391b.patch"; + sha256 = "0j2165rfhlbrlzhmcnirqd5m89ljpz0n3nz20sxbwlc8h42zv36s"; + }) + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; passthru = { updateScript = gnome3.updateScript { packageName = "ghex"; - attrPath = "gnome3.ghex"; + attrPath = "gnome3.${pname}"; }; }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Ghex; description = "Hex editor for GNOME desktop environment"; - platforms = platforms.linux; + platforms = platforms.unix; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 3a28b8635a1..2941d629f8f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -5,13 +5,13 @@ , gnome3, libxml2, gsettings-desktop-schemas }: let - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "gnome-notes-${version}"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "02b7afg3ps0hxp5dkb4kv6315ydc2r6bxgk1kamwp581lc7ghd67"; + sha256 = "0chm2fks7cpx3mycxzddpj6v9by203c3m1y6zns5ra43bspwafy2"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 8075d5d4805..5c2eae883cf 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.32.3"; + version = "3.32.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1sx2ywvvwbmphrlqq62srd235ihsj8864d9g8kcbcxwrvn2z70b4"; + sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index d9f93862143..1a8582626e3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; - version = "3.32.2"; + version = "3.32.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1ny7cwkyskrykzsrabjnlc9jsdl4kdk73smwxas6ddmca02hpm7c"; + sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index 2e8c3c4a003..118a910a168 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.8"; + version = "0.3.9"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nync07gah3jkpb5ph5d3gwbygmabnih2m3hfz7lkvjl2l5pgpac"; + sha256 = "1hv84b56qjic8vz8iz46ikhrxx31l29ilbr8dm5qcghbd8ikw8j1"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix index a2bee6ac41e..33293f0b3cb 100644 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43 +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, fetchpatch , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: let pname = "grilo"; - version = "0.3.7"; # if you change minor, also change ./setup-hook.sh + version = "0.3.9"; # if you change minor, also change ./setup-hook.sh in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,23 +13,32 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1dz965l743r4bhj78wij9k1mb6635gnkb1lnk9j7gw9dd5qsyfza"; + sha256 = "1wnabc69730jsv8dljj5ik8g7p581nw60mw1mkgamkzjcb6821bk"; }; - patches = [ - # Fix meson build: https://gitlab.gnome.org/GNOME/grilo/merge_requests/34 - (fetchurl { - url = "https://gitlab.gnome.org/GNOME/grilo/commit/166612aeff09e5fc2fec1f62185c84cbdcf8f889.diff"; - sha256 = "07zamy927iaa7knrwq5yxz7ypl1i02pymkcdrg5l55alhdvb81pw"; - }) - ]; - setupHook = ./setup-hook.sh; mesonFlags = [ "-Dgtk_doc=true" ]; + patches = [ + # https://gitlab.gnome.org/GNOME/grilo/merge_requests/45 + # commits are from a separate branch so they shouldn't 404 + (fetchpatch { + url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/f6993c2a8a6c1a6246372569f9f7a9179955c95e.patch"; + sha256 = "1x4s0ahs60dqyphgv2dy3x2sjnxv5ydd55kdlcjsys5870ijwbi8"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/61bca28b141162a33eb2fb575ef1daf0f21c7741.patch"; + sha256 = "1147xbmaq61myfwxz0pagdv056krfmh1s78qjbiy5k7k203qrjz0"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/363b198a062eeb8aaa5489ea9720e69d428e885c.patch"; + sha256 = "01w1bfzdbnxy5l37b2z7a9h2mrxziqkzdw02dybjphy85nb0hz5w"; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index 4aec5ba4d84..4c2a551b1c7 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nautilus-python"; - version = "1.2.2"; + version = "1.2.3"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04pib6fan6cq8x0fhf5gll2f5d2dh5pxrhj79qhi5l1yc7ys7kch"; + sha256 = "161050sx3sdxqcpjkjcpf6wl4kx0jydihga7mcvrj9c2f8ly0g07"; }; nativeBuildInputs = [ diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 59f2295e215..3dfa95154d3 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -8,15 +8,16 @@ let rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead"; sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; }; - v20181016 = { - version = "20181016"; - rev = "8049479c5aee00ed0b92e5edc7c8996aebf48208"; - sha256 = "14f9rlwh8vgmcl6njykvsiwxx0jn623375afixk26mzpy12zdcph"; + v20190414 = { + version = "20190414"; + rev = "706fdb4065cc2302d92ac2bce62cb59713253119"; + sha256 = "16lg4xs2wzbdbsn148xiacgl4wq4xwfqjnjkdhfr3w0qh1s81hay"; }; in { "8.6" = v20180709; "8.7" = v20180709; - "8.8" = v20181016; + "8.8" = v20190414; + "8.9" = v20190414; }; param = params."${coq.coq-version}"; in diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index b31fcde1b80..5446b540fac 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -15,15 +15,21 @@ let }; "8.8" = { - version = "1.2beta2"; - rev = "v1.2-beta2-8.8"; - sha256 = "1v9asdlhhks25ngnjn4dafx7nrcc5p0lhriqckh3y79nxbgpq4lx"; + version = "1.2"; + rev = "v1.2-8.8"; + sha256 = "06452fyzalz7zcjjp73qb7d6xvmqb6skljkivf8pfm55fsc8s7kx"; }; "8.9" = { - version = "1.2beta2"; - rev = "v1.2-beta2-8.9"; - sha256 = "0y2zwv7jxs1crprj5qvg46h0v9wyfn99ln40yskq91y9h1lj5h3j"; + version = "1.2"; + rev = "v1.2-8.9"; + sha256 = "1q3wvicr43bgy7xn1diwh4j43mnrhprrc2xd22qlbz9cl6bhf8bj"; + }; + + "8.10" = { + version = "1.2"; + rev = "v1.2-8.10"; + sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd"; }; }; param = params."${coq.coq-version}"; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 8df64de3acb..6b1a71c8020 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.462"; + version = "1.10.1.466"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "0mi7fzqvkg2ihigxkkamc742m1iba0yzy8ivciavzmpcnw128sc6"; + sha256 = "1rh4isdac7l8k8p45cqim8lfccjzxw7z173xqnpgk3z307jj4n90"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index d97d2295341..f438e9fb13c 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -7,7 +7,7 @@ with pythonPackages; stdenv.mkDerivation rec { name = "renpy-${version}"; - version = "7.3.0"; + version = "7.3.2"; meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "18617fgnwnm6kh191h7sqm7nfvrck20llqv2a0dw9am5f08wfvbq"; + sha256 = "1i7s9s8invsm5bavw2jlk965pb5h5vgwyk1nhw0z1d22spmj4a4m"; }; patches = [ diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index c9395ea6df7..4068e36badf 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Objects and helper methods to read and write AppStream metadata"; homepage = https://people.freedesktop.org/~hughsient/appstream-glib/; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ lethalman matthewbauer ]; }; } diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 043b9e263d8..52e0f06eeec 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -2,13 +2,13 @@ , eigen , fetchurl , cmake -, google-gflags +, gflags , glog , runTests ? false }: -# google-gflags is required to run tests -assert runTests -> google-gflags != null; +# gflags is required to run tests +assert runTests -> gflags != null; stdenv.mkDerivation rec { name = "ceres-solver-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ eigen glog ] - ++ stdenv.lib.optional runTests google-gflags; + ++ stdenv.lib.optional runTests gflags; # The Basel BUILD file conflicts with the cmake build directory on # case-insensitive filesystems, eg. darwin. diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 61a96af618a..78e32192fb4 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog -, google-gflags, libiberty, openssl }: +, gflags, libiberty, openssl }: stdenv.mkDerivation rec { name = "folly-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { boost double-conversion glog - google-gflags + gflags libevent libiberty openssl diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/gflags/default.nix similarity index 100% rename from pkgs/development/libraries/google-gflags/default.nix rename to pkgs/development/libraries/gflags/default.nix diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 7ef9fbcc44b..557e3caa722 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ] ++ optional gtkSupport gtk3 # for gtksink ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] - ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev jack2 ] + ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev ] ++ optionals (stdenv.isLinux && enableJack) [ jack2 ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 1d6bad1914b..60188d77962 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus -, glib, libgudev, udisks2, libgcrypt, libcap, polkit, fetchpatch +, glib, libgudev, udisks2, libgcrypt, libcap, polkit , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp , gnomeSupport ? false, gnome, gcr, wrapGAppsHook @@ -9,42 +9,15 @@ let pname = "gvfs"; - version = "1.40.1"; + version = "1.40.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj"; + sha256 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx"; }; - patches = [ - # CVE-2019-12448 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gvfs/commit/464bbc7e4e7fdfc3cb426557562038408b6108c5.patch"; - sha256 = "03fwlpj1vbi80661bbhzv8ddx3czkzv9i1q4h3gqyxi5f1i0xfz4"; - }) - # CVE-2019-12447 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gvfs/commit/cf2f9c4020bbdd895485244b70e9442a80062cbe.patch"; - sha256 = "1p7c48nsx1lkv2qpkyrsm9qfa77xwd28gczwcpv2kbji3ws5qgj5"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gvfs/commit/64156459a366d64ab19187455016929b1026189a.patch"; - sha256 = "0zxbhmgqxxw987ag8fh6yjzjn9jl55fqbn814jh9kwrk7x4prx9x"; - }) - # CVE-2019-12449 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gvfs/commit/ec939a01c278d1aaa47153f51b5c5f0887738dd9.patch"; - sha256 = "0hfybfaz2gfx3yyw5ymx6q0pqwkx2r1i7gzprfp80bplwslq0d4h"; - }) - # CVE-2019-12795 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gvfs/commit/d8c9138bf240975848b1c54db648ec4cd516a48f.patch"; - sha256 = "1lx6yxykx24mnq5izijqk744zj6rgww6ba76z0qjal4y0z3gsdqp"; - }) - ]; - postPatch = '' # patchShebangs requires executable file chmod +x meson_post_install.py diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix index 0fa46dde23e..1ebf2c2e21e 100644 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, fetchurl, cmake, protobuf, libunwind, openssl, glog -, google-gflags, gmock, gtest +, gflags, gmock, gtest }: let @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake protobuf ]; - buildInputs = [ libunwind glog google-gflags gmock gtest ]; + buildInputs = [ libunwind glog gflags gmock gtest ]; # The headers and library include from these and there is no provided pc file propagatedBuildInputs = [ protobuf openssl ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 172b9cd88da..bf6aa0d23fb 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "19.04"; + version = "19.07"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1yr2vl2z9z1kllr5ygi39r1ryw695cic8yj34yragkk33l1z6xc2"; + sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index d8075c41a70..a56deff66e4 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.10.0"; + version = "6.16.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr"; + sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx"; }; buildInputs = [ diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 85ea7a6292a..f46ec57197f 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.14.0"; + version = "6.16.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0lxjrd0rsadkfwg86qp0p176kqd9zdfhbmjygmrg5jklmxzd5i25"; + sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx"; }; buildInputs = [ diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 43a68abf825..7055645fe89 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub, fetchpatch , cmake, pkgconfig, unzip, zlib, pcre, hdf5 -, glog, boost, google-gflags, protobuf +, glog, boost, gflags, protobuf , config , enableJPEG ? true, libjpeg @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ zlib pcre hdf5 glog boost google-gflags ] + [ zlib pcre hdf5 glog boost gflags ] ++ lib.optional useSystemProtobuf protobuf ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index f96e6bf94bb..85bb2f1effd 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl, fetchFromGitHub , cmake, pkgconfig, unzip, zlib, pcre, hdf5 -, glog, boost, google-gflags, protobuf +, glog, boost, gflags, protobuf , config , enableJPEG ? true, libjpeg @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ zlib pcre hdf5 glog boost google-gflags protobuf ] + [ zlib pcre hdf5 glog boost gflags protobuf ] ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index d568e945202..4746f77a216 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, config, fetchFromGitHub , cmake -, glog, google-gflags, gtest +, glog, gflags, gtest , protobuf, snappy , python, future, six, python-protobuf, numpy, pydot , eigen @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" ]; propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle - buildInputs = [ glog google-gflags protobuf snappy eigen ] + buildInputs = [ glog gflags protobuf snappy eigen ] ++ lib.optional useCuda cudatoolkit ++ lib.optional useCudnn cudnn ++ lib.optional useOpenmp openmp diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index ba6827bf694..2dd63ebfc85 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, abseil-cpp, google-gflags, which +{ stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which , lsb-release, glog, protobuf, cbc, zlib , ensureNewerSourcesForZipFilesHook, python, swig , pythonProtobuf }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = '' cat < Makefile.local UNIX_ABSL_DIR=${abseil-cpp} - UNIX_GFLAGS_DIR=${google-gflags} + UNIX_GFLAGS_DIR=${gflags} UNIX_GLOG_DIR=${glog} UNIX_PROTOBUF_DIR=${protobuf} UNIX_CBC_DIR=${cbc} @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { python.pkgs.setuptools python.pkgs.wheel ]; propagatedBuildInputs = [ - abseil-cpp google-gflags glog protobuf cbc + abseil-cpp gflags glog protobuf cbc pythonProtobuf python.pkgs.six ]; diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index bd2442a323a..2aa28a2ccf4 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "wxSVG-${version}"; srcName = "wxsvg-${version}"; - version = "1.5.18"; + version = "1.5.19"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "0rzjrjx3vaz2z89zw5yv8qxclfpz7hpb17rgkib0a2r3kax2jz2h"; + sha256 = "17hgaqxf2y44j1d9z11p107sk7n7m1f9nkaz7z6450pan4zphy1z"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index b7c5859708e..df3a07b26e8 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -125,4 +125,8 @@ nodePackages // { nodePackages.node-pre-gyp ]; }; + + thelounge = nodePackages.thelounge.override { + buildInputs = [ nodePackages.node-pre-gyp ]; + }; } diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 26599311625..14012438bc1 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -1,7 +1,8 @@ [ "@angular/cli" -, "asar" , "@antora/cli" +, "@antora/site-generator-default" +, "asar" , "aws-azure-login" , "azure-functions-core-tools" , "bash-language-server" @@ -126,6 +127,7 @@ , "textlint-rule-terminology" , "textlint-rule-unexpanded-acronym" , "textlint-rule-write-good" +, "thelounge" , "three" , "tiddlywiki" , "triton" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index cac338aa815..b587d1391fa 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -40,6 +40,69 @@ let sha512 = "Di/3vPR4jwdYcMAk13t19sAF0qQUH8KSkFcmO/5E/gECTL1tXNvV690K1Vhn6zpeE17Z1MLB5HwRNcb6nJkD+Q=="; }; }; + "@antora/asciidoc-loader-2.0.0" = { + name = "_at_antora_slash_asciidoc-loader"; + packageName = "@antora/asciidoc-loader"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.0.0.tgz"; + sha512 = "kbpSBMM618Do5dXtG5mC5kk8VEXYDsciJ0orw7vrYeFzRBbR4Y4qpzbsQeuQNB4r2iLoztxErvg04SBb5CsGdQ=="; + }; + }; + "@antora/content-aggregator-2.0.0" = { + name = "_at_antora_slash_content-aggregator"; + packageName = "@antora/content-aggregator"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.0.0.tgz"; + sha512 = "24JQSDQZ609yJHs7abIqF5FikNg0EWvFwBYck1Kbl5vRikmDTpSMBhhPKJhAVe4lREm6/FVYO7t9CEmjp69prA=="; + }; + }; + "@antora/content-classifier-2.0.0" = { + name = "_at_antora_slash_content-classifier"; + packageName = "@antora/content-classifier"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.0.0.tgz"; + sha512 = "d1MB57X3AaXy30rw+dudxbJ2cdw/Uk1U4JxHbWIkdrEJKty2fbnBu3xjyb70qAv5G0ayovJpqZOaR+YwS0ibbQ=="; + }; + }; + "@antora/document-converter-2.0.0" = { + name = "_at_antora_slash_document-converter"; + packageName = "@antora/document-converter"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.0.0.tgz"; + sha512 = "8slnLdeMxI4kU64fMsNp58HjpFYZ7chrl5tCYr1/4Jr00fVHwn8vx2YS1cKyowcrmb9uG6YI/pMNt9F3kjTtYA=="; + }; + }; + "@antora/expand-path-helper-1.0.0" = { + name = "_at_antora_slash_expand-path-helper"; + packageName = "@antora/expand-path-helper"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/expand-path-helper/-/expand-path-helper-1.0.0.tgz"; + sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw=="; + }; + }; + "@antora/navigation-builder-2.0.0" = { + name = "_at_antora_slash_navigation-builder"; + packageName = "@antora/navigation-builder"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.0.0.tgz"; + sha512 = "tuI2dNDy9sqgkHoiqn52M0lWrxxOafrEUIPSskjyGf0MjFP3pBPKnHiBmAl2r+NhXCAfcIb5khe4rSS18bfiVA=="; + }; + }; + "@antora/page-composer-2.0.0" = { + name = "_at_antora_slash_page-composer"; + packageName = "@antora/page-composer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.0.0.tgz"; + sha512 = "1I0vhO6UCyNJRLYICTU+jCTEmkHeJ13tao0nfOOAiSyamDkyX7vM935qfzGBjwZdur8Clq4jpiCuvFTmXMtIfQ=="; + }; + }; "@antora/playbook-builder-2.0.0" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; @@ -49,6 +112,42 @@ let sha512 = "uLU4+rpIRZiMit8s1lkbiz5L5V8cPL40RJMRHFb4B7k2PXbvNiZZAMHZBeFgVwfJIKmKAIeUCDgOHgiBIlFc+A=="; }; }; + "@antora/redirect-producer-2.0.0" = { + name = "_at_antora_slash_redirect-producer"; + packageName = "@antora/redirect-producer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.0.0.tgz"; + sha512 = "qlRPGNAhtbIOWK9XHEdH4Iiaz1/8SBvm5rK46R4YinjZqMibMehOfFoIdRf2qsE9mfOsYKwKUSF8Jnv/emXuJw=="; + }; + }; + "@antora/site-mapper-2.0.0" = { + name = "_at_antora_slash_site-mapper"; + packageName = "@antora/site-mapper"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.0.0.tgz"; + sha512 = "rPpDLuJbM7c0fNpzf95qrxsjzNAXuyACXE+FXUOwmFp3SYIFGEWATLk1MMNes7SfLAchMMVwjEr1Uii3D5+/Mw=="; + }; + }; + "@antora/site-publisher-2.0.0" = { + name = "_at_antora_slash_site-publisher"; + packageName = "@antora/site-publisher"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.0.0.tgz"; + sha512 = "kjKfQSEpcLiw653h9IzCG+L9sYm/v9GXAcbzXN1IYoNPO1Od0EPQ2RXGviqeQNYcWJLyRq48cQpNx7o2/KqVag=="; + }; + }; + "@antora/ui-loader-2.0.0" = { + name = "_at_antora_slash_ui-loader"; + packageName = "@antora/ui-loader"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.0.0.tgz"; + sha512 = "CaD+Dp13G7EZhEr6Jg6OEvPHjJZ2FROXwdaY4XP+vBrKmI+QZwS3V+uG0NYbCRxhR1W8N8CYm5hc1UTvGH19cA=="; + }; + }; "@apollographql/apollo-tools-0.3.7" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; @@ -1336,13 +1435,13 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.16.1" = { + "@lerna/add-3.16.2" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.16.1.tgz"; - sha512 = "zk1ldthrXPl+Xuj0vVD3JYqTQzU+qKv8sOvvQrBXimuf/d+r+LJc10DXPGaCE9LwPeLgkrpPbIOQ7tTtkh0xGg=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.16.2.tgz"; + sha512 = "RAAaF8aODPogj2Ge9Wj3uxPFIBGpog9M+HwSuq03ZnkkO831AmasCTJDqV+GEpl1U2DvnhZQEwHpWmTT0uUeEw=="; }; }; "@lerna/batch-packages-3.16.0" = { @@ -1354,22 +1453,22 @@ let sha512 = "7AdMkANpubY/FKFI01im01tlx6ygOBJ/0JcixMUWoWP/7Ds3SWQF22ID6fbBr38jUWptYLDs2fagtTDL7YUPuA=="; }; }; - "@lerna/bootstrap-3.16.1" = { + "@lerna/bootstrap-3.16.2" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.16.1.tgz"; - sha512 = "flHK3PRNEzGjK5u94ARlTmvraNUDgtG3TpO4dOLgiG4DDqk/7JjRq/vNXhBqgrtoKzm+zp4tH/6+uCAqF6la5w=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.16.2.tgz"; + sha512 = "I+gs7eh6rv9Vyd+CwqL7sftRfOOsSzCle8cv/CGlMN7/p7EAVhxEdAw8SYoHIKHzipXszuqqy1Y3opyleD0qdA=="; }; }; - "@lerna/changed-3.16.1" = { + "@lerna/changed-3.16.2" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.16.1.tgz"; - sha512 = "qXm0psRXo2U0EOmnt4PY8i525FbYIkEjaI+I92VzFN9vIlxd40pXJpiPCYMJzVEMr3gInDz5LHAINzoQ+7YAeQ=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.16.2.tgz"; + sha512 = "CXr4R1s/IGsLy0xjVfgFtv4Hx8gUvIgmGteRuH2Ma9bl1yMcyy8zQd/e0M+dzL6tEhjo56ZTSs9hHiU2w/uwIg=="; }; }; "@lerna/check-working-tree-3.14.2" = { @@ -1453,13 +1552,13 @@ let sha512 = "OZApR1Iz7awutbmj4sAArwhqCyKgcrnw9rH0aWAUrkYWrD1w4TwkvAcYAsfx5GpQGbLQwoXhoyyPwPfZRRWz3Q=="; }; }; - "@lerna/create-symlink-3.16.0" = { + "@lerna/create-symlink-3.16.2" = { name = "_at_lerna_slash_create-symlink"; packageName = "@lerna/create-symlink"; - version = "3.16.0"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.16.0.tgz"; - sha512 = "MiQga30ZYB5mioUA37qkiIMb6X9JtyYhkzgDZFz7iZVdOF0NxkRQJZy+osGnXWij9s1DFfl70pOdVBPMl7LzRA=="; + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.16.2.tgz"; + sha512 = "pzXIJp6av15P325sgiIRpsPXLFmkisLhMBCy4764d+7yjf2bzrJ4gkWVMhsv4AdF0NN3OyZ5jjzzTtLNqfR+Jw=="; }; }; "@lerna/describe-ref-3.14.2" = { @@ -1579,13 +1678,13 @@ let sha512 = "Ybol/x5xMtBgokx4j7/Y3u0ZmNh0NiSWzBFVaOs2NOJKvuqrWimF67DKVz7yYtTYEjtaMdug64ohFF4jcT/iag=="; }; }; - "@lerna/link-3.16.0" = { + "@lerna/link-3.16.2" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "3.16.0"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-3.16.0.tgz"; - sha512 = "nm9olZuvNGOqTFusgsD1eBDqTWwre3FUX0DkLORbqvvm/TIwRvXoOBmFceV2Q9zpAFRwj4vrnsPNQ/RYC3X4ZQ=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-3.16.2.tgz"; + sha512 = "eCPg5Lo8HT525fIivNoYF3vWghO3UgEVFdbsiPmhzwI7IQyZro5HWYzLtywSAdEog5XZpd2Bbn0CsoHWBB3gww=="; }; }; "@lerna/list-3.16.0" = { @@ -1642,13 +1741,13 @@ let sha512 = "APUOIilZCzDzce92uLEwzt1r7AEMKT/hWA1ThGJL+PO9Rn8A95Km3o2XZAYG4W0hR+P4O2nSVuKbsjQtz8CjFQ=="; }; }; - "@lerna/npm-publish-3.16.1" = { + "@lerna/npm-publish-3.16.2" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.16.1.tgz"; - sha512 = "+whucIDWaBecV4BsPrpA8nCv0eTv96BKOTVSURm3G7voR7yCSl7Fi/grC5Id9cjG3IiIE03rPTw54cUwOQSZdQ=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.16.2.tgz"; + sha512 = "tGMb9vfTxP57vUV5svkBQxd5Tzc+imZbu9ZYf8Mtwe0+HYfDjNiiHLIQw7G95w4YRdc5KsCE8sQ0uSj+f2soIg=="; }; }; "@lerna/npm-run-script-3.14.2" = { @@ -1678,13 +1777,13 @@ let sha512 = "7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg=="; }; }; - "@lerna/pack-directory-3.16.1" = { + "@lerna/pack-directory-3.16.2" = { name = "_at_lerna_slash_pack-directory"; packageName = "@lerna/pack-directory"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.1.tgz"; - sha512 = "mygbdbmHhM8QDWsi8QHFkv8djv6oHnP7c5OpnPbagM7QRdXxchwLrSjcSASJvljzmQeRo4zgHN71CHgyhichOA=="; + url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.2.tgz"; + sha512 = "aM8MQnkhRUW81s/UBEUKA+qRfSdf9TcJzTY9Wjrd94UxzULn1BQ+Y3F8cysTR0TS/ILLyiteIllxlVSByWHD2w=="; }; }; "@lerna/package-3.16.0" = { @@ -1732,13 +1831,13 @@ let sha512 = "P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA=="; }; }; - "@lerna/publish-3.16.1" = { + "@lerna/publish-3.16.2" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.16.1.tgz"; - sha512 = "a2y27d5m37sT/16eI9MLfZk+v5LDRr+Dpj8kT+FTsQqi4uS1ZOtzx9JyC9sLjZTSSivr1ZTQrrZbgyQ2YtRAMg=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.16.2.tgz"; + sha512 = "6CZhnzO5goChQPqcBEN+6f6wA5ERBYcKB8RlBlsG38H8f8uYNZM6m34ywy1MLihZQA0z/RWrhYWAf4daF+AUkA=="; }; }; "@lerna/pulse-till-done-3.13.0" = { @@ -1786,13 +1885,13 @@ let sha512 = "woTeLlB1OAAz4zzjdI6RyIxSGuxiUPHJZm89E1pDEPoWwtQV6HMdMgrsQd9ATsJ5Ez280HH4bF/LStAlqW8Ufg=="; }; }; - "@lerna/run-lifecycle-3.16.1" = { + "@lerna/run-lifecycle-3.16.2" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.16.1.tgz"; - sha512 = "hKvoQis5e+ktR9zWoya/BD1oVqRKDTJHLuCJsYaNYH4p5JJ5k2Y5bw+Gv3weccqb8uNrsXPcQmGPXhmNNSrAfw=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.16.2.tgz"; + sha512 = "RqFoznE8rDpyyF0rOJy3+KjZCeTkO8y/OB9orPauR7G2xQ7PTdCpgo7EO6ZNdz3Al+k1BydClZz/j78gNCmL2A=="; }; }; "@lerna/run-parallel-batches-3.16.0" = { @@ -1813,22 +1912,22 @@ let sha512 = "4Hlpv4zDtKWa5Z0tPkeu0sK+bxZEKgkNESMGmWrUCNfj7xwvAJurcraK8+a2Y0TFYwf0qjSLY/MzX+ZbJA3Cgw=="; }; }; - "@lerna/symlink-binary-3.16.0" = { + "@lerna/symlink-binary-3.16.2" = { name = "_at_lerna_slash_symlink-binary"; packageName = "@lerna/symlink-binary"; - version = "3.16.0"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.16.0.tgz"; - sha512 = "7sgLWKP7RVxKPmnJZnq3ynqOsO6FDNFtJ/eQA46aV8ivKYoJY3+083FFErvka460V2MTBCEZsKXfX8Nezly/fg=="; + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.16.2.tgz"; + sha512 = "kz9XVoFOGSF83gg4gBqH+mG6uxfJfTp8Uy+Cam40CvMiuzfODrGkjuBEFoM/uO2QOAwZvbQDYOBpKUa9ZxHS1Q=="; }; }; - "@lerna/symlink-dependencies-3.16.0" = { + "@lerna/symlink-dependencies-3.16.2" = { name = "_at_lerna_slash_symlink-dependencies"; packageName = "@lerna/symlink-dependencies"; - version = "3.16.0"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.16.0.tgz"; - sha512 = "Pi3knz/+es8WltHBTG6UzYA3jFulv8kDGUVw225Bhv3YNcotX8ijXhm6oBO5zvFuW24b4fojZQxznM/EqJdaIw=="; + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.16.2.tgz"; + sha512 = "wnZqGJQ+Jvr1I3inxrkffrFZfmQI7Ta8gySw/UWCy95QtZWF/f5yk8zVIocCAsjzD0wgb3jJE3CFJ9W5iwWk1A=="; }; }; "@lerna/timer-3.13.0" = { @@ -1849,13 +1948,13 @@ let sha512 = "SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA=="; }; }; - "@lerna/version-3.16.1" = { + "@lerna/version-3.16.2" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.16.1.tgz"; - sha512 = "CtDjZmrtcuKSk6xJc74ZBUJuJSH2N5BKkB29Yli1NvH+Tsn1CHHamr9bGYmRBEZlNSAxf1exlLPMX9jlZb5J8g=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.16.2.tgz"; + sha512 = "Gd4ajnhYkpIpHfuzRbcqfdiMLgOTnZfKsJDIdWsMJDoerhHFtNkhVSyaw4rQd2AIO4dCi63QxuGM9fUTFk0VKw=="; }; }; "@lerna/write-log-file-3.13.0" = { @@ -1939,13 +2038,13 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@octokit/endpoint-5.3.1" = { + "@octokit/endpoint-5.3.2" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.1.tgz"; - sha512 = "4mKqSQfeTRFpQMUGIUG1ewdQT64b2YpvjG2dE1x7nhQupdI/AjdgdcIsmPtRFEXlih/uLQLRWJL4FrivpQdC7A=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.2.tgz"; + sha512 = "gRjteEM9I6f4D8vtwU2iGUTn9RX/AJ0SVXiqBUEuYEWVGGAVjSXdT0oNmghH5lvQNWs8mwt6ZaultuG6yXivNw=="; }; }; "@octokit/plugin-enterprise-rest-3.6.2" = { @@ -1975,13 +2074,13 @@ let sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig=="; }; }; - "@octokit/rest-16.28.5" = { + "@octokit/rest-16.28.6" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.28.5"; + version = "16.28.6"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.5.tgz"; - sha512 = "W8hHSm6103c+lNdTuQBMKdZNDCOFFXJdatj92g2d6Hqk134EMDHRc02QWI/Fs1WGnWZ8Leb0QFbXPKO2njeevQ=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.6.tgz"; + sha512 = "ERfzS6g6ZNPJkEUclxLenr+UEncbymCe//IBrWWdp59nslYDeJboq07Ue9brX05Uv0+SY3kwA33cdiVBVPAOMQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -3091,6 +3190,15 @@ let sha512 = "uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg=="; }; }; + "@zkochan/cmd-shim-3.1.0" = { + name = "_at_zkochan_slash_cmd-shim"; + packageName = "@zkochan/cmd-shim"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz"; + sha512 = "o8l0+x7C7sMZU3v9GuJIAU10qQLtwR1dtRQIOmlNMtyaqhmpXOzx1HWiYoWfmmf9HHZoAkXpc9TM9PQYF9d4Jg=="; + }; + }; "CSSselect-0.4.1" = { name = "CSSselect"; packageName = "CSSselect"; @@ -3208,6 +3316,15 @@ let sha512 = "jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q=="; }; }; + "abstract-logging-1.0.0" = { + name = "abstract-logging"; + packageName = "abstract-logging"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-logging/-/abstract-logging-1.0.0.tgz"; + sha1 = "8b7deafd310559bc28f77724dd1bb30177278c1b"; + }; + }; "abstract-random-access-1.1.2" = { name = "abstract-random-access"; packageName = "abstract-random-access"; @@ -4936,6 +5053,15 @@ let sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; + "asciidoctor.js-1.5.9" = { + name = "asciidoctor.js"; + packageName = "asciidoctor.js"; + version = "1.5.9"; + src = fetchurl { + url = "https://registry.npmjs.org/asciidoctor.js/-/asciidoctor.js-1.5.9.tgz"; + sha512 = "k5JgwyV82TsiCpnYbDPReuHhzf/vRUt6NaZ+OGywkDDGeGG/CPfvN2Gd1MJ0iIZKDyuk4iJHOdY/2x1KBrWMzA=="; + }; + }; "ascli-0.3.0" = { name = "ascli"; packageName = "ascli"; @@ -4954,6 +5080,15 @@ let sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + }; "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; @@ -4972,6 +5107,15 @@ let sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; + "asn1.js-5.2.0" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.2.0.tgz"; + sha512 = "Q7hnYGGNYbcmGrCPulXfkEw7oW7qjWeM4ZTALmgpuIcZLxyqqKYWxCZg2UBm8bklrnB4m2mGyJPWfoktdORD8A=="; + }; + }; "assert-1.5.0" = { name = "assert"; packageName = "assert"; @@ -5215,6 +5359,15 @@ let sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; }; }; + "async-lock-1.2.2" = { + name = "async-lock"; + packageName = "async-lock"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async-lock/-/async-lock-1.2.2.tgz"; + sha512 = "uczz62z2fMWOFbyo6rG4NlV2SdxugJT6sZA2QcfB1XaSjEiOh8CuOb/TttyMnYQCda6nkWecJe465tGQDPJiKw=="; + }; + }; "async-mutex-0.1.3" = { name = "async-mutex"; packageName = "async-mutex"; @@ -5359,13 +5512,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.496.0" = { + "aws-sdk-2.497.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.496.0"; + version = "2.497.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.496.0.tgz"; - sha512 = "6xZ//phdvp7/dUZjOdDsorl+xehhkAgxOMber9vUlMO9ckBOeufIvED7oKF0NvSlfG8laHK4JprXKQvhXqVLqA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.497.0.tgz"; + sha512 = "SCAVfWqj0qe22Lj6ZHMP/4autc9x3GqgWTj3YrE3VleSuql62xhyCC9gSYfbm7wo8Puqx0+kEnKYyyXR7Z98QA=="; }; }; "aws-sign2-0.6.0" = { @@ -6034,6 +6187,15 @@ let sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; }; }; + "base64-js-0.0.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz"; + sha1 = "024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"; + }; + }; "base64-js-0.0.8" = { name = "base64-js"; packageName = "base64-js"; @@ -6196,6 +6358,15 @@ let sha512 = "IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A=="; }; }; + "benchmark-1.0.0" = { + name = "benchmark"; + packageName = "benchmark"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"; + sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73"; + }; + }; "bencode-0.7.0" = { name = "bencode"; packageName = "bencode"; @@ -6421,13 +6592,13 @@ let sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ=="; }; }; - "bittorrent-dht-9.0.0" = { + "bittorrent-dht-9.0.1" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.0.tgz"; - sha512 = "X5ax4G/PLtEPfqOUjqDZ2nmPENndWRMK4sT2jcQ4sXor904zhR40r4KqTyTvWYAljh5/hPPqM9DCUUtqWzRXoQ=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.1.tgz"; + sha512 = "DgymMDZyv5y0pyys73pFa3rImRliqxkiDvVwJ35e+co6MHQJ30M5ZvTstwJ38CtdMlF36RoLnL2z14ICl7pv/A=="; }; }; "bittorrent-peerid-1.3.0" = { @@ -6484,6 +6655,15 @@ let sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; }; }; + "bl-2.2.0" = { + name = "bl"; + packageName = "bl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz"; + sha512 = "wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA=="; + }; + }; "bl-3.0.0" = { name = "bl"; packageName = "bl"; @@ -6745,6 +6925,15 @@ let sha512 = "SiHJE2jEXjAL3TewN99wDl5Ehpm5DKA75oIyiY+2EMWWMPhIuZlQ/AvDzsLktNkwhylmAVLwiW+nuBPIU7kcoQ=="; }; }; + "bops-0.0.7" = { + name = "bops"; + packageName = "bops"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bops/-/bops-0.0.7.tgz"; + sha1 = "b4a0a5a839a406454af0fe05a8b91a7a766a54e2"; + }; + }; "bottleneck-1.5.3" = { name = "bottleneck"; packageName = "bottleneck"; @@ -7492,6 +7681,15 @@ let sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; + "cache-directory-2.0.0" = { + name = "cache-directory"; + packageName = "cache-directory"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-directory/-/cache-directory-2.0.0.tgz"; + sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; + }; + }; "cacheable-request-2.1.4" = { name = "cacheable-request"; packageName = "cacheable-request"; @@ -8248,6 +8446,15 @@ let sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g=="; }; }; + "clean-git-ref-1.0.3" = { + name = "clean-git-ref"; + packageName = "clean-git-ref"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-git-ref/-/clean-git-ref-1.0.3.tgz"; + sha1 = "5325dc839eab01c974ae0e97f5734782750f88ec"; + }; + }; "clean-stack-1.3.0" = { name = "clean-stack"; packageName = "clean-stack"; @@ -10111,6 +10318,15 @@ let sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; }; }; + "crc-32-1.2.0" = { + name = "crc-32"; + packageName = "crc-32"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"; + sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + }; + }; "crc32-stream-2.0.0" = { name = "crc32-stream"; packageName = "crc32-stream"; @@ -11848,6 +12064,15 @@ let sha512 = "s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q=="; }; }; + "diff-lines-1.1.1" = { + name = "diff-lines"; + packageName = "diff-lines"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-lines/-/diff-lines-1.1.1.tgz"; + sha512 = "Oo5JzEEriF/+T0usOeRP5yOzr6SWvni2rrxvIgijMZSxPcEvf8JOvCO5GpnWwkte7fcOgnue/f5ECg1H9lMPCw=="; + }; + }; "diff-match-patch-1.0.4" = { name = "diff-match-patch"; packageName = "diff-match-patch"; @@ -12586,13 +12811,13 @@ let sha512 = "PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="; }; }; - "electron-to-chromium-1.3.198" = { + "electron-to-chromium-1.3.199" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.198"; + version = "1.3.199"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.198.tgz"; - sha512 = "2GcPd1bkU8EGPa3AhxzPswbNvh5wgK4/8r3fg+sSVyVlCWaN9Tq+tVkJLktMZIcrHiZF0vJpnktfoYXFTvjCVg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.199.tgz"; + sha512 = "gachlDdHSK47s0N2e58GH9HMC6Z4ip0SfmYUa5iEbE50AKaOUXysaJnXMfKj0xB245jWbYcyFSH+th3rqsF8hA=="; }; }; "elegant-spinner-1.0.1" = { @@ -13721,6 +13946,15 @@ let sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; }; }; + "eventemitter3-2.0.3" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz"; + sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; + }; + }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -14405,6 +14639,15 @@ let sha512 = "q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg=="; }; }; + "fast-text-encoding-1.0.0" = { + name = "fast-text-encoding"; + packageName = "fast-text-encoding"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz"; + sha512 = "R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ=="; + }; + }; "fast-url-parser-1.1.3" = { name = "fast-url-parser"; packageName = "fast-url-parser"; @@ -14558,6 +14801,15 @@ let sha512 = "uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="; }; }; + "file-type-12.0.1" = { + name = "file-type"; + packageName = "file-type"; + version = "12.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-12.0.1.tgz"; + sha512 = "YIs1E51cmqcmgF38ODjy0+M/l5DyfIIy3vngTOujQr/lXqkaSskfBniaZoZ1HVIpa5FTf5e7hCXS4TzxfNGMRQ=="; + }; + }; "file-type-3.9.0" = { name = "file-type"; packageName = "file-type"; @@ -14648,6 +14900,15 @@ let sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; }; }; + "filenamify-4.1.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filenamify/-/filenamify-4.1.0.tgz"; + sha512 = "KQV/uJDI9VQgN7sHH1Zbk6+42cD6mnQ2HONzkXUfPJ+K2FC8GZ1dpewbbHw0Sz8Tf5k3EVdHVayM4DoAwWlmtg=="; + }; + }; "filesize-3.6.1" = { name = "filesize"; packageName = "filesize"; @@ -16007,6 +16268,15 @@ let sha1 = "2c5a6638d893934b9b55037d0ad82cb7004b2679"; }; }; + "git-apply-delta-0.0.7" = { + name = "git-apply-delta"; + packageName = "git-apply-delta"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/git-apply-delta/-/git-apply-delta-0.0.7.tgz"; + sha1 = "fb76ae144540d79440b52b31de03e63c993c7219"; + }; + }; "git-clone-0.1.0" = { name = "git-clone"; packageName = "git-clone"; @@ -16431,6 +16701,15 @@ let sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; }; + "globalyzer-0.1.4" = { + name = "globalyzer"; + packageName = "globalyzer"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.4.tgz"; + sha512 = "LeguVWaxgHN0MNbWC6YljNMzHkrCny9fzjmEUdnF1kQ7wATFD1RHFRqA1qxaX2tgxGENlcxjOflopBwj3YZiXA=="; + }; + }; "globby-4.1.0" = { name = "globby"; packageName = "globby"; @@ -16458,6 +16737,15 @@ let sha512 = "ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg=="; }; }; + "globrex-0.1.2" = { + name = "globrex"; + packageName = "globrex"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz"; + sha512 = "uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="; + }; + }; "globule-0.1.0" = { name = "globule"; packageName = "globule"; @@ -16638,6 +16926,15 @@ let sha1 = "5b9e6b78c3832452d2ba2bb1cb830f96276410ac"; }; }; + "grapheme-splitter-1.0.4" = { + name = "grapheme-splitter"; + packageName = "grapheme-splitter"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"; + sha512 = "bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="; + }; + }; "graphlib-2.1.7" = { name = "graphlib"; packageName = "graphlib"; @@ -16962,6 +17259,15 @@ let sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; + "gulp-vinyl-zip-2.1.2" = { + name = "gulp-vinyl-zip"; + packageName = "gulp-vinyl-zip"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.2.tgz"; + sha512 = "wJn09jsb8PyvUeyFF7y7ImEJqJwYy40BqL9GKfJs6UGpaGW9A+N68Q+ajsIpb9AeR6lAdjMbIdDPclIGo1/b7Q=="; + }; + }; "gulplog-1.0.0" = { name = "gulplog"; packageName = "gulplog"; @@ -17826,6 +18132,15 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; + "http_ece-1.1.0" = { + name = "http_ece"; + packageName = "http_ece"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http_ece/-/http_ece-1.1.0.tgz"; + sha512 = "bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA=="; + }; + }; "https-browserify-1.0.0" = { name = "https-browserify"; packageName = "https-browserify"; @@ -17907,13 +18222,13 @@ let sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; }; }; - "hypercore-protocol-6.11.0" = { + "hypercore-protocol-6.11.1" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.11.0.tgz"; - sha512 = "V/0Vru8gavoO++K2QFOAXu7xgBuXcBAjURQ9BQ48DnQ/p4hK4Jy76ulRnppDHpbDthxRziMWLZfmYXncwD63Aw=="; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.11.1.tgz"; + sha512 = "4vyYGzSTRCfpIPnpYO/WN0VeS2oGeIrzCCwIXfz5TL2dyyHu7wF5xiigNuUfTn9n3cTOwwbH+EKsygTNsO2yfw=="; }; }; "hyperdrive-9.15.0" = { @@ -18780,6 +19095,15 @@ let sha512 = "Mb6kv78bTi4RNAIIWL8Bbre7hXOR2pNUi3j8FaQkLaitf/ZWxkq3/iIwXNYk2ACO3IMfdVdQrOkUtwZblO7uBA=="; }; }; + "ipaddr.js-0.1.3" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.3.tgz"; + sha1 = "27a9ca37f148d2102b0ef191ccbf2c51a8f025c6"; + }; + }; "ipaddr.js-1.0.5" = { name = "ipaddr.js"; packageName = "ipaddr.js"; @@ -18807,6 +19131,15 @@ let sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; + "irc-framework-4.4.0" = { + name = "irc-framework"; + packageName = "irc-framework"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/irc-framework/-/irc-framework-4.4.0.tgz"; + sha512 = "81ZjeFg0J+OdwGO4S90f8/GpwNwIcP9KaCt0lvRqt1GueT7cKPX2v1yiRML3cJXofkz/MsVZqJCnAEThYYaTUQ=="; + }; + }; "irc-replies-2.0.1" = { name = "irc-replies"; packageName = "irc-replies"; @@ -19941,6 +20274,24 @@ let sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; }; }; + "isomorphic-git-0.47.0" = { + name = "isomorphic-git"; + packageName = "isomorphic-git"; + version = "0.47.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-0.47.0.tgz"; + sha512 = "oea4It03KvuJrEbwYGMrRmlY+Wh7a/J/jBYKezkiUW/s6GrcAePOCnpfLR8TXkHiASZlEHCgckMd7uMAfJ9w/w=="; + }; + }; + "isomorphic-textencoder-1.0.1" = { + name = "isomorphic-textencoder"; + packageName = "isomorphic-textencoder"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-textencoder/-/isomorphic-textencoder-1.0.1.tgz"; + sha512 = "676hESgHullDdHDsj469hr+7t3i/neBKU9J7q1T4RHaWwLAsaQnywC0D1dIUId0YZ+JtVrShzuBk1soo0+GVcQ=="; + }; + }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -21148,6 +21499,15 @@ let sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; }; }; + "ldap-filter-0.2.2" = { + name = "ldap-filter"; + packageName = "ldap-filter"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.2.2.tgz"; + sha1 = "f2b842be0b86da3352798505b31ebcae590d77d0"; + }; + }; "lead-1.0.0" = { name = "lead"; packageName = "lead"; @@ -21634,6 +21994,15 @@ let sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; }; }; + "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.15" = { name = "lodash"; packageName = "lodash"; @@ -23380,6 +23749,15 @@ let sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; }; }; + "marky-1.2.1" = { + name = "marky"; + packageName = "marky"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/marky/-/marky-1.2.1.tgz"; + sha512 = "md9k+Gxa3qLH6sUKpeC2CNkJK/Ld+bEz5X96nYwloqphQE0CKCVEKco/6jxEZixinqNdz5RFi/KaCyfbMDMAXQ=="; + }; + }; "match-casing-1.0.2" = { name = "match-casing"; packageName = "match-casing"; @@ -23407,6 +23785,15 @@ let sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"; }; }; + "matcher-1.1.1" = { + name = "matcher"; + packageName = "matcher"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz"; + sha512 = "+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg=="; + }; + }; "matcher-2.0.0" = { name = "matcher"; packageName = "matcher"; @@ -23866,6 +24253,15 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; + "middleware-handler-0.2.0" = { + name = "middleware-handler"; + packageName = "middleware-handler"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/middleware-handler/-/middleware-handler-0.2.0.tgz"; + sha1 = "bf02af7e6b577c0230609b2ae58df0e446f3fd02"; + }; + }; "miller-rabin-4.0.1" = { name = "miller-rabin"; packageName = "miller-rabin"; @@ -24091,6 +24487,15 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; + "minimatch-all-1.1.0" = { + name = "minimatch-all"; + packageName = "minimatch-all"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch-all/-/minimatch-all-1.1.0.tgz"; + sha1 = "40c496a27a2e128d19bf758e76bb01a0c7145787"; + }; + }; "minimist-0.0.10" = { name = "minimist"; packageName = "minimist"; @@ -24127,6 +24532,15 @@ let sha512 = "FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ=="; }; }; + "minimisted-2.0.0" = { + name = "minimisted"; + packageName = "minimisted"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimisted/-/minimisted-2.0.0.tgz"; + sha512 = "oP88Dw3LK/pdrKyMdlbmg3W50969UNr4ctISzJfPl+YPYHTAOrS+dihXnsgRNKSRIzDsrnV3eE2CCVlZbpOKdQ=="; + }; + }; "minipass-2.3.5" = { name = "minipass"; packageName = "minipass"; @@ -24226,6 +24640,15 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; + "mkdirp-promise-5.0.1" = { + name = "mkdirp-promise"; + packageName = "mkdirp-promise"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz"; + sha1 = "e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"; + }; + }; "mkpath-1.0.0" = { name = "mkpath"; packageName = "mkpath"; @@ -24505,6 +24928,15 @@ let sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; }; }; + "multi-progress-2.0.0" = { + name = "multi-progress"; + packageName = "multi-progress"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multi-progress/-/multi-progress-2.0.0.tgz"; + sha1 = "29ccb42cf24874b1c6384f03127ce5dff7b22f2c"; + }; + }; "multi-random-access-2.1.1" = { name = "multi-random-access"; packageName = "multi-random-access"; @@ -25328,6 +25760,15 @@ let sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; + "nick-0.1.3" = { + name = "nick"; + packageName = "nick"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nick/-/nick-0.1.3.tgz"; + sha1 = "d8a30b7da789d417e0baa5437f33c487be9b6020"; + }; + }; "nijs-0.0.25" = { name = "nijs"; packageName = "nijs"; @@ -26040,13 +26481,13 @@ let sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "npm-lifecycle-3.0.0" = { + "npm-lifecycle-3.1.2" = { name = "npm-lifecycle"; packageName = "npm-lifecycle"; - version = "3.0.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.0.0.tgz"; - sha512 = "/x/8zxo5Tn3qWj1eSUXgyr2pLBnEoFkpJQE/8pRwrEpJI4irZM0+YSp7W8NGDLzN6SaBOGOPaJV9O2dhY1IWwQ=="; + url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.2.tgz"; + sha512 = "nhfOcoTHrW1lJJlM2o77vTE2RWR4YOVyj7YzmY0y5itsMjEuoJHteio/ez0BliENEPsNxIUQgwhyEW9dShj3Ww=="; }; }; "npm-package-arg-6.1.0" = { @@ -26743,6 +27184,15 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; + "opal-runtime-1.0.11" = { + name = "opal-runtime"; + packageName = "opal-runtime"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/opal-runtime/-/opal-runtime-1.0.11.tgz"; + sha512 = "L+6pnRvXPlDtbamBRnJAnB9mEMXmsIQ/b+0r/2xJ5/n/nxheEkLo+Pm5QNQ08LEbEN9TI6/kedhIspqRRu6tXA=="; + }; + }; "open-0.0.2" = { name = "open"; packageName = "open"; @@ -27355,6 +27805,15 @@ let sha512 = "bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q=="; }; }; + "package-json-6.5.0" = { + name = "package-json"; + packageName = "package-json"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; + }; + }; "package-json-versionify-1.0.4" = { name = "package-json-versionify"; packageName = "package-json-versionify"; @@ -29084,6 +29543,15 @@ let sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f"; }; }; + "printj-1.1.2" = { + name = "printj"; + packageName = "printj"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz"; + sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; + }; + }; "prism-media-0.0.3" = { name = "prism-media"; packageName = "prism-media"; @@ -29111,13 +29579,13 @@ let sha512 = "dWBTeQbyWr/4d97ZKjxFPvIHytnNlBsNzgsJC1eew3qoZ9A8vtRIFhsnPiD3kYIf67w56i2QO2O5Infe2FzMww=="; }; }; - "prismjs-1.16.0" = { + "prismjs-1.17.1" = { name = "prismjs"; packageName = "prismjs"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.16.0.tgz"; - sha512 = "OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.17.1.tgz"; + sha512 = "PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q=="; }; }; "private-0.1.8" = { @@ -30119,13 +30587,13 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "puppeteer-1.18.1" = { + "puppeteer-1.19.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.18.1.tgz"; - sha512 = "luUy0HPSuWPsPZ1wAp6NinE0zgetWtudf5zwZ6dHjMWfYpTQcmKveFRox7VBNhQ98OjNA9PQ9PzQyX8k/KrxTg=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.19.0.tgz"; + sha512 = "2S6E6ygpoqcECaagDbBopoSOPDv0pAZvTbnBgUY+6hq0/XDFDOLEMNlHF/SKJlzcaZ9ckiKjKDuueWI3FN/WXw=="; }; }; "push-stream-10.1.2" = { @@ -30335,6 +30803,15 @@ let sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; }; }; + "queue-4.5.1" = { + name = "queue"; + packageName = "queue"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/queue/-/queue-4.5.1.tgz"; + sha512 = "AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw=="; + }; + }; "quick-format-unescaped-3.0.2" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; @@ -31163,6 +31640,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"; @@ -33620,13 +34106,13 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-1.195.1" = { + "snyk-1.197.0" = { name = "snyk"; packageName = "snyk"; - version = "1.195.1"; + version = "1.197.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.195.1.tgz"; - sha512 = "PJ5K8W+gTkg/CktePxvhahiHZ75PC6ZPVpsk2icYX9nx9Fx4VYZ8pt8GJYo31KLrlwENG3WxBNV5xas+dd2csg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.197.0.tgz"; + sha512 = "qZSQ0nW+ow1sjogLME3CumXgMJXpm37lyhikt8SurGUH8ogkq4Q7s7Md9ercJJpEd9+LVjKJY4IBp+2Qv4HInw=="; }; }; "snyk-config-2.2.2" = { @@ -33764,13 +34250,13 @@ let sha512 = "GP3VBrkz1iDDw2q8ftTqppHqzIAxmsUIoXR+FRWDKcipkKHXHJyUmtEo11QVT5fNRV0D0RCsssk2S5CTxTCu6A=="; }; }; - "snyk-sbt-plugin-2.5.7" = { + "snyk-sbt-plugin-2.6.0" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "2.5.7"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.5.7.tgz"; - sha512 = "nVGsYq/EZfSFzKaXJvUTqaf9phH5+EgZNN3ynN9Y54EO8Lh4Dljnd/gBIQzxHMI2joQDH4FMB3ojDZeiCkeQ1Q=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.6.0.tgz"; + sha512 = "a2NGX82rWkzGbgL9HZNACvGWR25SnPpCWw4aM+bDuSBYuWp/61oBz2DW1kI+pCP658FYjzDql7pmz0H+UPiwNA=="; }; }; "snyk-tree-1.0.0" = { @@ -33980,6 +34466,15 @@ let sha512 = "FbZ/X/2Xq3DAMhuRA4bnN0jy1QxaPTVPLFvyv6CEj0QDKSTdWp9yRxo1JhqXmWKhPQeJyUMajHJB2UjT43pFcw=="; }; }; + "socksjs-0.5.0" = { + name = "socksjs"; + packageName = "socksjs"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socksjs/-/socksjs-0.5.0.tgz"; + sha1 = "77b005e32d1bfc96e560fedd5d7eedcf120f87e3"; + }; + }; "sodium-browserify-1.3.0" = { name = "sodium-browserify"; packageName = "sodium-browserify"; @@ -34034,13 +34529,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.7.4" = { + "sonic-boom-0.7.5" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.4.tgz"; - sha512 = "8JRAJg0RxZtFLQMxolwETvWd2JSlH3ZGo/Z4xPxMbpqF14xCgVYPVeFCFOR3zyr3pcfG82QDVj6537Sx5ZWdNw=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.5.tgz"; + sha512 = "1pKrnAV6RfvntPnarY71tpthFTM3pWZWWQdghZY8ARjtDPGzG/inxqSuRwQY/7V1woUjfyxPb437zn4p5phgnQ=="; }; }; "sorcery-0.10.0" = { @@ -35168,6 +35663,15 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; + "stream-source-0.3.5" = { + name = "stream-source"; + packageName = "stream-source"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-source/-/stream-source-0.3.5.tgz"; + sha512 = "ZuEDP9sgjiAwUVoDModftG0JtYiLUV8K4ljYD1VyUMRWtbVf92474o4kuuul43iZ8t/hRuiDAx1dIJSvirrK/g=="; + }; + }; "stream-splicer-2.0.1" = { name = "stream-splicer"; packageName = "stream-splicer"; @@ -36393,13 +36897,13 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "terminal-kit-1.28.19" = { + "terminal-kit-1.28.25" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.28.19"; + version = "1.28.25"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.28.19.tgz"; - sha512 = "lcQgNFfjb+VKCtmXG8K6VCryUMURLKTM3xumY4Y1eXV4ikpjAZ/SFdnb44bnL5iJTEr20xw2m20rJyTsDUeFSw=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.28.25.tgz"; + sha512 = "6E/vLiMg7uUZI7T1GLVLITx3Hw22VVPL3O8+s4Lh9q/wuzJ0s1fDD0L9F/u+tHMFH2lHIRa0n7QPCzHOv/AYGA=="; }; }; "terser-3.17.0" = { @@ -36492,6 +36996,15 @@ let sha512 = "PW6rXqLNGL3xZ6d5/INrX+pt8qbffmeDPLcvkBOlfNpDRFhVvNNjFmZXH86ZQjrOz9t/nNZDBXqnzqJuioJbSQ=="; }; }; + "thelounge-ldapjs-non-maintained-fork-1.0.4" = { + name = "thelounge-ldapjs-non-maintained-fork"; + packageName = "thelounge-ldapjs-non-maintained-fork"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/thelounge-ldapjs-non-maintained-fork/-/thelounge-ldapjs-non-maintained-fork-1.0.4.tgz"; + sha512 = "uf6H6UMv6EKmU81V1Q5lECwiGz4noSua+C+nGiC/Vgtayu3VRjtSSIJzUJDUjJT3YS8HJgkvBe2SsgGrPlT/7g=="; + }; + }; "then-fs-2.0.0" = { name = "then-fs"; packageName = "then-fs"; @@ -37023,6 +37536,15 @@ let sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6"; }; }; + "to-utf8-0.0.1" = { + name = "to-utf8"; + packageName = "to-utf8"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz"; + sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852"; + }; + }; "to-vfile-1.0.0" = { name = "to-vfile"; packageName = "to-vfile"; @@ -37761,6 +38283,15 @@ let sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; }; }; + "ua-parser-js-0.7.20" = { + name = "ua-parser-js"; + packageName = "ua-parser-js"; + version = "0.7.20"; + src = fetchurl { + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz"; + sha512 = "8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw=="; + }; + }; "uc.micro-1.0.6" = { name = "uc.micro"; packageName = "uc.micro"; @@ -38778,6 +39309,15 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; + "urlsafe-base64-1.0.0" = { + name = "urlsafe-base64"; + packageName = "urlsafe-base64"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz"; + sha1 = "23f89069a6c62f46cf3a1d3b00169cefb90be0c6"; + }; + }; "use-3.1.1" = { name = "use"; packageName = "use"; @@ -39147,6 +39687,15 @@ let sha1 = "d2bd5c66db76c13879d96e6a306edc989df978da"; }; }; + "varint-0.0.3" = { + name = "varint"; + packageName = "varint"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-0.0.3.tgz"; + sha1 = "b821de9b04b38b3cd22f72c18d94a9fb72ab3518"; + }; + }; "varint-3.0.1" = { name = "varint"; packageName = "varint"; @@ -39219,6 +39768,15 @@ let sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94"; }; }; + "vasync-1.6.4" = { + name = "vasync"; + packageName = "vasync"; + version = "1.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vasync/-/vasync-1.6.4.tgz"; + sha1 = "dfe93616ad0e7ae801b332a9d88bfc5cdc8e1d1f"; + }; + }; "vendors-1.0.3" = { name = "vendors"; packageName = "vendors"; @@ -39930,6 +40488,15 @@ let sha1 = "7137946585c73fe44882013853bd000c5d687a4e"; }; }; + "web-push-3.3.5" = { + name = "web-push"; + packageName = "web-push"; + version = "3.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/web-push/-/web-push-3.3.5.tgz"; + sha512 = "sukVBk0chRCL4n+Xwurl2TlD4/JmezNv4L2nwlTZx4KwMeUPfmD9TdGl6A6taayNgjObYzp0k0gubAcQCp7TMg=="; + }; + }; "webassemblyjs-1.8.5" = { name = "webassemblyjs"; packageName = "webassemblyjs"; @@ -39957,13 +40524,13 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.36.1" = { + "webpack-4.37.0" = { name = "webpack"; packageName = "webpack"; - version = "4.36.1"; + version = "4.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.36.1.tgz"; - sha512 = "Ej01/N9W8DVyhEpeQnbUdGvOECw0L46FxS12cCOs8gSK7bhUlrbHRnWkjiXckGlHjUrmL89kDpTRIkUk6Y+fKg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.37.0.tgz"; + sha512 = "iJPPvL7XpbcbwOthbzpa2BSPlmGp8lGDokAj/LdWtK80rsPoPOdANSbDBf2GAVLKZD3GhCuQ/gGkgN9HWs0Keg=="; }; }; "webpack-cli-3.3.6" = { @@ -40794,6 +41361,15 @@ let sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; }; }; + "xmlhttprequest-1.8.0" = { + name = "xmlhttprequest"; + packageName = "xmlhttprequest"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz"; + sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc"; + }; + }; "xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" = { name = "xmlhttprequest"; packageName = "xmlhttprequest"; @@ -41173,6 +41749,15 @@ let sha512 = "HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw=="; }; }; + "yarn-1.16.0" = { + name = "yarn"; + packageName = "yarn"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yarn/-/yarn-1.16.0.tgz"; + sha512 = "cfemyGlnWKA1zopUUgebTPf8C4WkPIZ+TJmklwcEAJ4u6oWPtJeAzrsamaGGh/+b1XWe8W51yzAImC4AWbWR1g=="; + }; + }; "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; @@ -41191,6 +41776,15 @@ let sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; }; }; + "yazl-2.5.1" = { + name = "yazl"; + packageName = "yazl"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz"; + sha512 = "phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw=="; + }; + }; "yeast-0.1.2" = { name = "yeast"; packageName = "yeast"; @@ -41623,46 +42217,6 @@ in bypassCache = true; reconstructLock = true; }; - asar = nodeEnv.buildNodePackage { - name = "asar"; - packageName = "asar"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-2.0.1.tgz"; - sha512 = "Vo9yTuUtyFahkVMFaI6uMuX6N7k5DWa6a/8+7ov0/f8Lq9TVR0tUjzSzxQSxT1Y+RJIZgnP7BVb6Uhi+9cjxqA=="; - }; - dependencies = [ - sources."balanced-match-1.0.0" - sources."bluebird-3.5.5" - sources."brace-expansion-1.1.11" - sources."chromium-pickle-js-0.2.0" - sources."commander-2.20.0" - sources."concat-map-0.0.1" - sources."cuint-0.2.2" - sources."fs.realpath-1.0.0" - sources."glob-7.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."rimraf-2.6.3" - sources."tmp-0.1.0" - sources."tmp-promise-1.1.0" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Creating Electron app packages"; - homepage = https://github.com/electron/asar; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; @@ -41708,6 +42262,350 @@ in bypassCache = true; reconstructLock = true; }; + "@antora/site-generator-default" = nodeEnv.buildNodePackage { + name = "_at_antora_slash_site-generator-default"; + packageName = "@antora/site-generator-default"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.0.0.tgz"; + sha512 = "YMor7dPAef4Pqyxbz7/ZqS0k5haxtcIkmEAfTJpGthCtRhrYfOu2iH+ZntnKRCubNdSgs77CRYjpSjm43rQ7FQ=="; + }; + dependencies = [ + sources."@antora/asciidoc-loader-2.0.0" + sources."@antora/content-aggregator-2.0.0" + sources."@antora/content-classifier-2.0.0" + sources."@antora/document-converter-2.0.0" + sources."@antora/expand-path-helper-1.0.0" + sources."@antora/navigation-builder-2.0.0" + sources."@antora/page-composer-2.0.0" + sources."@antora/playbook-builder-2.0.0" + sources."@antora/redirect-producer-2.0.0" + sources."@antora/site-mapper-2.0.0" + sources."@antora/site-publisher-2.0.0" + sources."@antora/ui-loader-2.0.0" + sources."@babel/runtime-7.5.5" + sources."@iarna/toml-2.2.3" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."append-buffer-1.0.2" + sources."argparse-1.0.10" + sources."asciidoctor.js-1.5.9" + sources."async-lock-1.2.2" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.2" + sources."benchmark-1.0.0" + (sources."bl-2.2.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."bops-0.0.7" + sources."brace-expansion-1.1.11" + sources."buffer-crc32-0.2.13" + sources."buffer-equal-1.0.0" + sources."cache-directory-2.0.0" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" + sources."pump-3.0.0" + ]; + }) + sources."camelcase-5.3.1" + sources."camelcase-keys-5.2.0" + sources."clean-git-ref-1.0.3" + sources."clone-2.1.2" + sources."clone-buffer-1.0.0" + sources."clone-response-1.0.2" + sources."clone-stats-1.0.0" + (sources."cloneable-readable-1.1.3" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."commander-2.20.0" + sources."concat-map-0.0.1" + sources."convert-source-map-1.6.0" + (sources."convict-4.4.1" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."core-util-is-1.0.2" + sources."crc-32-1.2.0" + sources."decamelize-1.2.0" + sources."decompress-response-3.3.0" + sources."deep-freeze-0.0.1" + sources."defer-to-connect-1.0.2" + sources."define-properties-1.1.3" + sources."depd-1.1.2" + sources."diff-3.5.0" + sources."diff-lines-1.1.1" + sources."duplexer-0.1.1" + sources."duplexer3-0.1.4" + (sources."duplexify-3.7.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."event-stream-3.3.4" + sources."exit-on-epipe-1.0.1" + sources."extend-3.0.2" + sources."fd-slicer-1.1.0" + (sources."flush-write-stream-1.1.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."from-0.1.7" + sources."fs-extra-7.0.1" + (sources."fs-mkdirp-stream-1.0.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + (sources."get-stream-4.1.0" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) + sources."git-apply-delta-0.0.7" + sources."glob-6.0.4" + sources."glob-parent-3.1.0" + (sources."glob-stream-6.1.0" // { + dependencies = [ + sources."glob-7.1.4" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."globalyzer-0.1.4" + sources."globrex-0.1.2" + sources."got-9.6.0" + sources."graceful-fs-4.2.0" + (sources."gulp-vinyl-zip-2.1.2" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."handlebars-4.1.2" + sources."has-symbols-1.0.0" + sources."http-cache-semantics-4.0.3" + sources."ignore-5.1.2" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-absolute-1.0.0" + sources."is-buffer-1.1.6" + sources."is-extglob-2.1.1" + sources."is-glob-3.1.0" + sources."is-negated-glob-1.0.0" + sources."is-relative-1.0.0" + sources."is-unc-path-1.0.0" + sources."is-utf8-0.2.1" + sources."is-valid-glob-1.0.0" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isomorphic-git-0.47.0" + sources."js-yaml-3.13.1" + sources."json-buffer-3.0.0" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json5-2.1.0" + sources."jsonfile-4.0.0" + sources."keyv-3.1.0" + (sources."lazystream-1.0.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."lead-1.0.0" + sources."lodash-4.17.15" + sources."lodash.clonedeep-4.5.0" + sources."lowercase-keys-1.0.1" + sources."map-obj-3.1.0" + sources."map-stream-0.1.0" + sources."marky-1.2.1" + sources."matcher-1.1.1" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimatch-all-1.1.0" + sources."minimist-1.2.0" + sources."minimisted-2.0.0" + sources."moment-2.22.2" + sources."multi-progress-2.0.0" + sources."neo-async-2.6.1" + sources."nick-0.1.3" + sources."normalize-path-2.1.1" + sources."normalize-url-4.3.0" + sources."now-and-later-2.0.1" + sources."object-keys-1.1.1" + sources."object.assign-4.1.0" + sources."once-1.4.0" + sources."opal-runtime-1.0.11" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) + (sources."ordered-read-streams-1.0.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."p-cancelable-1.1.0" + sources."pako-1.0.10" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."pause-stream-0.0.11" + sources."pend-1.2.0" + sources."pify-4.0.1" + sources."prepend-http-2.0.0" + sources."printj-1.1.2" + sources."process-nextick-args-2.0.1" + sources."progress-1.1.8" + sources."pump-2.0.1" + sources."pumpify-1.5.1" + sources."queue-4.5.1" + sources."quick-lru-1.1.0" + sources."readable-stream-3.4.0" + sources."regenerator-runtime-0.13.3" + sources."remove-bom-buffer-3.0.0" + (sources."remove-bom-stream-1.2.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."remove-trailing-separator-1.1.0" + sources."replace-ext-1.0.0" + sources."require-from-string-2.0.2" + sources."resolve-options-1.1.0" + sources."responselike-1.0.2" + sources."safe-buffer-5.1.2" + sources."sha.js-2.4.11" + sources."simple-concat-1.0.0" + sources."simple-get-3.0.3" + sources."source-map-0.6.1" + sources."split-0.3.3" + sources."split2-3.1.1" + sources."sprintf-js-1.0.3" + sources."stream-combiner-0.0.4" + sources."stream-shift-1.0.0" + sources."stream-source-0.3.5" + sources."string_decoder-1.2.0" + sources."through-2.3.8" + sources."through2-3.0.1" + (sources."through2-filter-3.0.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."to-absolute-glob-2.0.2" + sources."to-readable-stream-1.0.0" + (sources."to-through-2.0.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."to-utf8-0.0.1" + sources."uglify-js-3.6.0" + sources."unc-path-regex-0.1.2" + sources."unique-stream-2.3.1" + sources."universalify-0.1.2" + sources."url-parse-lax-3.0.0" + sources."util-deprecate-1.0.2" + sources."validator-10.8.0" + sources."value-or-function-3.0.0" + sources."varint-0.0.3" + sources."vinyl-2.2.0" + (sources."vinyl-fs-3.0.3" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."vinyl-sourcemap-1.1.0" + sources."wordwrap-0.0.3" + sources."wrappy-1.0.2" + sources."xdg-basedir-3.0.0" + sources."xmlhttprequest-1.8.0" + sources."xtend-4.0.2" + sources."yargs-parser-11.0.0" + sources."yauzl-2.10.0" + sources."yazl-2.5.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The default site generator pipeline for producing and publishing static documentation sites with Antora."; + homepage = https://antora.org/; + license = "MPL-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + asar = nodeEnv.buildNodePackage { + name = "asar"; + packageName = "asar"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/asar/-/asar-2.0.1.tgz"; + sha512 = "Vo9yTuUtyFahkVMFaI6uMuX6N7k5DWa6a/8+7ov0/f8Lq9TVR0tUjzSzxQSxT1Y+RJIZgnP7BVb6Uhi+9cjxqA=="; + }; + dependencies = [ + sources."balanced-match-1.0.0" + sources."bluebird-3.5.5" + sources."brace-expansion-1.1.11" + sources."chromium-pickle-js-0.2.0" + sources."commander-2.20.0" + sources."concat-map-0.0.1" + sources."cuint-0.2.2" + sources."fs.realpath-1.0.0" + sources."glob-7.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."rimraf-2.6.3" + sources."tmp-0.1.0" + sources."tmp-promise-1.1.0" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Creating Electron app packages"; + homepage = https://github.com/electron/asar; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; aws-azure-login = nodeEnv.buildNodePackage { name = "aws-azure-login"; packageName = "aws-azure-login"; @@ -41724,7 +42622,7 @@ in sources."ansi-styles-3.2.1" sources."ast-types-0.13.2" sources."async-limiter-1.0.0" - sources."aws-sdk-2.496.0" + sources."aws-sdk-2.497.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.0" sources."bluebird-3.5.5" @@ -41857,7 +42755,7 @@ in sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."punycode-1.3.2" - sources."puppeteer-1.18.1" + sources."puppeteer-1.19.0" sources."querystring-0.2.0" sources."raw-body-2.4.1" sources."readable-stream-3.4.0" @@ -44667,7 +45565,7 @@ in ]; }) sources."hypercore-crypto-1.0.0" - (sources."hypercore-protocol-6.11.0" // { + (sources."hypercore-protocol-6.11.1" // { dependencies = [ sources."varint-5.0.0" ]; @@ -45247,7 +46145,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.496.0" + sources."aws-sdk-2.497.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -50035,7 +50933,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.28.19" + sources."terminal-kit-1.28.25" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -50554,7 +51452,7 @@ in sources."p-limit-2.2.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."package-json-6.4.0" + sources."package-json-6.5.0" sources."parseurl-1.3.3" sources."path-exists-3.0.0" sources."path-is-inside-1.0.2" @@ -50574,7 +51472,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."registry-auth-token-3.4.0" + sources."registry-auth-token-4.0.0" sources."registry-url-5.1.0" (sources."request-2.88.0" // { dependencies = [ @@ -51227,10 +52125,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.16.1.tgz"; - sha512 = "MjVOWbSq5GABjfSG4q4wTw2eOTTFR5pwNmbDioI3nmrGsXI/kzzo3iRPTJlqL1klL+7O6s3lio7838vsPz9Iew=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.16.2.tgz"; + sha512 = "El4BJ3/h2Dw1TIMNk/30v6CXZrX85sVANMan5wmAaEGhlKwUGPV4HZLa7trFYCUSYgT4dL4pN15Vv3L48oYX/A=="; }; dependencies = [ (sources."@evocateur/libnpmaccess-3.1.2" // { @@ -51250,10 +52148,10 @@ in sources."semver-5.7.0" ]; }) - sources."@lerna/add-3.16.1" + sources."@lerna/add-3.16.2" sources."@lerna/batch-packages-3.16.0" - sources."@lerna/bootstrap-3.16.1" - sources."@lerna/changed-3.16.1" + sources."@lerna/bootstrap-3.16.2" + sources."@lerna/changed-3.16.2" sources."@lerna/check-working-tree-3.14.2" sources."@lerna/child-process-3.14.2" sources."@lerna/clean-3.16.0" @@ -51271,7 +52169,7 @@ in sources."pify-4.0.1" ]; }) - sources."@lerna/create-symlink-3.16.0" + sources."@lerna/create-symlink-3.16.2" sources."@lerna/describe-ref-3.14.2" sources."@lerna/diff-3.16.0" sources."@lerna/exec-3.16.0" @@ -51285,7 +52183,7 @@ in sources."@lerna/has-npm-version-3.16.0" sources."@lerna/import-3.16.0" sources."@lerna/init-3.16.0" - sources."@lerna/link-3.16.0" + sources."@lerna/link-3.16.2" sources."@lerna/list-3.16.0" sources."@lerna/listable-3.16.0" sources."@lerna/log-packed-3.16.0" @@ -51296,7 +52194,7 @@ in }) sources."@lerna/npm-dist-tag-3.16.0" sources."@lerna/npm-install-3.16.0" - (sources."@lerna/npm-publish-3.16.1" // { + (sources."@lerna/npm-publish-3.16.2" // { dependencies = [ sources."pify-4.0.1" ]; @@ -51304,30 +52202,30 @@ in sources."@lerna/npm-run-script-3.14.2" sources."@lerna/otplease-3.16.0" sources."@lerna/output-3.13.0" - sources."@lerna/pack-directory-3.16.1" + sources."@lerna/pack-directory-3.16.2" sources."@lerna/package-3.16.0" sources."@lerna/package-graph-3.16.0" sources."@lerna/prerelease-id-from-version-3.16.0" sources."@lerna/project-3.16.0" sources."@lerna/prompt-3.13.0" - sources."@lerna/publish-3.16.1" + sources."@lerna/publish-3.16.2" sources."@lerna/pulse-till-done-3.13.0" sources."@lerna/query-graph-3.16.0" sources."@lerna/resolve-symlink-3.16.0" sources."@lerna/rimraf-dir-3.14.2" sources."@lerna/run-3.16.0" - sources."@lerna/run-lifecycle-3.16.1" + sources."@lerna/run-lifecycle-3.16.2" sources."@lerna/run-parallel-batches-3.16.0" sources."@lerna/run-topologically-3.16.0" - sources."@lerna/symlink-binary-3.16.0" - sources."@lerna/symlink-dependencies-3.16.0" + sources."@lerna/symlink-binary-3.16.2" + sources."@lerna/symlink-dependencies-3.16.2" sources."@lerna/timer-3.13.0" sources."@lerna/validation-error-3.13.0" - sources."@lerna/version-3.16.1" + sources."@lerna/version-3.16.2" 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.3.1" // { + (sources."@octokit/endpoint-5.3.2" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" @@ -51341,11 +52239,12 @@ in ]; }) sources."@octokit/request-error-1.0.4" - sources."@octokit/rest-16.28.5" + sources."@octokit/rest-16.28.6" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" sources."@types/node-12.6.8" + sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" @@ -51354,6 +52253,7 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" @@ -51439,7 +52339,6 @@ in ]; }) sources."clone-1.0.4" - sources."cmd-shim-2.0.2" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" @@ -51804,11 +52703,13 @@ in ]; }) sources."mkdirp-0.5.1" + sources."mkdirp-promise-5.0.1" sources."modify-values-1.0.1" sources."move-concurrently-1.0.1" sources."ms-2.1.2" sources."multimatch-3.0.0" sources."mute-stream-0.0.7" + sources."mz-2.7.0" sources."nanomatch-1.2.13" sources."neo-async-2.6.1" sources."nice-try-1.0.5" @@ -51827,7 +52728,7 @@ in }) sources."normalize-url-3.3.0" sources."npm-bundled-1.0.6" - sources."npm-lifecycle-3.0.0" + sources."npm-lifecycle-3.1.2" (sources."npm-package-arg-6.1.0" // { dependencies = [ sources."semver-5.7.0" @@ -52079,6 +52980,8 @@ in sources."temp-dir-1.0.0" sources."temp-write-3.4.0" sources."text-extensions-2.0.0" + sources."thenify-3.3.0" + sources."thenify-all-1.6.0" sources."through-2.3.8" sources."through2-2.0.5" sources."tmp-0.0.33" @@ -53576,7 +54479,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.198" + sources."electron-to-chromium-1.3.199" sources."elliptic-6.5.0" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" @@ -54363,7 +55266,7 @@ in sources."vm-browserify-1.1.0" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.36.1" // { + (sources."webpack-4.37.0" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -57573,7 +58476,7 @@ 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."package-json-6.5.0" (sources."pacote-9.5.4" // { dependencies = [ sources."semver-5.7.0" @@ -57616,7 +58519,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."registry-auth-token-3.4.0" + 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" // { @@ -58918,7 +59821,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.198" + sources."electron-to-chromium-1.3.199" sources."elliptic-6.5.0" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -60793,10 +61696,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.195.1"; + version = "1.197.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.195.1.tgz"; - sha512 = "PJ5K8W+gTkg/CktePxvhahiHZ75PC6ZPVpsk2icYX9nx9Fx4VYZ8pt8GJYo31KLrlwENG3WxBNV5xas+dd2csg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.197.0.tgz"; + sha512 = "qZSQ0nW+ow1sjogLME3CumXgMJXpm37lyhikt8SurGUH8ogkq4Q7s7Md9ercJJpEd9+LVjKJY4IBp+2Qv4HInw=="; }; dependencies = [ sources."@snyk/composer-lockfile-parser-1.0.3" @@ -61104,7 +62007,7 @@ in sources."semver-5.7.0" ]; }) - (sources."snyk-sbt-plugin-2.5.7" // { + (sources."snyk-sbt-plugin-2.6.0" // { dependencies = [ sources."tmp-0.1.0" ]; @@ -64044,6 +64947,401 @@ in bypassCache = true; reconstructLock = true; }; + thelounge = nodeEnv.buildNodePackage { + name = "thelounge"; + packageName = "thelounge"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thelounge/-/thelounge-3.1.1.tgz"; + sha512 = "TaYiWjvP5wjKAob3qMr8Ks+C8LfTxIohrhZ8b4DuilHlZCpIeEgADXs2K8u+ZVSMJ6GHOQKvpCogSE30sTL36A=="; + }; + dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."abbrev-1.1.1" + sources."abstract-logging-1.0.0" + sources."accepts-1.3.7" + sources."after-0.8.2" + sources."agent-base-4.3.0" + sources."ajv-6.10.2" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" + sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."array-flatten-1.1.1" + sources."arraybuffer.slice-0.0.7" + sources."asn1-0.2.3" + sources."asn1.js-5.2.0" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."backo2-1.0.2" + sources."backoff-2.5.0" + sources."balanced-match-1.0.0" + sources."base64-arraybuffer-0.1.5" + sources."base64id-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bcryptjs-2.4.3" + sources."better-assert-1.0.2" + sources."blob-0.0.5" + sources."bn.js-4.11.8" + sources."body-parser-1.19.0" + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-equal-constant-time-1.0.1" + sources."busboy-0.3.1" + sources."bytes-3.1.0" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."callsite-1.0.0" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."cheerio-0.22.0" + sources."chownr-1.1.2" + sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.8" + sources."commander-2.20.0" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + sources."component-inherit-0.0.3" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."core-js-3.1.4" + sources."core-util-is-1.0.2" + sources."css-select-1.2.0" + sources."css-what-2.1.3" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."defer-to-connect-1.0.2" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."detect-libc-1.0.3" + sources."dicer-0.3.0" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.5.1" + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" + sources."ecdsa-sig-formatter-1.0.11" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.1" + (sources."engine.io-3.3.2" // { + dependencies = [ + sources."cookie-0.3.1" + sources."debug-3.1.0" + ]; + }) + (sources."engine.io-client-3.3.2" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."engine.io-parser-2.1.3" + sources."entities-1.1.2" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."eventemitter3-2.0.3" + sources."express-4.17.1" + sources."extend-3.0.2" + sources."extsprintf-1.2.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-text-encoding-1.0.0" + sources."file-type-12.0.1" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-4.1.0" + sources."finalhandler-1.1.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-extra-8.1.0" + sources."fs-minipass-1.2.6" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."get-stream-4.1.0" + sources."getpass-0.1.7" + sources."glob-7.1.4" + sources."got-9.6.0" + sources."graceful-fs-4.2.0" + sources."grapheme-splitter-1.0.4" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-binary2-1.0.3" + sources."has-cors-1.1.0" + sources."has-flag-3.0.0" + sources."has-unicode-2.0.1" + sources."htmlparser2-3.10.1" + sources."http-cache-semantics-4.0.3" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-signature-1.2.0" + sources."http_ece-1.1.0" + (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."ignore-walk-3.0.1" + sources."indexof-0.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."ipaddr.js-1.9.0" + sources."irc-framework-4.4.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-2.0.1" + sources."isomorphic-textencoder-1.0.1" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-buffer-3.0.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-4.0.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."extsprintf-1.3.0" + ]; + }) + sources."jwa-1.4.1" + sources."jws-3.2.2" + sources."keyv-3.1.0" + (sources."ldap-filter-0.2.2" // { + dependencies = [ + sources."assert-plus-0.1.5" + ]; + }) + sources."linkify-it-2.1.0" + sources."lodash-4.17.14" + sources."lodash.assignin-4.2.0" + sources."lodash.bind-4.2.1" + sources."lodash.defaults-4.2.0" + sources."lodash.filter-4.6.0" + sources."lodash.flatten-4.4.0" + sources."lodash.foreach-4.5.0" + sources."lodash.map-4.6.0" + sources."lodash.merge-4.6.2" + sources."lodash.pick-4.4.0" + sources."lodash.reduce-4.6.0" + sources."lodash.reject-4.6.0" + sources."lodash.some-4.6.0" + sources."lowercase-keys-1.0.1" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."middleware-handler-0.2.0" + sources."mime-1.6.0" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-response-1.0.1" + sources."minimalistic-assert-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."ms-2.0.0" + sources."mute-stream-0.0.8" + sources."nan-2.14.0" + (sources."needle-2.4.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."negotiator-0.6.2" + (sources."node-pre-gyp-0.11.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) + sources."nopt-4.0.1" + sources."normalize-url-4.3.0" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.4" + sources."npmlog-4.1.2" + sources."nth-check-1.0.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."object-component-0.0.3" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-cancelable-1.1.0" + sources."p-finally-1.0.0" + sources."p-try-2.2.0" + sources."package-json-6.4.0" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" + sources."parseurl-1.3.3" + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."performance-now-2.1.0" + sources."pify-4.0.1" + sources."precond-0.2.3" + sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.1" + sources."proxy-addr-2.0.5" + sources."psl-1.2.0" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."rc-1.2.8" + sources."read-1.0.7" + sources."read-chunk-3.2.0" + sources."readable-stream-3.4.0" + sources."regenerator-runtime-0.13.3" + sources."registry-auth-token-3.4.0" + sources."registry-url-5.1.0" + (sources."request-2.88.0" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) + sources."responselike-1.0.2" + sources."rimraf-2.6.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-6.2.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.1" + sources."signal-exit-3.0.2" + (sources."socket.io-2.2.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + sources."socket.io-adapter-1.1.1" + (sources."socket.io-client-2.2.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."socket.io-parser-3.3.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."socksjs-0.5.0" // { + dependencies = [ + sources."ipaddr.js-0.1.3" + ]; + }) + sources."sqlite3-4.0.9" + sources."sshpk-1.16.1" + sources."statuses-1.5.0" + sources."streamsearch-0.1.2" + sources."string-width-1.0.2" + sources."string_decoder-1.2.0" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."strip-outer-1.0.1" + sources."supports-color-5.5.0" + sources."tar-4.4.10" + sources."thelounge-ldapjs-non-maintained-fork-1.0.4" + sources."tlds-1.203.1" + sources."to-array-0.1.4" + sources."to-readable-stream-1.0.0" + sources."toidentifier-1.0.0" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."trim-repeated-1.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.18" + sources."ua-parser-js-0.7.20" + sources."uc.micro-1.0.6" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."uri-js-4.2.2" + sources."url-parse-lax-3.0.0" + sources."urlsafe-base64-1.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.3.2" + sources."vary-1.1.2" + (sources."vasync-1.6.4" // { + dependencies = [ + sources."verror-1.6.0" + ]; + }) + sources."verror-1.10.0" + sources."web-push-3.3.5" + sources."wide-align-1.1.3" + sources."with-open-file-0.1.6" + sources."wrappy-1.0.2" + sources."ws-6.1.4" + sources."xmlhttprequest-ssl-1.5.5" + sources."yallist-3.0.3" + sources."yarn-1.16.0" + sources."yeast-0.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The self-hosted Web IRC client"; + homepage = https://thelounge.chat/; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; @@ -65585,7 +66883,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.198" + sources."electron-to-chromium-1.3.199" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."entities-1.1.2" @@ -65981,7 +67279,7 @@ in }) sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."prismjs-1.16.0" + sources."prismjs-1.17.1" sources."private-0.1.8" sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" @@ -67446,10 +68744,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.36.1"; + version = "4.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.36.1.tgz"; - sha512 = "Ej01/N9W8DVyhEpeQnbUdGvOECw0L46FxS12cCOs8gSK7bhUlrbHRnWkjiXckGlHjUrmL89kDpTRIkUk6Y+fKg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.37.0.tgz"; + sha512 = "iJPPvL7XpbcbwOthbzpa2BSPlmGp8lGDokAj/LdWtK80rsPoPOdANSbDBf2GAVLKZD3GhCuQ/gGkgN9HWs0Keg=="; }; dependencies = [ sources."@webassemblyjs/ast-1.8.5" @@ -68264,9 +69562,9 @@ in sources."bencode-2.0.1" sources."binary-search-1.3.5" sources."bitfield-2.0.0" - (sources."bittorrent-dht-9.0.0" // { + (sources."bittorrent-dht-9.0.1" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-4.1.1" sources."ms-2.1.2" ]; }) @@ -69552,7 +70850,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.195.1" // { + (sources."snyk-1.197.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."debug-3.2.6" @@ -69632,7 +70930,7 @@ in sources."semver-5.7.0" ]; }) - (sources."snyk-sbt-plugin-2.5.7" // { + (sources."snyk-sbt-plugin-2.6.0" // { dependencies = [ sources."semver-6.2.0" ]; @@ -69652,7 +70950,7 @@ in sources."es6-promisify-5.0.0" ]; }) - sources."sonic-boom-0.7.4" + sources."sonic-boom-0.7.5" sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-support-0.5.12" @@ -69787,9 +71085,11 @@ in sources."is-ci-2.0.0" sources."is-npm-3.0.0" sources."latest-version-5.1.0" - sources."package-json-6.4.0" + sources."package-json-6.5.0" sources."prepend-http-2.0.0" + sources."registry-auth-token-4.0.0" sources."registry-url-5.1.0" + sources."semver-6.2.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" sources."type-fest-0.3.1" diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index e02ec8eeb1e..210c35c1db6 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -13,13 +13,13 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "ajv-6.10.0" = { + "ajv-6.10.2" = { name = "ajv"; packageName = "ajv"; - version = "6.10.0"; + version = "6.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; - sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; }; }; "ansi-regex-2.1.1" = { @@ -256,13 +256,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "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=="; }; }; "class-utils-0.3.6" = { @@ -1786,6 +1786,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-regex-1.1.0" = { name = "safe-regex"; packageName = "safe-regex"; @@ -1957,13 +1966,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=="; }; }; "split-string-3.1.0" = { @@ -2591,7 +2600,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.10.0" + sources."ajv-6.10.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -2607,7 +2616,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" @@ -2710,12 +2719,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" @@ -2725,11 +2738,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" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 3e5acf2e852..8f78d6fb227 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -4,6 +4,114 @@ let sources = { + "@babel/code-frame-7.5.5" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw=="; + }; + }; + "@babel/core-7.5.5" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz"; + sha512 = "i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg=="; + }; + }; + "@babel/generator-7.5.5" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz"; + sha512 = "ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ=="; + }; + }; + "@babel/helper-function-name-7.1.0" = { + name = "_at_babel_slash_helper-function-name"; + packageName = "@babel/helper-function-name"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; + sha512 = "A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw=="; + }; + }; + "@babel/helper-get-function-arity-7.0.0" = { + name = "_at_babel_slash_helper-get-function-arity"; + packageName = "@babel/helper-get-function-arity"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; + sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ=="; + }; + }; + "@babel/helper-split-export-declaration-7.4.4" = { + name = "_at_babel_slash_helper-split-export-declaration"; + packageName = "@babel/helper-split-export-declaration"; + version = "7.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; + sha512 = "Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q=="; + }; + }; + "@babel/helpers-7.5.5" = { + name = "_at_babel_slash_helpers"; + packageName = "@babel/helpers"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz"; + sha512 = "nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g=="; + }; + }; + "@babel/highlight-7.5.0" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz"; + sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ=="; + }; + }; + "@babel/parser-7.5.5" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz"; + sha512 = "E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g=="; + }; + }; + "@babel/template-7.4.4" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz"; + sha512 = "CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw=="; + }; + }; + "@babel/traverse-7.5.5" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz"; + sha512 = "MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ=="; + }; + }; + "@babel/types-7.5.5" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz"; + sha512 = "s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw=="; + }; + }; "@sailshq/lodash-3.10.3" = { name = "_at_sailshq_slash_lodash"; packageName = "@sailshq/lodash"; @@ -40,13 +148,13 @@ let sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w=="; }; }; - "@types/node-8.10.49" = { + "@types/node-8.10.51" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.49"; + version = "8.10.51"; 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.51.tgz"; + sha512 = "cArrlJp3Yv6IyFT/DYe+rlO8o3SIHraALbBW/+CcCYW/a9QucpLI+n2p4sRxAvl2O35TiecpX2heSZtJjvEO+Q=="; }; }; "JSV-4.0.2" = { @@ -175,13 +283,13 @@ let sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; }; }; - "ajv-6.10.0" = { + "ajv-6.10.2" = { name = "ajv"; packageName = "ajv"; - version = "6.10.0"; + version = "6.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; - sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; }; }; "align-text-0.1.4" = { @@ -238,6 +346,15 @@ let sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; "append-field-1.0.0" = { name = "append-field"; packageName = "append-field"; @@ -517,13 +634,13 @@ let sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; }; }; - "async-2.6.2" = { + "async-2.6.3" = { name = "async"; packageName = "async"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; - sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; + url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; + sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; }; }; "async-limiter-1.0.0" = { @@ -553,13 +670,13 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; - "aws-sdk-2.486.0" = { + "aws-sdk-2.497.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.486.0"; + version = "2.497.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.497.0.tgz"; + sha512 = "SCAVfWqj0qe22Lj6ZHMP/4autc9x3GqgWTj3YrE3VleSuql62xhyCC9gSYfbm7wo8Puqx0+kEnKYyyXR7Z98QA=="; }; }; "aws-sign2-0.6.0" = { @@ -886,13 +1003,13 @@ let sha512 = "IM5nUITXMgTFTF4avRxsz/oLcMXLSZEzpukulRRpO1emXBI4EgSIr0++hUo+AZ94MINE2C4DXgCDiQ9P0suYXw=="; }; }; - "azure-common-0.9.20" = { + "azure-common-0.9.22" = { name = "azure-common"; packageName = "azure-common"; - version = "0.9.20"; + version = "0.9.22"; src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.20.tgz"; - sha512 = "0gxFOLV12poak+raLYAU4z9JAZEafYSo9LrS+7WlToOawb2Ye2BfHYAGfLBkQrAZbo/NHpJ28/IaiUZVqiZ4fQ=="; + url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.22.tgz"; + sha512 = "0r9tK9D+1xl2/VPVtfmGmtkMqfooiBLS87fX+Ab0hOCPVVe/6CgVC4in0wSf2Ta8r65DbvxV5P4/t8fp8Q3EsQ=="; }; }; "azure-gallery-2.0.0-pre.18" = { @@ -949,60 +1066,6 @@ let sha512 = "IGLs5Xj6kO8Ii90KerQrrwuJKexLgSwYC4oLWmc11mzKe7Jt2E5IVg+ZQ8K53YWZACtVTMBNO3iGuA+4ipjJxQ=="; }; }; - "babel-code-frame-6.26.0" = { - name = "babel-code-frame"; - packageName = "babel-code-frame"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; - sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; - }; - }; - "babel-core-6.26.3" = { - name = "babel-core"; - packageName = "babel-core"; - version = "6.26.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz"; - sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA=="; - }; - }; - "babel-generator-6.26.1" = { - name = "babel-generator"; - packageName = "babel-generator"; - version = "6.26.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz"; - sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA=="; - }; - }; - "babel-helpers-6.24.1" = { - name = "babel-helpers"; - packageName = "babel-helpers"; - version = "6.24.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; - sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; - }; - }; - "babel-messages-6.23.0" = { - name = "babel-messages"; - packageName = "babel-messages"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; - sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; - }; - }; - "babel-register-6.26.0" = { - name = "babel-register"; - packageName = "babel-register"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"; - sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; - }; - }; "babel-runtime-6.26.0" = { name = "babel-runtime"; packageName = "babel-runtime"; @@ -1012,24 +1075,6 @@ let sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; }; }; - "babel-template-6.26.0" = { - name = "babel-template"; - packageName = "babel-template"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz"; - sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; - }; - }; - "babel-traverse-6.26.0" = { - name = "babel-traverse"; - packageName = "babel-traverse"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz"; - sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; - }; - }; "babel-types-6.26.0" = { name = "babel-types"; packageName = "babel-types"; @@ -1471,6 +1516,15 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; "chance-1.0.18" = { name = "chance"; packageName = "chance"; @@ -1498,13 +1552,13 @@ let sha512 = "Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA=="; }; }; - "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=="; }; }; "class-utils-0.3.6" = { @@ -1579,6 +1633,24 @@ let sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; "colors-0.6.2" = { name = "colors"; packageName = "colors"; @@ -2164,15 +2236,6 @@ let sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; }; }; - "detect-indent-4.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; - sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; - }; - }; "detect-libc-1.0.3" = { name = "detect-libc"; packageName = "detect-libc"; @@ -2758,13 +2821,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=="; }; }; "formidable-1.2.1" = { @@ -3001,13 +3064,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "globals-9.18.0" = { + "globals-11.12.0" = { name = "globals"; packageName = "globals"; - version = "9.18.0"; + version = "11.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; "gm-1.23.1" = { @@ -3118,6 +3181,15 @@ let sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; }; }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; "has-unicode-2.0.1" = { name = "has-unicode"; packageName = "has-unicode"; @@ -3208,15 +3280,6 @@ let sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; - "home-or-tmp-2.0.0" = { - name = "home-or-tmp"; - packageName = "home-or-tmp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; - sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; - }; - }; "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; @@ -3406,15 +3469,6 @@ let sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; }; }; - "invariant-2.2.4" = { - name = "invariant"; - packageName = "invariant"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; - sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; - }; - }; "invert-kv-1.0.0" = { name = "invert-kv"; packageName = "invert-kv"; @@ -3577,15 +3631,6 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; "is-fullwidth-code-point-1.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -3838,13 +3883,13 @@ let sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db"; }; }; - "js-tokens-3.0.2" = { + "js-tokens-4.0.0" = { name = "js-tokens"; packageName = "js-tokens"; - version = "3.0.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; - sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; "js-yaml-3.13.1" = { @@ -3883,13 +3928,13 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "jsesc-1.3.0" = { + "jsesc-2.5.2" = { name = "jsesc"; packageName = "jsesc"; - version = "1.3.0"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; - sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; + url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; "json-edm-parser-0.1.2" = { @@ -3946,15 +3991,6 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; - }; - }; "json5-1.0.1" = { name = "json5"; packageName = "json5"; @@ -3964,6 +4000,15 @@ let sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; + "json5-2.1.0" = { + name = "json5"; + packageName = "json5"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz"; + sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ=="; + }; + }; "jsonfile-4.0.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -4252,13 +4297,13 @@ let sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777"; }; }; - "lodash-4.17.11" = { + "lodash-4.17.15" = { name = "lodash"; packageName = "lodash"; - version = "4.17.11"; + version = "4.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; - sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; "lodash.get-4.4.2" = { @@ -4306,15 +4351,6 @@ let sha1 = "7ca7446b083655c377e7512213dc754d52a64a7e"; }; }; - "loose-envify-1.4.0" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; - }; - }; "lru-cache-4.1.5" = { name = "lru-cache"; packageName = "lru-cache"; @@ -4675,13 +4711,13 @@ let sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "ms-rest-2.5.1" = { + "ms-rest-2.5.3" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.5.1"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.5.1.tgz"; - sha512 = "bRRHn/asERilNDXrm4/paFRAljnIh+L6Qo6zQkBUZRXaDiHYDRq4AFCNX4Bau0db+eXlcnjnHyu3A9EjQc4s6Q=="; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.5.3.tgz"; + sha512 = "p0CnzrTzEkS8UTEwgCqT2O5YVK9E8KGBBlJVm3hFtMZvf0dmncKYXWFPyUa4PAsfBL7h4jfu39tOIFTu6exntg=="; }; }; "ms-rest-azure-1.15.7" = { @@ -4702,13 +4738,13 @@ let sha512 = "J6386a9krZ4VtU7CRt+Ypgo9RGf8+d3gjMBkH7zbkM4zzkhbbMOYiPRaZ+bHZcfihkKLlktTgA6rjshTjF329A=="; }; }; - "multer-1.4.1" = { + "multer-1.4.2" = { name = "multer"; packageName = "multer"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/multer/-/multer-1.4.1.tgz"; - sha512 = "zzOLNRxzszwd+61JFuAo0fxdQfvku12aNJgnla0AQ+hHxFmfc/B7jBVuPr5Rmvu46Jze/iJrFpSOsD7afO8SDw=="; + url = "https://registry.npmjs.org/multer/-/multer-1.4.2.tgz"; + sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; }; }; "mustache-2.3.2" = { @@ -5575,15 +5611,6 @@ let sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac"; }; }; - "private-0.1.8" = { - name = "private"; - packageName = "private"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; - sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; - }; - }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -6025,15 +6052,6 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; "request-2.74.0" = { name = "request"; packageName = "request"; @@ -6250,6 +6268,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"; @@ -6277,15 +6304,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sax-0.5.2" = { - name = "sax"; - packageName = "sax"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz"; - sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; - }; - }; "sax-0.5.8" = { name = "sax"; packageName = "sax"; @@ -6556,15 +6574,6 @@ let sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; }; }; - "source-map-support-0.4.18" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.4.18"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"; - sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; - }; - }; "source-map-support-0.5.12" = { name = "source-map-support"; packageName = "source-map-support"; @@ -6610,13 +6619,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=="; }; }; "split-0.2.10" = { @@ -6925,6 +6934,15 @@ let sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; }; }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; "swagger-express-mw-0.7.0" = { name = "swagger-express-mw"; packageName = "swagger-express-mw"; @@ -7078,6 +7096,15 @@ let sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; }; }; + "to-fast-properties-2.0.0" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + }; "to-object-path-0.3.0" = { name = "to-object-path"; packageName = "to-object-path"; @@ -7789,15 +7816,6 @@ let sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; }; }; - "xml2js-0.2.7" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz"; - sha1 = "1838518bb01741cae0878bab4915e494c32306af"; - }; - }; "xml2js-0.2.8" = { name = "xml2js"; packageName = "xml2js"; @@ -7897,13 +7915,13 @@ let sha512 = "jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ=="; }; }; - "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" = { @@ -8029,47 +8047,47 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.13.10"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.13.10.tgz"; - sha512 = "bqkApu0vIEGaUPyS7wKv9BkUpHJTE51B5oJ45VHF5GuBmP8YCGgIUw7z4bluMb7q7SVrpzfc2/RIORwjoz6GOA=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.14.0.tgz"; + sha512 = "42iwEb64YKWuX7E73Q6zIz7/eP6p3SvacSR02LVoTfveitVXTXw5lzW9JFmBQRqua1kdN+YeaPgx8ocz8Ea3wQ=="; }; dependencies = [ + sources."@babel/code-frame-7.5.5" + (sources."@babel/core-7.5.5" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + (sources."@babel/generator-7.5.5" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."@babel/helper-function-name-7.1.0" + sources."@babel/helper-get-function-arity-7.0.0" + sources."@babel/helper-split-export-declaration-7.4.4" + sources."@babel/helpers-7.5.5" + sources."@babel/highlight-7.5.0" + sources."@babel/parser-7.5.5" + sources."@babel/template-7.4.4" + sources."@babel/traverse-7.5.5" + sources."@babel/types-7.5.5" sources."JSV-4.0.2" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" - sources."async-2.6.2" - sources."babel-code-frame-6.26.0" - (sources."babel-core-6.26.3" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - (sources."babel-generator-6.26.1" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."babel-helpers-6.24.1" - sources."babel-messages-6.23.0" - sources."babel-register-6.26.0" - sources."babel-runtime-6.26.0" - sources."babel-template-6.26.0" - sources."babel-traverse-6.26.0" - sources."babel-types-6.26.0" - sources."babylon-6.18.0" + sources."async-2.6.3" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."chalk-1.1.3" + sources."chalk-2.4.2" sources."chmodr-1.2.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."colors-1.3.3" sources."commander-2.20.0" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" - sources."core-js-2.6.9" - sources."debug-2.6.9" - sources."detect-indent-4.0.0" + sources."debug-4.1.1" sources."ejs-2.5.7" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" @@ -8086,62 +8104,44 @@ in sources."is-windows-0.2.0" ]; }) - sources."globals-9.18.0" + sources."globals-11.12.0" sources."graceful-fs-4.2.0" - sources."has-ansi-2.0.0" sources."has-color-0.1.7" - sources."home-or-tmp-2.0.0" + sources."has-flag-3.0.0" sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" - sources."invariant-2.2.4" sources."is-3.3.0" - sources."is-finite-1.0.2" sources."is-windows-1.0.2" sources."isexe-2.0.0" - sources."js-tokens-3.0.2" - sources."jsesc-1.3.0" - sources."json5-0.5.1" + sources."js-tokens-4.0.0" + sources."jsesc-2.5.2" + sources."json5-2.1.0" sources."jsonfile-4.0.0" sources."jsonlint-1.6.2" - sources."lodash-4.17.11" - sources."loose-envify-1.4.0" + sources."lodash-4.17.15" sources."matcher-collection-1.1.2" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.0" sources."moment-2.20.1" - sources."ms-2.0.0" + sources."ms-2.1.2" sources."node.extend-2.0.0" (sources."nomnom-1.8.1" // { dependencies = [ sources."ansi-styles-1.0.0" sources."chalk-0.4.0" - sources."strip-ansi-0.1.1" ]; }) - sources."number-is-nan-1.0.1" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" sources."parse-passwd-1.0.0" - sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."pkginfo-0.4.1" - sources."private-0.1.8" - sources."regenerator-runtime-0.11.1" - sources."repeating-2.0.1" sources."resolve-1.11.1" sources."safe-buffer-5.1.2" sources."sax-0.5.8" - sources."slash-1.0.0" + sources."semver-5.7.0" sources."source-map-0.6.1" - (sources."source-map-support-0.4.18" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."to-fast-properties-1.0.3" + sources."strip-ansi-0.1.1" + sources."supports-color-5.5.0" + sources."to-fast-properties-2.0.0" sources."trim-right-1.0.1" sources."underscore-1.6.0" sources."universalify-0.1.2" @@ -8170,10 +8170,10 @@ in sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ=="; }; dependencies = [ - sources."@types/node-8.10.49" + sources."@types/node-8.10.51" sources."JSV-4.0.2" sources."adal-node-0.1.28" - sources."ajv-6.10.0" + sources."ajv-6.10.2" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -8257,10 +8257,14 @@ in sources."underscore-1.9.1" ]; }) - (sources."azure-common-0.9.20" // { + (sources."azure-common-0.9.22" // { dependencies = [ sources."validator-9.4.1" - sources."xml2js-0.2.7" + (sources."xml2js-0.4.19" // { + dependencies = [ + sources."xmlbuilder-9.0.7" + ]; + }) ]; }) sources."azure-gallery-2.0.0-pre.18" @@ -8275,6 +8279,7 @@ in (sources."azure-storage-2.10.3" // { dependencies = [ sources."readable-stream-2.0.6" + sources."sax-0.5.8" sources."underscore-1.8.3" sources."validator-9.4.1" sources."xml2js-0.2.8" @@ -8305,6 +8310,7 @@ in dependencies = [ sources."process-nextick-args-2.0.1" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -8339,7 +8345,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.6.2" + sources."async-2.6.3" ]; }) sources."from-0.1.7" @@ -8405,7 +8411,7 @@ in sources."streamline-0.4.11" ]; }) - sources."lodash-4.17.11" + sources."lodash-4.17.15" sources."map-stream-0.1.0" sources."md5.js-1.3.4" sources."mime-db-1.40.0" @@ -8414,7 +8420,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.24.0" - (sources."ms-rest-2.5.1" // { + (sources."ms-rest-2.5.3" // { dependencies = [ sources."through-2.3.8" sources."tunnel-0.0.5" @@ -8487,9 +8493,9 @@ in }) 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-0.5.2" + sources."sax-1.2.4" sources."sntp-1.0.9" sources."source-map-0.1.43" sources."split-0.2.10" @@ -8553,7 +8559,7 @@ in sources."xmlbuilder-0.4.3" sources."xmldom-0.1.27" sources."xpath.js-1.1.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -8870,14 +8876,14 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "5.0.1"; + version = "5.0.3"; 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.3.tgz"; + sha512 = "z/JdtkFGUm0QaQUusvloyYuGDub3nUbOo5de1Fz57cM++osBTvQatBUSTlF1k/w8vFHPxxXW6zxGvkxXSpaBkQ=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.10.0" + sources."ajv-6.10.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -8890,7 +8896,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" @@ -9020,7 +9026,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" @@ -9096,10 +9102,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.5.3"; + version = "3.6.0"; 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.6.0.tgz"; + sha512 = "tjBYCFDvnGdA/FHlOfLn4WZ2Iy1JO8GRFem0RkbtbKO91Z9Jz8v2oYQYkMspY7/7lCBbjQA8+eUatTUu3d6eqw=="; }; buildInputs = globalBuildInputs; meta = { @@ -9162,7 +9168,7 @@ in sources."semver-5.0.3" ]; }) - sources."ajv-6.10.0" + sources."ajv-6.10.2" sources."align-text-0.1.4" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -9179,7 +9185,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" - sources."aws-sdk-2.486.0" + sources."aws-sdk-2.497.0" sources."aws-sign2-0.6.0" sources."aws4-1.8.0" sources."babel-runtime-6.26.0" @@ -9485,7 +9491,7 @@ in }) sources."load-json-file-1.1.0" sources."locate-path-3.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.15" sources."lodash.get-4.4.2" sources."lodash.isequal-4.5.0" sources."long-2.4.0" @@ -9535,7 +9541,7 @@ in sources."mkdirp-0.5.1" sources."moment-2.24.0" sources."ms-2.0.0" - sources."multer-1.4.1" + sources."multer-1.4.2" sources."mustache-2.3.2" sources."mv-2.1.1" sources."my-local-ip-1.0.0" @@ -9720,7 +9726,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."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -9756,7 +9762,7 @@ in (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.6" - sources."form-data-2.4.0" + sources."form-data-2.5.0" sources."ms-2.1.2" sources."qs-6.7.0" sources."readable-stream-2.3.6" @@ -9888,7 +9894,7 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."xpath-0.0.5" sources."xpath.js-1.1.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-2.1.2" (sources."yargs-6.6.0" // { @@ -9942,7 +9948,7 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.10.0" + sources."ajv-6.10.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" @@ -9996,7 +10002,7 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."keypress-0.2.1" - sources."lodash-4.17.11" + sources."lodash-4.17.15" sources."longjohn-0.2.12" sources."mime-db-1.40.0" sources."mime-types-2.1.24" @@ -10021,7 +10027,7 @@ in sources."qs-6.5.2" sources."request-2.88.0" sources."rimraf-2.2.8" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-5.6.0" sources."source-map-0.6.1" diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index bcaa844720b..2a8b5e7960d 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -2,10 +2,11 @@ , buildPythonPackage , fetchPypi , setuptools_scm -, pythonOlder +, isPy3k +, pytest }: -if !(pythonOlder "3.3") then null else buildPythonPackage rec { +buildPythonPackage rec { pname = "backports.functools_lru_cache"; version = "1.5"; @@ -15,7 +16,15 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec { }; buildInputs = [ setuptools_scm ]; - doCheck = false; # No proper test + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + + # Test fail on Python 2 + doCheck = isPy3k; meta = { description = "Backport of functools.lru_cache"; diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index c76e62b0aec..419e8dce212 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.13.1"; + version = "2.13.2"; src = fetchPypi { inherit pname version; - sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484"; + sha256 = "0a73s5q548l2vs2acqs3blkzd9sw6d7ci77fz1pc9156vn3dxm2x"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 08a455eb40c..96602c624a4 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,39 +1,30 @@ -{ stdenv, fetchPypi, buildPythonPackage, fetchpatch -, more-itertools, six -, pytest, pytestcov, portend -, backports_unittest-mock +{ stdenv, fetchPypi, buildPythonPackage +, more-itertools, six, setuptools_scm, setuptools-scm-git-archive +, pytest, pytestcov, portend, pytest-testmon, pytest-mock +, backports_unittest-mock, pyopenssl, requests, trustme, requests-unixsocket , backports_functools_lru_cache }: buildPythonPackage rec { pname = "cheroot"; - version = "6.3.3"; + version = "6.5.5"; src = fetchPypi { inherit pname version; - sha256 = "8e3ac15e1efffc81425a693e99b3c09d7ea4bf947255d8d4c38e2cf76f3a4d25"; + sha256 = "f6a85e005adb5bc5f3a92b998ff0e48795d4d98a0fbb7edde47a7513d4100601"; }; - patches = fetchpatch { - name = "cheroot-fix-setup-python3.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/cheroot-fix-setup-python3.patch?h=packages/python-cheroot&id=9b33cb0885b3c0d91adeacae23761a4321eb0e64"; - sha256 = "1rlgz0qln536y00mfqlf0i9hz3f53id73wh47cg5q2vcsw1w2bpc"; - }; + nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ]; - checkInputs = [ pytest pytestcov portend backports_unittest-mock ]; - -# Disable testmon, it needs pytest-testmon, which we do not currently have in nikpkgs, -# and is only used to skip some tests that are already known to work. - postPatch = '' - substituteInPlace "./pytest.ini" --replace "--testmon" "" - substituteInPlace setup.py --replace "use_scm_version=True" "version=\"${version}\"" \ - --replace "'setuptools_scm>=1.15.0'," "" \ - --replace "'setuptools_scm_git_archive>=1.0'," "" \ - ''; + checkInputs = [ pytest pytestcov portend backports_unittest-mock pytest-mock pytest-testmon pyopenssl requests trustme requests-unixsocket ]; + # Disable doctest plugin because times out + # Deselect test_bind_addr_unix on darwin because times out + # Deselect test_http_over_https_error on darwin because builtin cert fails checkPhase = '' - py.test cheroot + substituteInPlace pytest.ini --replace "--doctest-modules" "" + pytest ${stdenv.lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index daeb6ca4526..d9b9166e0f0 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi , setuptools_scm , cheroot, contextlib2, portend, routes, six, zc_lockfile , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "cherrypy"; - version = "17.4.1"; + version = "17.4.2"; src = fetchPypi { pname = "CherryPy"; inherit version; - sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv"; + sha256 = "ef1619ad161f526745d4f0e4e517753d9d985814f1280e330661333d2ba05cdf"; }; propagatedBuildInputs = [ @@ -25,10 +25,10 @@ buildPythonPackage rec { ]; checkPhase = '' - pytest + pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"} ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = https://www.cherrypy.org; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index a0c8d24889d..75152d39aeb 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , setuptools_scm , cheroot, portend, more-itertools, zc_lockfile, routes , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services @@ -29,11 +29,13 @@ buildPythonPackage rec { objgraph pytest pytestcov pathpy requests_toolbelt pytest-services ]; + # Disable doctest plugin because times out checkPhase = '' - pytest + substituteInPlace pytest.ini --replace "--doctest-modules" "" + pytest --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes ${stdenv.lib.optionalString stdenv.isDarwin "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"} ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = https://www.cherrypy.org; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 9b2a5c44732..c16c7687c8a 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, stdenv , sphinx , numpydoc , pytest @@ -38,10 +39,10 @@ buildPythonPackage rec { checkInputs = [ sphinx numpydoc pytest ]; propagatedBuildInputs = [ python-lz4 ]; - # test_disk_used is broken - # https://github.com/joblib/joblib/issues/57 + # test_disk_used is broken: https://github.com/joblib/joblib/issues/57 + # test_dispatch_multiprocessing is broken only on Darwin. checkPhase = '' - py.test joblib -k "not test_disk_used" + py.test -k 'not test_disk_used${lib.optionalString (stdenv.isDarwin) " and not test_dispatch_multiprocessing"}' joblib/test ''; meta = { diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index fee314aa6c3..10dbcafd04b 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -1,10 +1,11 @@ -{ lib +{ stdenv , buildPythonPackage , fetchPypi , cmake , numpy , scipy , scikitlearn +, llvmPackages ? null }: buildPythonPackage rec { @@ -20,6 +21,19 @@ buildPythonPackage rec { cmake ]; + # we never actually explicitly call the install command so this is the only way + # to inject these options to it - however, openmp-library doesn't appear to have + # any effect, so we have to inject it into NIX_LDFLAGS manually below + postPatch = stdenv.lib.optionalString stdenv.cc.isClang '' + cat >> setup.cfg <=1.1.1" \ - --replace "python-jose<3.0.0" "python-jose<4.0.0" + --replace "jsondiff==1.1.2" "jsondiff~=1.1" + sed -i '/datetime/d' setup.py # should be taken care of by std library ''; propagatedBuildInputs = [ aws-xray-sdk boto boto3 + botocore cfn-lint - dateutil - flask - httpretty + docker + flask # required for server jinja2 - pytz - werkzeug - requests - six - xmltodict + jsondiff mock pyaml - backports_tempfile - cookies - jsondiff - botocore - docker - responses python-jose - ]; + pytz + six + requests + responses + sshpubkeys + werkzeug + xmltodict + ] ++ lib.optionals isPy27 [ backports_tempfile ]; - checkInputs = [ boto3 nose sure freezegun ]; + checkInputs = [ boto3 freezegun nose sure ]; - checkPhase = "nosetests"; + checkPhase = ''nosetests -v ./tests/ \ + -e test_invoke_function_from_sns \ + -e test_invoke_requestresponse_function \ + -e test_context_manager \ + -e test_decorator_start_and_stop''; - # TODO: make this true; I think lots of the tests want network access but we can probably run the others - doCheck = false; + meta = with lib; { + description = "Allows your tests to easily mock out AWS Services"; + homepage = https://github.com/spulec/moto; + license = licenses.asl20; + maintainers = [ ]; + }; } diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 75dcf9b32c4..66e8bb2a735 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "nixpkgs"; - version = "0.2.3"; + version = "0.2.4"; disabled = ! pythonAtLeast "3.5"; src = fetchPypi { inherit pname version; - sha256 = "12ycbv31g4qv14aq6hfb85hhx026lgvzqfsrkpzb64na0c1yjcvn"; + sha256 = "0dlvq4bpamhlva86042wlc0xxfsxlpdgm2adfb1c6y3vjgbm0nvd"; }; buildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index e708ff2ee3e..749a4d4618b 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.8.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3"; + sha256 = "16drs4bc2wvgwwi1pf6pmk6c00pl16vs1v7djc4a8kwpsxpibphf"; }; propagatedBuildInputs = [ six coverage ] diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index a8dc0e9907a..5da7a7941c0 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' - py.test + py.test --deselect=test_portend.py::TestChecker::test_check_port_listening ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index b946740ff92..99ba6845fa0 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycountry"; - version = "18.12.8"; + version = "19.7.15"; src = fetchPypi { inherit pname version; - sha256 = "1phn1av57jbm166facjk6r8gw4pf886q4wymjc443k8m5c5h5i4f"; + sha256 = "15lhv18za0zv36laksr86rszjhp0slmqzcylm6ds9vpd7gyqprb8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index ced2906486a..3f4ee6fea28 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.14"; + version = "0.0.21"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6ebab661eb3ff9f814139924c18a87d0b1cab8a6af98d323e2b1ee313ed856c9"; + sha256 = "0x2nznjnm721qw9nys5ap3b6hq9s48bsd1yj5xih50pvn0rf0nz2"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 1a4cc260ff4..17fb56a0588 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "0.9.16"; + version = "0.9.18"; src = fetchPypi { inherit pname version; - sha256 = "df00594e55f8f8f826e0e345dc23863ebac066eb749f8229c515a0373669c5bb"; + sha256 = "05648f9b22aeeda9d32e61b46fa78c9ff28f217d69005b3b19ffb75d5992187e"; }; buildInputs = [ pytest ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' - pytest test + pytest --deselect=test/test_testmon.py::TestmonDeselect::test_dependent_testmodule ''; meta = with lib; { diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index cc22804d48a..8f3b5a3aacc 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, glibcLocales, mock, pytest, botocore, +{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, mock, pytest, botocore, testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - version = "1.7.1"; + version = "1.7.2"; pname = "Scrapy"; checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; @@ -16,12 +16,6 @@ buildPythonPackage rec { # root and readonly. As a consequence scrapy can't edit the # project templates. ./permissions-fix.patch - - # Fix configparser import for python2. See: https://github.com/scrapy/scrapy/pull/3887 - (fetchpatch { - url = "https://github.com/scrapy/scrapy/commit/21345dc9ec60dcc1cd2e5c0eace5788aa502ce23.patch"; - sha256 = "09834rcjyggvyj6zignvfga2xbqkknygly5p4a96k2mvz0xn3v6z"; - }) ]; LC_ALL="en_US.UTF-8"; @@ -37,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "da8987d199092c3bb33d4d1d021507cd933aa67f5177e2d36f31343e8a6bd7f1"; + sha256 = "7a4ed68cfb44dc86e1895f0fb46257ee4adb1090754ac21faec205763f054464"; }; postInstall = '' diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix new file mode 100644 index 00000000000..9c08871339a --- /dev/null +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: + +buildPythonPackage rec { + pname = "setuptools-scm-git-archive"; + version = "1.1"; + + src = fetchPypi { + inherit version; + pname = "setuptools_scm_git_archive"; + sha256 = "6026f61089b73fa1b5ee737e95314f41cb512609b393530385ed281d0b46c062"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + checkInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "setuptools_scm plugin for git archives"; + homepage = "https://github.com/Changaco/setuptools_scm_git_archive"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix new file mode 100644 index 00000000000..aefb4bd4d4b --- /dev/null +++ b/pkgs/development/python-modules/sshpubkeys/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, cryptography +, ecdsa +}: + +buildPythonPackage rec { + version = "3.1.0"; + pname = "sshpubkeys"; + + src = fetchFromGitHub { + owner = "ojarva"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "1h4gwmcfn84kkqh83km1vfz8sc5kr2g4gzgzmr8gz704jmqiv7nq"; + }; + + propagatedBuildInputs = [ cryptography ecdsa ]; + + meta = with lib; { + description = "OpenSSH Public Key Parser for Python"; + homepage = https://github.com/ojarva/python-sshpubkeys; + license = licenses.bsd3; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 861054ed948..10de193866b 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm +, setuptools_scm, pytest, freezegun, backports_unittest-mock , six, pytz, jaraco_functools }: buildPythonPackage rec { @@ -11,12 +11,17 @@ buildPythonPackage rec { sha256 = "cb60b1d2b1664104e307f8e5269d7f4acdb077c82e35cd57246ae14a3427d2d6"; }; - doCheck = false; - buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six pytz jaraco_functools ]; + checkInputs = [ pytest freezegun backports_unittest-mock ]; + + checkPhase = '' + substituteInPlace pytest.ini --replace "--flake8" "" + pytest + ''; + meta = with lib; { description = "Objects and routines pertaining to date and time"; homepage = https://github.com/jaraco/tempora; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 44b015ed8e0..b372481cec7 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.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "wata727"; repo = pname; rev = "v${version}"; - sha256 = "1p6859lax6cmk2q4pvqw4sm78k80gs2561nxa1gwdna3af211fbp"; + sha256 = "0yk5hygrjkbq5ry2kark3hd59hwjxpgryz0ychr8mhzvlr97aj1k"; }; - modSha256 = "021iqy5a703cymcc66rd1rxnpqa3rnzj37y400s0rmiq0zpkm2nc"; + modSha256 = "096hq0xc3cq45r13pm0s0q9rxd4z0ia6x0wy4xmwgzfb97jvn20p"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 2e8f806d53a..f7b0184f836 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,16 +1,16 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "bazel-buildtools-${version}"; - version = "0.22.0"; + version = "0.28.0"; + rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052"; goPackagePath = "github.com/bazelbuild/buildtools"; - src = fetchFromGitHub { - owner = "bazelbuild"; - repo = "buildtools"; - rev = "55b64c3d2ddfb57f06477c1d94ef477419c96bd6"; - sha256 = "0n6q8pkgy3vvmwyrxvkmjfbcxc31i31czg2bjdzq7awwrr4fdbwy"; + src = fetchgit { + inherit rev; + url = "https://github.com/bazelbuild/buildtools"; + sha256 = "1d8zjgbg77sk27cz9pjz1h6ajwxqmvdzqgwa2jbh6iykibhpadq0"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix index d7cd02c12b8..5bae5b40653 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; }; } { diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix new file mode 100644 index 00000000000..767cd70abcd --- /dev/null +++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchFromGitHub, python2, which}: +stdenv.mkDerivation rec { + name = "redo-apenwarr-${version}"; + + version = "unstable-2019-06-21"; + + src = fetchFromGitHub { + owner = "apenwarr"; + repo = "redo"; + rev = "8924fa35fa7363b531f8e6b48a1328d2407ad5cf"; + sha256 = "1dj20w29najqjyvk0jh5kqbcd10k32rad986q5mzv4v49qcwdc1q"; + }; + + DESTDIR=""; + PREFIX = placeholder "out"; + + patchPhase = '' + patchShebangs . + ''; + + buildInputs = [ python2 which ]; + + meta = with stdenv.lib; { + description = "Apenwarr version of the redo build tool."; + homepage = https://github.com/apenwarr/redo/; + license = stdenv.lib.licenses.asl20; + platforms = platforms.all; + maintainers = with stdenv.lib.maintainers; [ andrewchambers ]; + }; +} diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index 0fcaee57468..0abea99f64a 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -2,24 +2,31 @@ let clang = llvmPackages.clang-unwrapped; - version = stdenv.lib.getVersion clang; -in -stdenv.mkDerivation { - name = "clang-tools-${version}"; +in stdenv.mkDerivation { + pname = "clang-tools"; + version = stdenv.lib.getVersion clang; + dontUnpack = true; + installPhase = '' + runHook preInstall + mkdir -p $out/bin for tool in \ clang-apply-replacements \ clang-check \ clang-format \ clang-rename \ - clang-tidy + clang-tidy \ + clangd do ln -s ${clang}/bin/$tool $out/bin/$tool done + + runHook postInstall ''; + meta = clang.meta // { description = "Standalone command line tools for C++ development"; maintainers = with stdenv.lib.maintainers; [ aherrmann ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index a93b791f7e6..3ced385e9da 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.0.2"; + version = "12.1.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0b1xkksd4rgqvjahp5bf53sk887z2fxwr7rf8vqs9j9aw54zm5cn"; + sha256 = "0zrlprzbjnssrf0qjb80fy50ypryrqhmkqrpad68bnsz7da34idk"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1cjl64g3ymnrs9c3fl28aydfzf18ik4vnjcvijv28c3gm1i6chs0"; + sha256 = "0zsin76qiq46w675wdkaz3ng1i9szad3hzmk5dngdnr59gq5mqhk"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0cbh11libcyfdgrvnl1aa11x90ac7zgn1d9myc4dwmqzfdm4kdlb"; + sha256 = "0npjgarbwih8j2ih1mshwyp4nj9h15phvg61kifh63p9mf4r63nn"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix new file mode 100644 index 00000000000..9f1aa037087 --- /dev/null +++ b/pkgs/development/tools/documentation/antora/default.nix @@ -0,0 +1,25 @@ +{ stdenv, nodePackages_10_x }: + +let + drvName = drv: (builtins.parseDrvName drv).name; + linkNodeDeps = ({ pkg, deps, name ? "" }: + let + targetModule = if name != "" then name else drvName pkg; + in nodePackages_10_x.${pkg}.override (oldAttrs: { + postInstall = '' + mkdir -p $out/lib/node_modules/${targetModule}/node_modules + ${stdenv.lib.concatStringsSep "\n" (map (dep: '' + ln -s ${nodePackages_10_x.${dep}}/lib/node_modules/${drvName dep} \ + $out/lib/node_modules/${targetModule}/node_modules/${drvName dep} + '') deps + )} + ''; + }) +); +in linkNodeDeps { + pkg = "@antora/cli"; + name = "@antora/cli"; + deps = [ + "@antora/site-generator-default" + ]; +} diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix new file mode 100644 index 00000000000..573575f2d4f --- /dev/null +++ b/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraform-lsp"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "juliosueiras"; + repo = pname; + rev = "v${version}"; + sha256 = "018ypvmd9cwys5l7rm1c7b9jf8fljdk0m22id32d88jiw4iwq44m"; + }; + + modSha256 = "1196fn69nnplj7sz5mffawf58j9n7h211shv795gknvfnwavh344"; + + meta = with lib; { + description = "Language Server Protocol for Terraform"; + homepage = "https://github.com/juliosueiras/terraform-lsp"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 268890360b6..50d2349a0ac 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "dune"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "15fx9rg16g7ig43rg4sdq0wp0br5h1mjxxgv8b15s317vqlfc5pd"; + url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz"; + sha256 = "11jl2vavypbgvwblch25q10hsd16myik9b3cd4d64zhxk1fzbzdw"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 91fca663bf2..5d18d344281 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -7,7 +7,7 @@ GEM parser (2.6.3.0) ast (~> 2.4.0) rainbow (3.0.0) - rubocop (0.72.0) + rubocop (0.73.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index 1f83bbf96b7..9eaa50eff95 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "192vmm9ah6b4wyabawaszpr8n3z93y3ymykp3m4pncrbwngmn3m2"; + sha256 = "1b5zc8xaqb5krchjrjqj7sc205awmnpksc4ng0rbckd6xcbr7n0f"; type = "gem"; }; - version = "0.72.0"; + version = "0.73.0"; }; ruby-progressbar = { groups = ["default"]; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix new file mode 100644 index 00000000000..0ca12bd7bf4 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: + +rustPlatform.buildRustPackage rec { + name = "cargo-generate-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "ashleygwilliams"; + repo = "cargo-generate"; + rev = "v${version}"; + sha256 = "0n6na6xq4bvs9hc7vc86qqmlrkv824qdmja27b21l2wz3l77r4jb"; + }; + + cargoSha256 = "00fgzh1s63rr1vs3ahra604m81fc4imx3s09brw2y0n46syhwypi"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "cargo, make me a project"; + homepage = https://github.com/ashleygwilliams/cargo-generate; + license = licenses.asl20; + maintainers = [ maintainers.turbomack ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/rust/rls/default.nix b/pkgs/development/tools/rust/rls/default.nix index f52ab0d767a..0427eadea19 100644 --- a/pkgs/development/tools/rust/rls/default.nix +++ b/pkgs/development/tools/rust/rls/default.nix @@ -1,46 +1,38 @@ { stdenv, fetchFromGitHub, rustPlatform -, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv }: +, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv +, CoreFoundation, Security }: rustPlatform.buildRustPackage rec { - name = "rls-${version}"; + pname = "rls"; # with rust 1.x you can only build rls version 1.x.y - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "rust-lang"; - repo = "rls"; - rev = "0d6f53e1a4adbaf7d83cdc0cb54720203fcb522e"; - sha256 = "1aabs0kr87sp68n9893im5wz21dicip9ixir9a9l56nis4qxpm7i"; + repo = pname; + rev = version; + sha256 = "1l3fvlgfzri8954nbwqxqghjy5wa8p1aiml12r1lqs92dh0g192f"; }; - cargoSha256 = "16r9rmjhb0dbdgx9qf740nsckjazz4z663vaajw5z9i4qh0jsy18"; + cargoSha256 = "0v96ndys6bv5dfjg01chrqrqjc57qqfjw40n6vppi9bpw0f6wkf5"; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; - # clippy is hard to build with stable rust so we disable clippy lints - cargoBuildFlags = [ "--no-default-features" ]; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ openssh openssl curl zlib libiconv ]; + buildInputs = [ openssh openssl curl zlib libiconv ] + ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); doCheck = true; - # the default checkPhase has no way to pass --no-default-features - checkPhase = '' - runHook preCheck - + preCheck = '' # client tests are flaky rm tests/client.rs - - echo "Running cargo test" - cargo test --no-default-features - runHook postCheck ''; meta = with stdenv.lib; { description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; homepage = https://github.com/rust-lang/rls/; - license = licenses.mit; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ symphorien ]; platforms = platforms.all; }; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 0210fdd055a..4fd44880b82 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { name = "minecraft-server-${version}"; - version = "1.14.3"; + version = "1.14.4"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/d0d0fe2b1dc6ab4c65554cb734270872b72dadd6/server.jar"; - sha256 = "0f0v0kqz2v5758551yji1vj6xf43lvbma30v3crz4h7cpzq5c8ll"; + url = "https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar"; + sha256 = "0aapiwgx9bmnwgmrra9459qfl9bw8q50sja4lhhr64kf7amyvkay"; }; preferLocalBuild = true; diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index bd8e9671dda..2556e7d9d83 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sndio-${version}"; - version = "1.5.0"; + version = "1.6.0"; enableParallelBuilding = true; buildInputs = [ alsaLib ]; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "0lyjb962w9qjkm3yywdywi7k2sxa2rl96v5jmrzcpncsfi201iqj"; + sha256 = "1havdx3q4mipgddmd2bnygr1yh6y64567m1yqwjapkhsq550dq4r"; }; meta = with stdenv.lib; { diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e1c7e5de08f..311a3aac8a7 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -384,8 +384,8 @@ let src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "f7d3c25fbefdf53cd5458904209d066545dbddc0"; - sha256 = "1x3al8km0d61p2k42p5q2xkd1xx80hmhbv8l22wj6knrr9mpjmp2"; + rev = "987409e8d350378a5b3ed40c21bceb8f6252c3df"; + sha256 = "11xampj0pk6393qx340ldgpk0131r756156gm1yhk4mlcc4qfbh1"; }; }; @@ -424,12 +424,12 @@ let coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2019-07-09"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "f36feb0251aa668a84f027bd937c93f69bf98c84"; - sha256 = "1hc6hn5qlsvbyc52f0m398kjqw4j4sdqhjzpkxcdssa541fvn7pz"; + rev = "afe3a0854206675f961e96e8514d758224e0a7df"; + sha256 = "06nqmiypg55isa1iaz9k6jnwrb2whj06pmxq4r3jx9r6jgg2zf0g"; }; }; @@ -457,12 +457,12 @@ let coc-smartf = buildVimPluginFrom2Nix { pname = "coc-smartf"; - version = "2019-07-19"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-smartf"; - rev = "12e76fcadda3f0bb16c64b2db2a1f8cd8025c47a"; - sha256 = "0dfr7dcrnf40flcvdydywy5xmpxbrfswcq6vj12kjbwkcxlisj0s"; + rev = "ccc4431b17d1e02a33d005ecc30af8638f32e5a5"; + sha256 = "1gawpziv5qilhw5v7x7ihkmypfkjq22qgar6cfq6332c5rjqk6xi"; }; }; @@ -501,12 +501,12 @@ let coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-07-19"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "0bfb17e090e1dd44ec159c31968e0b5b249430eb"; - sha256 = "1psn13bqj1yxanh45g72npjbv9mzgv2fjnib0fyzvw7460bvqn8r"; + rev = "4cddbdc9ecb92fb1633bd3b89bb9aacc3a5504ce"; + sha256 = "08k6vmdzgws6f9461gjc4psqn2ypwf1nz9sjncs1vddckxwxl9k3"; }; }; @@ -534,12 +534,12 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-07-19"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "ed538dc3b55bb94efe2bc511327d81a90c00e674"; - sha256 = "06anjgidbf04g0wnxkmdzgdszn22afr3sxbsx445cvwinm2q3i87"; + rev = "f8ed02524da46c71e5c3b79e0707cbc6d66666f5"; + sha256 = "1w7lz287b322zan6rqimcmypaf9vq3x0ix1ka9s63qzgnpwg7g1i"; }; }; @@ -777,12 +777,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-07-15"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "3a1b508116652a6c9b4b174ddafaee7852a15fc4"; - sha256 = "18af8d9rmb0x3ln03ph2m0msaji7wvyvyn3xck12y99mpsf1l50w"; + rev = "1b5b057fc5fdae0745b84d15954245ac23618dc2"; + sha256 = "1f96br849xh0xhjny4q29wxzrf1ypgw10sx2s0rfdmbfip32djh4"; }; }; @@ -834,12 +834,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-06-30"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "763c7befa7bbe44aa00a0c832916958a16e71254"; - sha256 = "1dvw8l8f0k9hkfv4n791lgm1lipf5n2xhjyrwx1px92j1h94i8f1"; + rev = "46121d9ca7688c148764d7ee488bb3572d1434c4"; + sha256 = "1hiw42dm12xyhmvg180mrbjv3bbbvrgl4p2abll0lv5l2zmsbf12"; fetchSubmodules = true; }; }; @@ -890,12 +890,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-07-17"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "6e9f26a0cf5d7d60ddf04ce126e4adebe5a01cf2"; - sha256 = "10r7c2jjy2q3wq30rsv7bml0cxjs19hzrfmba4g407yckync92bi"; + rev = "53ad762d357f74c02c04403325f8f9122ba3bade"; + sha256 = "0j2fx981r5bzcw408x1jy82inkly1kc3ciwdyqlhi94lg8sl20jv"; }; }; @@ -945,12 +945,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2019-05-21"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "37bedf88cabb61d4580295b6e347058df7e7f1b4"; - sha256 = "120fi53qp915qnhaqil15b4n22mp4gp5jvi9yirfmsk88hgz2lab"; + rev = "c718cefc51ccdaf7bd27c4c1ae2de55103434241"; + sha256 = "1sbpkv2q68s6qnm03jr1vazvdqqnrgiw53w4jn38dr8l9i2im199"; fetchSubmodules = true; }; }; @@ -1111,6 +1111,17 @@ let }; }; + ghcid = buildVimPluginFrom2Nix { + pname = "ghcid"; + version = "2019-07-04"; + src = fetchFromGitHub { + owner = "ndmitchell"; + repo = "ghcid"; + rev = "08dff021a806c252d8eeccf44fa30e8d4118b137"; + sha256 = "05w4lqqs25m10rpjglkm1ggyssl9kig0nbd0qkg0l38zhc87afjr"; + }; + }; + ghcmod-vim = buildVimPluginFrom2Nix { pname = "ghcmod-vim"; version = "2016-06-19"; @@ -1499,12 +1510,12 @@ let ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2019-04-10"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "e5a7976ad175251a96c537488d2d9557fafdcc8b"; - sha256 = "0jdhbv56vg53vy5yd4322pjyqaidjj0jdbn1ykvi4scci26rzq35"; + rev = "53b6531769e43c7e3c9051e3a12ab31e3e06a422"; + sha256 = "1kf2gfcw0wmyib72na3j2dsw6q4qff1r9lvdbk7cm7iclhwylhma"; }; }; @@ -1653,12 +1664,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-07-16"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "9c0dfbfc90c50ebbfbe53aa5a6094e1b1c806459"; - sha256 = "1rbfhmf1vnvn4p63q3pbdcyqnagb9kvckr0m6dp4hx9pc4d393xd"; + rev = "999b6710ab915de2a3a23ce2a2456e2a295a2cf8"; + sha256 = "18j0d6mvkr5a29d7v14j87lz63svv6f2xm7xi5drl0r4s8lvjmhw"; }; }; @@ -1675,12 +1686,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2019-07-11"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "eac39588c45bda3bcd46f386e063309449f23ff5"; - sha256 = "105w3qfyjbmx8w8cxcq476zy8yyblkzz3gs8jpl2dl453zs2qli6"; + rev = "25dbe4ac607580fa05940dae24e544147d0bafeb"; + sha256 = "19vbk47mxa7j4bznk4vbxqzlscbk9kfqrsp6ja6x6bv7xvnhs8wm"; }; }; @@ -2379,12 +2390,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-07-12"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "a30c11ee96cd402e0044a2c3dde6d6e5cc4d6273"; - sha256 = "01zncza0b7bm7f4dna88pq42fq4ajg8zhyk1kzzrf4n1fid3nljz"; + rev = "6c82275b8cd4c70e0610fd87f0574ef2463952a6"; + sha256 = "1pms2bm4g0v0idkva1f9bdcbbwvs6fhbzzx90zdyyhs73xp62k9k"; }; }; @@ -3017,12 +3028,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-05-05"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "5a51bf3d52054990beef3221ec3a03d4ea9188e3"; - sha256 = "02sfi5138km2gnmv6vx5gff9xkd9bl0wz6n9dx6478syc49a2sai"; + rev = "eba64ed111a3aab8121a0e5b6df62c6f19e05322"; + sha256 = "13cmxbpimnm9nkn9igkd8cpcvydw6nlzgyxzq11qdj31bjfs4nma"; }; }; @@ -3105,12 +3116,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-06-27"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "a219dc1f702e581878f51746c4c31b8b4805aa4e"; - sha256 = "1bw8i3nvqwrb8d0dbsz53jy3pvcx7kwz48xy7b9sslrhkf4llwpn"; + rev = "46a68476fc7b4f454c829d83d21997b82ac66f76"; + sha256 = "1fyi39s211cw2db7zb5a5jy2r18h5azpkiij52ba6asxk7n5dghs"; }; }; @@ -3149,12 +3160,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-07-19"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "5aed1bc834456a5517221ba82f57d2577e8c932c"; - sha256 = "0gdghfpxkxx4hfsr5liqjqb8sg1qjhaadb9vqh30rhl08q47zdlk"; + rev = "923dfbdbdb395d6192483e12ec6069910162619a"; + sha256 = "1q1x5qxi081nnx7zqisr8ryb0ffskmjb0pylfzaswv7cwx4v4kpc"; }; }; @@ -3215,12 +3226,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-07-18"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "adba9c6345af58b31bcba8599b5bb162575d5755"; - sha256 = "1x7rjh45npsvylcbhfyxcxpa8lhb5l8jal6x6cx4rbc6csw65nb2"; + rev = "80996c2e2c5a0185cc6ce77c2cd18665d26d4041"; + sha256 = "0wjwj06nqvx2q084l309mz9vma951xyjhi2h4psb7k1iwybiqkwf"; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0c597e2d8c5..0281f9220e9 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -186,6 +186,10 @@ self: super: { dependencies = with super; [ super.self ]; }); + ghcid = super.ghcid.overrideAttrs(old: { + configurePhase = "cd plugins/nvim"; + }); + gist-vim = super.gist-vim.overrideAttrs(old: { dependencies = with super; [ webapi-vim ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7cfc14ccd4f..83857d09634 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -229,6 +229,7 @@ ncm2/ncm2-jedi ncm2/ncm2-path ncm2/ncm2-tmux ncm2/ncm2-ultisnips +ndmitchell/ghcid neoclide/coc-css neoclide/coc-denite neoclide/coc-emmet diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 855f854b111..b392dc853d3 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -699,11 +699,13 @@ let PREEMPT_VOLUNTARY = yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { - # Enable memory hotplug support - # Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot + # Enable CPU/memory hotplug support + # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot + ACPI_HOTPLUG_CPU = yes; ACPI_HOTPLUG_MEMORY = yes; MEMORY_HOTPLUG = yes; MEMORY_HOTREMOVE = yes; + HOTPLUG_CPU = yes; MIGRATION = yes; SPARSEMEM = yes; diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 52d95b170f6..f6ac1924518 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "documize-community"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "1ghdmqcwvbp48dw2w0aka38wfi2a80rmprnaxrjn2j5aplgbkbc5"; + sha256 = "1w57akmc3kb8rzgrjv5d4rjfr6vvam1wjs8792265ggnx6xhpgg9"; }; goPackagePath = "github.com/documize/community"; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index abbf171daa9..47082bbeba0 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.16.0"; - sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg"; + version = "1.17.2"; + sha256 = "1v39gslwbvpfhqqv74q0lkfrhrwsp59xc8pwhvxns7af8s3kccsy"; }) diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 5c5042b6c7c..94cb2f74cb0 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,23 +2,25 @@ buildGoPackage rec { name = "nginx_exporter-${version}"; - version = "0.1.0"; + version = "0.4.1"; - goPackagePath = "github.com/discordianfish/nginx_exporter"; + goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; + + buildFlagsArray = [ + "-ldflags=" "-X main.version=${version}" + ]; src = fetchFromGitHub { rev = "v${version}"; - owner = "discordianfish"; - repo = "nginx_exporter"; - sha256 = "1xwxnvkzslaj44r44ag24a9qfzjdxwz67hhpkdq42193zqpnlim7"; + owner = "nginxinc"; + repo = "nginx-prometheus-exporter"; + sha256 = "0c5bxl9xrd4gh2w5wyrzghmbcy9k1khydzml5cm0rsyqhwsvs8m5"; }; - goDeps = ./nginx-exporter_deps.nix; - meta = with stdenv.lib; { - description = "Metrics relay from nginx stats to Prometheus"; - homepage = https://github.com/discordianfish/nginx_exporter; - license = licenses.mit; + description = "NGINX Prometheus Exporter for NGINX and NGINX Plus"; + homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; + license = licenses.asl20; maintainers = with maintainers; [ benley fpletz willibutz ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix deleted file mode 100644 index 2fa60de5b49..00000000000 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix +++ /dev/null @@ -1,119 +0,0 @@ -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "82f5ff156b29e276022b1a958f7d385870fb9814"; - sha256 = "111j329yrlgvh73dm80gawwxsh9dgjkw74254kyj5c2rfmra7znz"; - }; - } - { - 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 = "d811d2e9bf898806ecfb6ef6296774b13ffc314c"; - sha256 = "0r4067r4ysmljksqw3awcxx5qplqhykahc5igdzgkky7i4bvaik1"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"; - sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "778f2e774c725116edbc3d039dc0dfc1cc62aae8"; - sha256 = "0drlrl192k4qkpcf1b6nw2qlixply31x2jhcckjzl3hn4mzwi6nf"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "ae8bce0030810cf999bb2b9868ae5c7c58e6343b"; - sha256 = "0aihwcf0g8mq1sb96pwhpgvwxlf862pdhsfr7mdppz7bii4i9shw"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "78d5f264b493f125018180c204871ecf58a2dce1"; - sha256 = "0x23n60wskys39dwybz5za77ldky9i518kp58ragpd5528kcc68s"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index 40789fa34f8..8585df3349c 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,7 +1,7 @@ # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "1.5.0" "1.5.0" "0z7g4nb7cm5w5l8w1856sbib15sx022mqpap9d49s6ppnn53vcs1") + (fetchbower "uchiwa-web" "1.7.0" "1.7.0" "1qn09j3a1ngqn36rhz7a2dj00szr0r6fjb40lfbmq3drkzppgbm1") (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn") @@ -19,7 +19,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3") (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71") (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb") - (fetchbower "ua-parser-js" "0.7.19" "~0.7.12" "0s1yaspccz234hm772hlybjsi0kndzwpjx5lzy3y1s4wfk248ks4") + (fetchbower "ua-parser-js" "0.7.20" "~0.7.12" "18r0islba6cwkvx4s2gna7skhsn2vqjcf1xyap5pcmycjnq93j8s") (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x") - (fetchbower "jquery" "3.3.1" ">= 1.9.0" "1l891s3vgnpi1g8ksplid9jvrvnnv6lci8vraix4ssy50i264rkx") + (fetchbower "jquery" "3.4.1" ">= 1.9.0" "1vk25pbc55m2c82mqf26rfhxhnliq18isi4vbm4p98a1b9vp8fq7") ]; } diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index cf5376318b4..36e46ea083e 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "1.5.0-1"; - sha256 = "05idwiv47zav46wi1hfly6rylpw8qryr12xlz47ic04ggdlga13b"; + version = "1.7.0-1"; + sha256 = "0fa3zzh6d8v1lfn828s0x65pcknycwyv0d1mndi0gvdfbfg463nf"; } diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 4a6ef57bba7..2a4093d412f 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.10.5"; + version = "4.10.6"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0xb3mz38hcayqxchk0ws9mxn10vswsn97jbxl4gcwi4cbrnjc43c"; + sha256 = "0hpgdqlyczj98pkh2ldglvvnkrb1q541r3qikdvxq0qjvd9fpywy"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6e2c928837c..ba4fd8e3d38 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -7,7 +7,7 @@ let , pkgconfig, libxml2, tzdata # This is important to obtain a version of `libpq` that does not depend on systemd. - , enableSystemd ? (lib.versionAtLeast "9.6" version && !stdenv.isDarwin) + , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin) # for postgreql.pkgs , this, self, newScope, buildEnv diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index b8396f67478..7dc70ee976c 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1cankcprikx8nf72yg4h8542gqqlfgww6d63kg7l8l8sz962d28b"; + sha256 = "0d913rkxx6qlkav6z9crsz3ypqkdffn4c667nsgzh5s9n4wbbpb8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 8e97e47e2fb..c77c01f8d20 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "1.3.2"; + version = "1.4.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "117az52h8isi15p47r5d6k5y80ng9vj3x8ljq39iavgr364q716c"; + sha256 = "0xjl3pdm36pksbkhl44kixqkfv8qpdm4frfwxv0p4vvjmlhslz48"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" ]; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 53a4d4b9087..d0f3fc88fc0 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-13"; + version = "2019-07-22"; name = "oh-my-zsh-${version}"; - rev = "17f4cfca99398cb5511557b8515a17bf1bf2948a"; + rev = "508cba2fc2ec545504abcf38ecdd958f3a89e5e8"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "19f29mrvnhvndvl48fd5kdiixfs0apmb27h4mck5v95p6yw27b6f"; + sha256 = "0pql5p8dwz576s0hgqrzk4543qawlghy7rv3k3jyhrwi4xx4z84d"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 520fffa9750..8de71ce1256 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.40"; + version = "0.2.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "08r4p2brs9gxxqnyv44zi1agv5q3ss8292201z9vh5ji9fmck2vb"; + sha256 = "0f8rj7jw8ym97bjqaxzn1rnhp5nfx3jf5f51jwczljvr67ik9q75"; }; modSha256 = "1lmkwx0r19c2wg9nm85k92nlxjzr8q917jf3f333yf3csfyiix2f"; diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index d7d917d5e9f..40e350846c5 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "vasi"; repo = "${pname}"; rev = "540204955134eee44201d50132a5f66a246bcfaf"; - sha256 = "07jv4qjjz9ky3mw3p5prgs19g1bna9dcd7jjdz8083s1wyipdgcq"; + sha256 = "062s77y32p80vc24a79z31g90b9wxzvws1xvicgx5fn1pd0xa0q6"; }; nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 166fd16811a..b371edb1ace 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,25 +1,16 @@ -{ stdenv, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules -, fetchpatch -}: +{ stdenv, fetchFromGitLab, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: stdenv.mkDerivation rec { - name = "fcitx-qt5-${version}"; - version = "1.2.1"; + pname = "fcitx-qt5"; + version = "1.2.3"; - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz"; - sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c"; + src = fetchFromGitLab { + owner = "fcitx"; + repo = pname; + rev = version; + sha256 = "0860v3rxsh054wkkbawvyin5mk0flp4cwfcpmcpq147lvdm5lq2i"; }; - patches = [ - # Fix build with Qt 5.11 - # https://github.com/fcitx/fcitx-qt5/issues/34 - (fetchpatch { - url = https://github.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6.diff; - sha256 = "14vfz1fw2k362wnqpglw766fg3d3mc8cmfgic2p96yyipjh9xx3b"; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; buildInputs = [ fcitx qtbase ]; @@ -32,11 +23,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/fcitx/fcitx-qt5; + homepage = https://gitlab.com/fcitx/fcitx-qt5; description = "Qt5 IM Module for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; }; - } diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 8b1cf6318e3..b183df701a7 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0xgjpdy12b77hgf0vfgs2ayxaajjv8vs0v8fn4rnrgn3hz8ldhyc"; + sha256 = "0i6ayp295xnppq92lc1fsfyrjkxrkvsva07yby45qa0l92nihqpy"; }; - cargoSha256 = "1hsrp9xbi6bj3461y58hmzfwakx4vakpzkjvi6174gy8xq7cdvg1"; + cargoSha256 = "1qdi1l0k0v00r9mfxgf09dzkvgxn07rcsl2yyyrhvcn731ak302y"; meta = with stdenv.lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index df623d0c178..fddb1c99634 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "geekbench-${version}"; - version = "4.3.3"; + version = "4.4.0"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "0bqa0k4cf4w8gjs49lnrvns11jv21kqcgdbqp2zhwqgmkx9gr8ny"; + sha256 = "1awdr54vw29ah7aah2bxpy4qkqasxj67sqk6gir8ybnxb5hxm3ri"; }; dontConfigure = true; diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix new file mode 100644 index 00000000000..7484e682918 --- /dev/null +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, darwin, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "kak-lsp"; + version = "6.2.1"; + + src = fetchFromGitHub { + owner = "ul"; + repo = pname; + rev = "v${version}"; + sha256 = "0bazbz1g5iqxlwybn5whidvavglvgdl9yp9qswgsk1jrjmcr5klx"; + }; + + cargoSha256 = "0w0mnh8fnl8zi9n0fxzqaqbvmfagf3ay5v2na3laxb72jm76hrwa"; + + buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + meta = with lib; { + description = "Kakoune Language Server Protocol Client"; + homepage = https://github.com/ul/kak-lsp; + license = with licenses; [ unlicense /* or */ mit ]; + maintainers = [ maintainers.spacekookie ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 6b5e836b14d..95f88654425 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { name = "lf-${version}"; - version = "12"; + version = "13"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "1pjydnwlc6mrnwz13s13c91nvjvb1ibwl944ppg8xq8dcy9b2cs4"; + sha256 = "1ld3q75v8rvp169w5p85z1vznqs9bhck6bm2f6fykxx16hmpb6ga"; }; modSha256 = "14fvn8yjm9cnpsmzgxw2dypr3h8h36mxrbk7zma42w8rsp46jpz7"; diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index fbb9b673dbc..f6aa88bbdea 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - lolcat (99.9.69) + lolcat (99.9.99) manpages (~> 0.6.1) optimist (~> 3.0.0) paint (~> 2.0.0) diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix index cfd2467d922..f21e5637993 100644 --- a/pkgs/tools/misc/lolcat/gemset.nix +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d1yh2ikyhyh7am4qznd6fzv2pyvk82xrnsrsbbyxzcqfz9x6aa9"; + sha256 = "0422869sf6hif1nrfzi8fwklnrdqj6hxxwg3403xvd9d50yndrn4"; type = "gem"; }; - version = "99.9.69"; + version = "99.9.99"; }; manpages = { groups = ["default"]; @@ -40,4 +40,4 @@ }; version = "2.0.3"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index afe00d7a354..ed46b49d8c7 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig , bind, zlib, openssl, libcap }: stdenv.mkDerivation rec { name = "dnsperf-${version}"; - version = "2.2.0"; + version = "2.3.1"; # The same as the initial commit of the new GitHub repo (only readme changed). src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "1acbpgk1d7hjs48j3w6xkmyf9xlxhqskjy50a16f9dvjwvvxp84b"; + sha256 = "0yxwm5xi9ry154ayzn2h27bnwwc202bsna8h6i4a65pn76nrn81w"; }; outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ bind zlib openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap.lib ]; diff --git a/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch b/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch deleted file mode 100644 index 270ef2c02e1..00000000000 --- a/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py -index 6f207b6..161619c 100644 ---- a/linkcheck/checker/httpurl.py -+++ b/linkcheck/checker/httpurl.py -@@ -75,7 +75,7 @@ def allows_robots (self, url): - @return: True if access is granted, otherwise False - @rtype: bool - """ -- return self.aggregate.robots_txt.allows_url(self) -+ return not self.aggregate.config['robotstxt'] or self.aggregate.robots_txt.allows_url(self) - - def content_allows_robots (self): - """ -diff --git a/linkcheck/configuration/__init__.py b/linkcheck/configuration/__init__.py -index fc2c148..234fa05 100644 ---- a/linkcheck/configuration/__init__.py -+++ b/linkcheck/configuration/__init__.py -@@ -163,6 +163,7 @@ def __init__ (self): - ## checking options - self["allowedschemes"] = [] - self['cookiefile'] = None -+ self['robotstxt'] = True - self["debugmemory"] = False - self["localwebroot"] = None - self["maxfilesizeparse"] = 1*1024*1024 -diff --git a/linkcheck/configuration/confparse.py b/linkcheck/configuration/confparse.py -index 67751ed..845fa95 100644 ---- a/linkcheck/configuration/confparse.py -+++ b/linkcheck/configuration/confparse.py -@@ -149,6 +149,7 @@ def read_checking_config (self): - self.get(section, 'allowedschemes').split(',')] - self.read_boolean_option(section, "debugmemory") - self.read_string_option(section, "cookiefile") -+ self.read_boolean_option(section, "robotstxt") - self.read_string_option(section, "localwebroot") - try: - self.read_boolean_option(section, "sslverify") -diff --git a/linkchecker b/linkchecker -index 199532c..9e91fa5 100755 ---- a/linkchecker -+++ b/linkchecker -@@ -321,6 +321,9 @@ group.add_argument("--cookiefile", dest="cookiefile", metavar="FILENAME", - help=_( - """Read a file with initial cookie data. The cookie data format is - explained below.""")) -+# const because store_false doesn't detect absent flags -+group.add_argument("--no-robots", action="store_const", const=False, -+ dest="norobotstxt", help=_("Disable robots.txt checks")) - group.add_argument("--check-extern", action="store_true", - dest="checkextern", help=_("""Check external URLs.""")) - group.add_argument("--ignore-url", action="append", metavar="REGEX", -@@ -431,6 +434,8 @@ if options.externstrict: - if options.extern: - pats = [linkcheck.get_link_pat(arg) for arg in options.extern] - config["externlinks"].extend(pats) -+if options.norobotstxt is not None: -+ config['robotstxt'] = options.norobotstxt - if options.checkextern: - config["checkextern"] = True - elif not config["checkextern"]: diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index acc6893d0cd..3c361fe48ba 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -1,64 +1,49 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, python2, gettext }: -let - # pin requests version until next release. - # see: https://github.com/linkcheck/linkchecker/issues/76 - python2Packages = (python2.override { - packageOverrides = self: super: { - requests = super.requests.overridePythonAttrs(oldAttrs: rec { - version = "2.14.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0lyi82a0ijs1m7k9w1mqwbmq1qjsac35fazx7xqyh8ws76xanx52"; - }; - }); - }; - }).pkgs; -in +{ stdenv, lib, fetchFromGitHub, python2Packages, gettext }: + python2Packages.buildPythonApplication rec { - pname = "LinkChecker"; - version = "9.3.1"; + pname = "linkchecker"; + version = "9.4.0"; - nativeBuildInputs = [ gettext ]; - pythonPath = (with python2Packages; [ - requests - ]) ++ [ gettext ]; - - checkInputs = with python2Packages; [ pytest ]; - - # the original repository is abandoned, development is now happening here: src = fetchFromGitHub { - owner = "linkcheck"; - repo = "linkchecker"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "080mv4iwvlsfnm7l9basd6i8p4q8990mdhkwick9s6javrbf1r1d"; + sha256 = "1vbwl2vb8dyzki27z3sl5yf9dhdd2cpkg10vbgaz868dhpqlshgs"; }; - # 1. upstream refuses to support ignoring robots.txt - # 2. fix build: https://github.com/linkcheck/linkchecker/issues/10 - patches = - let - fix-setup-py = fetchpatch { - name = "fix-setup-py.patch"; - url = https://github.com/linkcheck/linkchecker/commit/e62e630.patch; - sha256 = "046q1whg715w2yv33xx6rkj7fspvvz60cl978ax92lnf8j101czx"; - }; - in [ - ./add-no-robots-flag.patch - fix-setup-py - ]; + nativeBuildInputs = [ gettext ]; - postInstall = '' - rm $out/bin/linkchecker-gui + propagatedBuildInputs = with python2Packages; [ + ConfigArgParse + argcomplete + dnspython + pyxdg + requests + ]; + + checkInputs = with python2Packages; [ + parameterized + pytest + ]; + + postPatch = '' + sed -i 's/^requests.*$/requests>=2.2/' requirements.txt + sed -i "s/'request.*'/'requests >= 2.2'/" setup.py + sed -i 's~/usr/lib/python2.7/argparse.py~~g' po/Makefile ''; checkPhase = '' + runHook preCheck + # the mime test fails for me... rm tests/test_mimeutil.py ${lib.optionalString stdenv.isDarwin '' - # network tests fails on darwin - rm tests/test_network.py + # network tests fails on darwin + rm tests/test_network.py ''} make test PYTESTOPTS="--tb=short" TESTS="tests/test_*.py tests/logger/test_*.py" + + runHook postCheck ''; meta = { diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 3515a127510..0f7c035b4c0 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: stdenv.mkDerivation rec { name = "slirp4netns-${version}"; - version = "0.3.0-alpha.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "163nwdwi1qigma1c5svm8llgd8pn4sbkchw67ry3v0gfxa9mxibk"; + sha256 = "079m44l4l0p1c2sbkpzsy6zpv94glwmrc72ip2djcscnaq4b1763"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ glib ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 71cda94d5f8..0878e058c3e 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation { - name = "ghidra-9.0"; + name = "ghidra-9.0.2"; src = fetchurl { - url = https://ghidra-sre.org/ghidra_9.0_PUBLIC_20190228.zip; - sha256 = "3b65d29024b9decdbb1148b12fe87bcb7f3a6a56ff38475f5dc9dd1cfc7fd6b2"; + url = https://ghidra-sre.org/ghidra_9.0.2_PUBLIC_20190403.zip; + sha256 = "10ffd65c266e9f5b631c8ed96786c41ef30e2de939c3c42770573bb3548f8e9f"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index ba7ef7a3cfd..ac6a50960ad 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,9 +1,21 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null +, libgpgerror, libassuan +, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null +, qt4 ? null, qt5 ? null , enableEmacs ? false }: -stdenv.mkDerivation rec { +assert qt5 != null -> qt4 == null; +assert qt4 != null -> qt5 == null; + +let + mkDerivation = + if qt5 != null + then qt5.mkDerivation + else stdenv.mkDerivation; +in + +mkDerivation rec { name = "pinentry-1.1.0"; src = fetchurl { @@ -12,7 +24,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt ]; + buildInputs = + [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ] + ++ stdenv.lib.optional (qt5 != null) qt5.qtbase; prePatch = '' substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses @@ -34,7 +48,7 @@ stdenv.mkDerivation rec { (stdenv.lib.enableFeature enableEmacs "pinentry-emacs") (stdenv.lib.enableFeature (gtk2 != null) "pinentry-gtk2") (stdenv.lib.enableFeature (gcr != null) "pinentry-gnome3") - (stdenv.lib.enableFeature (qt != null) "pinentry-qt") + (stdenv.lib.enableFeature (qt4 != null || qt5 != null) "pinentry-qt") "--with-libassuan-prefix=${libassuan.dev}" "--with-libgpg-error-prefix=${libgpgerror.dev}" diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 80341e88dd0..c34b53c1e62 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake, python , udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive , libgpgerror, libuuid, iptables, dpkg, lzma, bzip2, rpm -, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags +, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen , gtest, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl, libelfin @@ -53,7 +53,7 @@ let # filter out static linking configuration to avoid that the library will # be linked both statically and dynamically. - gflags = google-gflags.overrideAttrs (old: { + gflags = gflags.overrideAttrs (old: { cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags; }); }; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 26e09dd7efa..34dacc80d92 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub, getopt, lua, boost, pkgconfig, gcc }: +{ stdenv, fetchFromGitLab, getopt, lua, boost, pkgconfig, gcc }: with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.43"; + version = "3.52"; - src = fetchFromGitHub { - owner = "andre-simon"; + src = fetchFromGitLab { + owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "126nsf4cjxflg2kiv72qf1xl5fsilk0jqcncs6qqgm72cpjfmlsy"; + sha256 = "0zhn1k70ck82ks7ckzsy1yiz686ym2ps7c28wjmkgxfpyjanilrq"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; buildInputs = [ getopt lua boost ]; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 54f1f492487..c79c2e7cb35 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -8,8 +8,8 @@ let binPath = stdenv.lib.makeBinPath [ in buildGoPackage rec { name = "distrobuilder-${version}"; - version = "2018_10_04"; - rev = "d2329be9569d45028a38836186d2353b8ddfe1ca"; + version = "2019_10_07"; + rev = "d686c88c21838f5505c3ec14711b2413604d7f5c"; goPackagePath = "github.com/lxc/distrobuilder"; @@ -17,7 +17,7 @@ buildGoPackage rec { inherit rev; owner = "lxc"; repo = "distrobuilder"; - sha256 = "1sn1wif86p089kr6zq83k81hjd1d73kamnawc2p0k0vd0w91d3v4"; + sha256 = "0k59czgasy4d58bkrin6hvgmh7y3nf177lwd0y4g47af27bgnyc4"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/virtualization/distrobuilder/deps.nix b/pkgs/tools/virtualization/distrobuilder/deps.nix index e4c65946551..7f79d8931fc 100644 --- a/pkgs/tools/virtualization/distrobuilder/deps.nix +++ b/pkgs/tools/virtualization/distrobuilder/deps.nix @@ -1,12 +1,57 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ + { + goPackagePath = "github.com/antchfx/xpath"; + fetch = { + type = "git"; + url = "https://github.com/antchfx/xpath"; + rev = "b6dbe470e10224a23b2f69db0d4449bc6627ece6"; + sha256 = "1959kzmjijpll6432da84rmzgd7p3yyqdq9chyxnm8318pr5znji"; + }; + } { goPackagePath = "github.com/flosch/pongo2"; fetch = { type = "git"; url = "https://github.com/flosch/pongo2"; - rev = "24195e6d38b06020d7a92c7b11960cf2e7cad2f2"; - sha256 = "1cbg3ya8l2v34gcxnd73nvzpfpx8kzkbiv0kpgaxqpcqjhanhgj9"; + rev = "bbf5a6c351f4d4e883daa40046a404d7553e0a00"; + sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; + }; + } + { + goPackagePath = "github.com/gobuffalo/envy"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/envy"; + rev = "043cb4b8af871b49563291e32c66bb84378a60ac"; + sha256 = "03jarnkaf42xgfamb0jlya4c1cyk8gnxhcd21m3fx145vz4px398"; + }; + } + { + goPackagePath = "github.com/gobuffalo/logger"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/logger"; + rev = "7c291b53e05b81d77bd43109b4a3c6f84e45c8e1"; + sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packd"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packd"; + rev = "54ea459691466cfb630ccc276723fe3963f3e9d5"; + sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packr"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packr"; + rev = "dc520c910ea91354b3ae131bbb029270e4fc1af4"; + sha256 = "1ph05pkbq0ggdab152f7hjlc758nkrw22fqgslnf1nvggadjkvqs"; }; } { @@ -14,8 +59,17 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b"; - sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48"; + rev = "ae1634f6a98965ded3b8789c626cb4e0bd78c3de"; + sha256 = "0nw0mdcs75ghr9a5asrk9a7yc00703yvv4xf6wyd3z44ihs4hrjv"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "5c0e6c6ab1a0a9ef0a8822cba3a05d62f7dad941"; + sha256 = "0zfs69q7f5xlkqhd4wzjc8gfdisahapz5g94sa8lzr5b4jg9ycbw"; }; } { @@ -23,8 +77,17 @@ fetch = { type = "git"; url = "https://github.com/juju/errors"; - rev = "089d3ea4e4d597bd98acac068193d341983326a3"; - sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r"; + rev = "e65537c515d77e35697c471d6c2755375cb3adc4"; + sha256 = "119806fhl4isbxc3g52335jgiv6cddfbapr1absd4v4kkq55i5qh"; + }; + } + { + goPackagePath = "github.com/karrick/godirwalk"; + fetch = { + type = "git"; + url = "https://github.com/karrick/godirwalk"; + rev = "73c17a9b9528eb3ce857b782a2816c0cda581e62"; + sha256 = "0l0m5zi2mf649knxgmch1cblz3a3xiny1c9ki2241phkpwzspjq1"; }; } { @@ -32,8 +95,17 @@ fetch = { type = "git"; url = "https://github.com/lxc/lxd"; - rev = "5507ca02c639b378290402c7d33911a90caa4f9e"; - sha256 = "08h6ycnq43zhkzlrfvk656d1xqjbxhz6dpqmzcmrkb3pw0h0f8hg"; + rev = "fd924cb85d99475f9a0349208a8d7d0f30bdb6f0"; + sha256 = "1v246x0bi6ljkfjfjkfjbfh0imfbps2zd0m55cxdsl8y96pfx1hs"; + }; + } + { + goPackagePath = "github.com/mudler/docker-companion"; + fetch = { + type = "git"; + url = "https://github.com/mudler/docker-companion"; + rev = "6a693e9b9eaf2cd08ba628350613f2e08e9af57d"; + sha256 = "06ch1xhfd62dwkmh1z0ihifpmvgnki97k8s7gzivincy80xj0xpc"; }; } { @@ -41,8 +113,26 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "059132a15dd08d6704c67711dae0cf35ab991756"; - sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg"; + rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; + sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; + }; + } + { + goPackagePath = "github.com/rogpeppe/go-internal"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/go-internal"; + rev = "3670dca80da881cddd5377fb9496daaabb8dec9f"; + sha256 = "0h01adrajbl3h0yx3bkig79ap9n6ikz90cpszhqwvgr63a0xbn13"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "07a84ee7412e7a28663d92930a1d46f81b124ee1"; + sha256 = "00hms8fnbhxb5lir3ykhl5lf1n2yqxddmd47cxp6d5ziv6k5swc8"; }; } { @@ -50,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "d2d81d9a96e23f0255397222bb0b4e3165e492dc"; - sha256 = "14nhpiyhz2lm468y5sm1vyxks5aky12kmbhmqq319s92lkm494cy"; + rev = "2d7544ebdeb5f926805c57af8dccc6c359de28d4"; + sha256 = "04b2bq8g948mn020l4cwhdnqffag29r21x2nyyg6cjqj306gs4vs"; }; } { @@ -59,8 +149,53 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "aea12ed6721610dc6ed40141676d7ab0a1dac9e9"; - sha256 = "17p5k37bnzj6wfh000y7xpvxyv2wsfa3db9sm8da2frjvn7jgbp2"; + rev = "24fa6976df40757dce6aea913e7b81ade90530e1"; + sha256 = "0rf6prz6gl0l1b3wijzdgq887cdwigvzxvz6gqbm5l8pkq3fx1m9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "da137c7871d730100384dbcf36e6f8fa493aef5b"; + sha256 = "1qsiyr3irmb6ii06hivm9p2c7wqyxczms1a9v1ss5698yjr3fg47"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "fae7ac547cb717d141c433a2a173315e216b64c4"; + sha256 = "11pl0dycm5d8ar7g1l1w5q2cx0lms8i15n8mxhilhkdd2xpmh8f0"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "gopkg.in/antchfx/htmlquery.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/antchfx/htmlquery.v1"; + rev = "b8d36292614567671decfe6f96c7b8c432d3249b"; + sha256 = "1rsvngqlqyg86g1ff59zmrkn7s8b3c2vpl533amwcv5s2h8npmxy"; }; } { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 44a27fa6c17..6616960a76e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -124,6 +124,7 @@ mapAliases ({ go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 goimports = gotools; # added 2018-09-16 + google-gflags = gflags; # added 2019-07-25 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2de4367a9e7..7ab18580706 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -553,7 +553,7 @@ in ansifilter = callPackage ../tools/text/ansifilter {}; - antora = nodePackages_10_x."@antora/cli"; + antora = callPackage ../development/tools/documentation/antora {}; apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; @@ -663,6 +663,8 @@ in brakeman = callPackage ../development/tools/analysis/brakeman { }; + brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -856,6 +858,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; + kjv = callPackage ../applications/misc/kjv { }; + luigi = callPackage ../applications/networking/cluster/luigi { }; m-cli = callPackage ../os-specific/darwin/m-cli { }; @@ -1259,7 +1263,7 @@ in cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; ceres-solver = callPackage ../development/libraries/ceres-solver { - google-gflags = null; # only required for examples/tests + gflags = null; # only required for examples/tests }; gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; @@ -2147,11 +2151,15 @@ in }; citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_19_6_0 = citrix_workspace_unwrapped.override { version = "19.6.0"; }; citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; }; citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped; }; + citrix_workspace_19_6_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped_19_6_0; + }; citrix_workspace_19_3_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped_19_3_0; }; @@ -2689,6 +2697,8 @@ in sonota = callPackage ../tools/misc/sonota { }; + sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; + tealdeer = callPackage ../tools/misc/tealdeer { }; teamocil = callPackage ../tools/misc/teamocil { }; @@ -3672,6 +3682,8 @@ in heimdall-gui = heimdall.override { enableGUI = true; }; + helio-workstation = callPackage ../applications/audio/helio-workstation { }; + hevea = callPackage ../tools/typesetting/hevea { }; hexd = callPackage ../tools/misc/hexd { }; @@ -4003,6 +4015,8 @@ in kakoune-unwrapped = callPackage ../applications/editors/kakoune { }; kakoune = wrapKakoune kakoune-unwrapped { }; + kak-lsp = callPackage ../tools/misc/kak-lsp { }; + kbdd = callPackage ../applications/window-managers/kbdd { }; kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; @@ -4048,6 +4062,8 @@ in klick = callPackage ../applications/audio/klick { }; + klystrack = callPackage ../applications/audio/klystrack { }; + knockknock = callPackage ../tools/security/knockknock { }; kore = callPackage ../development/web/kore { }; @@ -5308,6 +5324,8 @@ in pinentry = callPackage ../tools/security/pinentry { libcap = if stdenv.isDarwin then null else libcap; gcr = null; + qt4 = null; + qt5 = null; }; pinentry_ncurses = res.pinentry.override { @@ -5323,11 +5341,13 @@ in }; pinentry_qt4 = res.pinentry.override { - qt = qt4; + gtk2 = null; + inherit qt4; }; pinentry_qt5 = res.pinentry.override { - qt = qt5.qtbase; + gtk2 = null; + inherit qt5; }; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { @@ -6258,6 +6278,8 @@ in theharvester = callPackage ../tools/security/theharvester { }; + inherit (nodePackages) thelounge; + thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; @@ -8119,10 +8141,15 @@ in }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; + cargo-generate = callPackage ../development/tools/rust/cargo-generate { + inherit (darwin.apple_sdk.frameworks) Security; + }; pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; - rls = callPackage ../development/tools/rust/rls { }; + rls = callPackage ../development/tools/rust/rls { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; @@ -9677,6 +9704,8 @@ in redo = callPackage ../development/tools/build-managers/redo { }; + redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { }; + redo-sh = callPackage ../development/tools/build-managers/redo-sh { }; reno = callPackage ../development/tools/reno { }; @@ -9803,6 +9832,8 @@ in teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; + terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; @@ -10747,8 +10778,7 @@ in goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { }; - google-gflags = callPackage ../development/libraries/google-gflags { }; - gflags = google-gflags; # TODO: move to aliases.nix + gflags = callPackage ../development/libraries/gflags { }; gperftools = callPackage ../development/libraries/gperftools { }; @@ -17019,6 +17049,7 @@ in bitcoin = altcoins.bitcoin; clightning = altcoins.clightning; + lnd = altcoins.lnd; bitcoin-xt = altcoins.bitcoin-xt; cryptop = altcoins.cryptop; @@ -17086,7 +17117,7 @@ in baresip = callPackage ../applications/networking/instant-messengers/baresip { }; - barrier = callPackage ../applications/misc/barrier {}; + barrier = libsForQt5.callPackage ../applications/misc/barrier {}; bashSnippets = callPackage ../applications/misc/bashSnippets { }; @@ -17144,7 +17175,10 @@ in bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { inherit (pkgs) bitwig-studio1; }; - bitwig-studio = bitwig-studio2; + bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { + inherit (pkgs) bitwig-studio1; + }; + bitwig-studio = bitwig-studio3; bgpdump = callPackage ../tools/networking/bgpdump { }; @@ -17792,11 +17826,13 @@ in }; external = { - inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; + inherit (haskellPackages) + ghc-mod structured-haskell-mode Agda hindent; inherit (pythonPackages) elpy; inherit - autoconf automake git libffi libpng pkgconfig poppler rtags w3m zlib - substituteAll rustPlatform cmake llvmPackages libtool zeromq; + autoconf automake editorconfig-core-c git libffi libpng pkgconfig + poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages + libtool zeromq; }; }; @@ -18520,6 +18556,12 @@ in spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; + spotifyd = callPackage ../applications/audio/spotifyd { + withALSA = stdenv.isLinux; + withPulseAudio = config.pulseaudio or true; + withPortAudio = stdenv.isDarwin; + }; + super-productivity = callPackage ../applications/networking/super-productivity { }; wlc = callPackage ../development/libraries/wlc { }; @@ -19416,10 +19458,10 @@ in githubSupport = true; mpdSupport = true; pulseSupport = true; - iwSupport = true; + iwSupport = false; nlSupport = true; i3Support = true; - i3GapsSupport = true; + i3GapsSupport = false; }; ptex = callPackage ../development/libraries/ptex {}; @@ -19851,7 +19893,7 @@ in properties-cpp = callPackage ../development/libraries/properties-cpp { }; - protonmail-bridge = libsForQt511.callPackage ../applications/networking/protonmail-bridge { }; + protonmail-bridge = libsForQt512.callPackage ../applications/networking/protonmail-bridge { }; protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; @@ -20670,6 +20712,8 @@ in trayer = callPackage ../applications/window-managers/trayer { }; + tree-from-tags = callPackage ../applications/audio/tree-from-tags { }; + tdrop = callPackage ../applications/misc/tdrop { }; tree = callPackage ../tools/system/tree {}; @@ -21341,6 +21385,8 @@ in inherit (gnome2) scrollkeeper libglade; }; + xygrib = libsForQt5.callPackage ../applications/misc/xygrib/default.nix {}; + xzgv = callPackage ../applications/graphics/xzgv { }; yabar = callPackage ../applications/window-managers/yabar { }; @@ -22496,6 +22542,8 @@ in emboss = callPackage ../applications/science/biology/emboss { }; + est-sfs = callPackage ../applications/science/biology/est-sfs { }; + ezminc = callPackage ../applications/science/biology/EZminc { }; exonerate = callPackage ../applications/science/biology/exonerate { }; @@ -22688,6 +22736,7 @@ in mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; mathematica10 = callPackage ../applications/science/math/mathematica/10.nix { }; + mathematica11 = callPackage ../applications/science/math/mathematica/11.nix { }; metis = callPackage ../development/libraries/science/math/metis {}; @@ -24446,5 +24495,4 @@ in dapper = callPackage ../development/tools/dapper { }; kube3d = callPackage ../applications/networking/cluster/kube3d {}; - } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51a98994069..84d02299515 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1123,6 +1123,8 @@ in { spglib = callPackage ../development/python-modules/spglib { }; + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; + sslib = callPackage ../development/python-modules/sslib { }; statistics = callPackage ../development/python-modules/statistics { }; @@ -4661,6 +4663,8 @@ in { setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; + setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; + serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; shippai = callPackage ../development/python-modules/shippai {};