diff options
79 files changed, 3977 insertions, 2437 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d0d757e8ccbf..bac601fbf82e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -20,9 +20,9 @@ /pkgs/top-level/impure.nix @nbp @Ericson2314 /pkgs/top-level/stage.nix @nbp @Ericson2314 /pkgs/stdenv -/pkgs/build-support/cc-wrapper @Ericson2314 -/pkgs/build-support/bintools-wrapper @Ericson2314 -/pkgs/build-support/setup-hooks @Ericson2314 +/pkgs/build-support/cc-wrapper @Ericson2314 @orivej +/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej +/pkgs/build-support/setup-hooks @Ericson2314 # NixOS Internals /nixos/default.nix @nbp diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 65718e31897b..f839d025129e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -299,6 +299,7 @@ ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>"; ixmatus = "Parnell Springmeyer <parnell@digitalmentat.com>"; izorkin = "Yurii Izorkin <Izorkin@gmail.com>"; + ixxie = "Matan Bendix Shenhav <matan@fluxcraft.net>"; j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>"; jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>"; jammerful = "jammerful <jammerful@gmail.com>"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bb3abc256fc1..e512881765e0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -540,6 +540,7 @@ ./services/networking/ssh/lshd.nix ./services/networking/ssh/sshd.nix ./services/networking/strongswan.nix + ./services/networking/stunnel.nix ./services/networking/supplicant.nix ./services/networking/supybot.nix ./services/networking/syncthing.nix diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index e1fde4fc9500..d23b329eeb25 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -5,18 +5,25 @@ with lib; let cfg = config.services.netdata; - configFile = pkgs.writeText "netdata.conf" cfg.configText; + wrappedPlugins = pkgs.runCommand "wrapped-plugins" {} '' + mkdir -p $out/libexec/netdata/plugins.d + ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin + ''; + + localConfig = { + global = { + "plugins directory" = "${wrappedPlugins}/libexec/netdata/plugins.d ${pkgs.netdata}/libexec/netdata/plugins.d"; + }; + }; + mkConfig = generators.toINI {} (recursiveUpdate localConfig cfg.config); + configFile = pkgs.writeText "netdata.conf" (if cfg.configText != null then cfg.configText else mkConfig); defaultUser = "netdata"; in { options = { services.netdata = { - enable = mkOption { - default = false; - type = types.bool; - description = "Whether to enable netdata monitoring."; - }; + enable = mkEnableOption "netdata"; user = mkOption { type = types.str; @@ -31,9 +38,9 @@ in { }; configText = mkOption { - type = types.lines; - default = ""; - description = "netdata.conf configuration."; + type = types.nullOr types.lines; + description = "Verbatim netdata.conf, cannot be combined with config."; + default = null; example = '' [global] debug log = syslog @@ -42,11 +49,29 @@ in { ''; }; + config = mkOption { + type = types.attrsOf types.attrs; + default = {}; + description = "netdata.conf configuration as nix attributes. cannot be combined with configText."; + example = literalExample '' + global = { + "debug log" = "syslog"; + "access log" = "syslog"; + "error log" = "syslog"; + }; + ''; + }; + }; }; - }; config = mkIf cfg.enable { + assertions = + [ { assertion = cfg.config != {} -> cfg.configText == null ; + message = "Cannot specify both config and configText"; + } + ]; systemd.services.netdata = { + path = with pkgs; [ gawk curl ]; description = "Real time performance monitoring"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -66,6 +91,15 @@ in { }; }; + security.wrappers."apps.plugin" = { + source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin"; + capabilities = "cap_dac_read_search,cap_sys_ptrace+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+rx,o-rwx"; + }; + + users.extraUsers = optional (cfg.user == defaultUser) { name = defaultUser; }; diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 6d2b7bdbca1b..d1c4101f80bd 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -17,7 +17,7 @@ let search_lan = entry.searchLAN; use_sync_trash = entry.useSyncTrash; - known_hosts = knownHosts; + known_hosts = entry.knownHosts; }) cfg.sharedFolders; configFile = pkgs.writeText "config.json" (builtins.toJSON ({ diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix new file mode 100644 index 000000000000..89a14966eca7 --- /dev/null +++ b/nixos/modules/services/networking/stunnel.nix @@ -0,0 +1,221 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.stunnel; + yesNo = val: if val then "yes" else "no"; + + verifyChainPathAssert = n: c: { + assertion = c.verifyHostname == null || (c.verifyChain || c.verifyPeer); + message = "stunnel: \"${n}\" client configuration - hostname verification " + + "is not possible without either verifyChain or verifyPeer enabled"; + }; + + serverConfig = { + options = { + accept = mkOption { + type = types.int; + description = "On which port stunnel should listen for incoming TLS connections."; + }; + + connect = mkOption { + type = types.int; + description = "To which port the decrypted connection should be forwarded."; + }; + + cert = mkOption { + type = types.path; + description = "File containing both the private and public keys."; + }; + }; + }; + + clientConfig = { + options = { + accept = mkOption { + type = types.string; + description = "IP:Port on which connections should be accepted."; + }; + + connect = mkOption { + type = types.string; + description = "IP:Port destination to connect to."; + }; + + verifyChain = mkOption { + type = types.bool; + default = true; + description = "Check if the provided certificate has a valid certificate chain (against CAPath)."; + }; + + verifyPeer = mkOption { + type = types.bool; + default = false; + description = "Check if the provided certificate is contained in CAPath."; + }; + + CAPath = mkOption { + type = types.path; + default = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + description = "Path to a file containing certificates to validate against."; + }; + + verifyHostname = mkOption { + type = with types; nullOr string; + default = null; + description = "If set, stunnel checks if the provided certificate is valid for the given hostname."; + }; + }; + }; + + +in + +{ + + ###### interface + + options = { + + services.stunnel = { + + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the stunnel TLS tunneling service."; + }; + + user = mkOption { + type = with types; nullOr string; + default = "nobody"; + description = "The user under which stunnel runs."; + }; + + group = mkOption { + type = with types; nullOr string; + default = "nogroup"; + description = "The group under which stunnel runs."; + }; + + logLevel = mkOption { + type = types.enum [ "emerg" "alert" "crit" "err" "warning" "notice" "info" "debug" ]; + default = "info"; + description = "Verbosity of stunnel output."; + }; + + fipsMode = mkOption { + type = types.bool; + default = false; + description = "Enable FIPS 140-2 mode required for compliance."; + }; + + enableInsecureSSLv3 = mkOption { + type = types.bool; + default = false; + description = "Enable support for the insecure SSLv3 protocol."; + }; + + + servers = mkOption { + description = "Define the server configuations."; + type = with types; attrsOf (submodule serverConfig); + example = { + fancyWebserver = { + enable = true; + accept = 443; + connect = 8080; + cert = "/path/to/pem/file"; + }; + }; + default = { }; + }; + + clients = mkOption { + description = "Define the client configurations."; + type = with types; attrsOf (submodule clientConfig); + example = { + foobar = { + accept = "0.0.0.0:8080"; + connect = "nixos.org:443"; + verifyChain = false; + }; + }; + default = { }; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + assertions = concatLists [ + (singleton { + assertion = (length (attrValues cfg.servers) != 0) || ((length (attrValues cfg.clients)) != 0); + message = "stunnel: At least one server- or client-configuration has to be present."; + }) + + (mapAttrsToList verifyChainPathAssert cfg.clients) + ]; + + environment.systemPackages = [ pkgs.stunnel ]; + + environment.etc."stunnel.cfg".text = '' + ${ if cfg.user != null then "setuid = ${cfg.user}" else "" } + ${ if cfg.group != null then "setgid = ${cfg.group}" else "" } + + debug = ${cfg.logLevel} + + ${ optionalString cfg.fipsMode "fips = yes" } + ${ optionalString cfg.enableInsecureSSLv3 "options = -NO_SSLv3" } + + ; ----- SERVER CONFIGURATIONS ----- + ${ lib.concatStringsSep "\n" + (lib.mapAttrsToList + (n: v: '' + [${n}] + accept = ${toString v.accept} + connect = ${toString v.connect} + cert = ${v.cert} + + '') + cfg.servers) + } + + ; ----- CLIENT CONFIGURATIONS ----- + ${ lib.concatStringsSep "\n" + (lib.mapAttrsToList + (n: v: '' + [${n}] + client = yes + accept = ${v.accept} + connect = ${v.connect} + verifyChain = ${yesNo v.verifyChain} + verifyPeer = ${yesNo v.verifyPeer} + ${optionalString (v.CAPath != null) "CApath = ${v.CAPath}"} + ${optionalString (v.verifyHostname != null) "checkHost = ${v.verifyHostname}"} + OCSPaia = yes + + '') + cfg.clients) + } + ''; + + systemd.services.stunnel = { + description = "stunnel TLS tunneling service"; + after = [ "network.target" ]; + wants = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."stunnel.cfg".source ]; + serviceConfig = { + ExecStart = "${pkgs.stunnel}/bin/stunnel ${config.environment.etc."stunnel.cfg".source}"; + Type = "forking"; + }; + }; + + }; + +} diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 9d5d03638e04..c0c9d7ea47f7 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -3,9 +3,7 @@ with lib; let - xcfg = config.services.xserver; - pcfg = config.hardware.pulseaudio; - cfg = xcfg.desktopManager.xfce; + cfg = config.services.xserver.desktopManager.xfce; in { @@ -52,82 +50,93 @@ in description = "Application used by XFCE to lock the screen."; }; }; - }; + config = mkIf cfg.enable { + environment.systemPackages = with pkgs.xfce // pkgs; [ + # Get GTK+ themes and gtk-update-icon-cache + gtk2.out + + # Supplies some abstract icons such as: + # utilities-terminal, accessories-text-editor + gnome3.defaultIconTheme + + hicolor_icon_theme + tango-icon-theme + xfce4-icon-theme + + desktop_file_utils + shared_mime_info + + # Needed by Xfce's xinitrc script + # TODO: replace with command -v + which + + exo + garcon + gtk-xfce-engine + gvfs + libxfce4ui + tumbler + xfconf + + mousepad + ristretto + xfce4-appfinder + xfce4-screenshooter + xfce4-session + xfce4-settings + xfce4-terminal + + (thunar.override { thunarPlugins = cfg.thunarPlugins; }) + thunar-volman # TODO: drop + ] ++ (if config.hardware.pulseaudio.enable + then [ xfce4-mixer-pulse xfce4-volumed-pulse ] + else [ xfce4-mixer xfce4-volumed ]) + # TODO: NetworkManager doesn't belong here + ++ optionals config.networking.networkmanager.enable [ networkmanagerapplet ] + ++ optionals config.powerManagement.enable [ xfce4-power-manager ] + ++ optionals cfg.enableXfwm [ xfwm4 ] + ++ optionals (!cfg.noDesktop) [ + xfce4-panel + xfce4-notifyd + xfdesktop + ]; + + environment.pathsToLink = [ + "/share/xfce4" + "/share/themes" + "/share/mime" + "/share/desktop-directories" + "/share/gtksourceview-2.0" + ]; + + environment.variables = { + GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; + GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ]; + }; - config = mkIf (xcfg.enable && cfg.enable) { - - services.xserver.desktopManager.session = singleton - { name = "xfce"; - bgSupport = true; - start = - '' - ${cfg.extraSessionCommands} + services.xserver.desktopManager.session = [{ + name = "xfce"; + bgSupport = true; + start = '' + ${cfg.extraSessionCommands} - # Set GTK_PATH so that GTK+ can find the theme engines. - export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" + # Set GTK_PATH so that GTK+ can find the theme engines. + export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" - # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. - export GTK_DATA_PREFIX=${config.system.path} + # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. + export GTK_DATA_PREFIX=${config.system.path} - ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} & - waitPID=$! - ''; - }; + ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} & + waitPID=$! + ''; + }]; services.xserver.updateDbusEnvironment = true; - environment.systemPackages = - [ pkgs.gtk2.out # To get GTK+'s themes and gtk-update-icon-cache - pkgs.hicolor_icon_theme - pkgs.tango-icon-theme - pkgs.shared_mime_info - pkgs.which # Needed by the xfce's xinitrc script. - pkgs."${cfg.screenLock}" - pkgs.xfce.exo - pkgs.xfce.gtk_xfce_engine - pkgs.xfce.mousepad - pkgs.xfce.ristretto - pkgs.xfce.terminal - (pkgs.xfce.thunar.override { thunarPlugins = cfg.thunarPlugins; }) - pkgs.xfce.xfce4icontheme - pkgs.xfce.xfce4session - pkgs.xfce.xfce4settings - (if pcfg.enable then pkgs.xfce.xfce4mixer_pulse else pkgs.xfce.xfce4mixer) - (if pcfg.enable then pkgs.xfce.xfce4volumed_pulse else pkgs.xfce.xfce4volumed) - pkgs.xfce.xfce4-screenshooter - pkgs.xfce.xfconf - # This supplies some "abstract" icons such as - # "utilities-terminal" and "accessories-text-editor". - pkgs.gnome3.defaultIconTheme - pkgs.desktop_file_utils - pkgs.xfce.libxfce4ui - pkgs.xfce.garcon - pkgs.xfce.thunar_volman - pkgs.xfce.gvfs - pkgs.xfce.xfce4_appfinder - pkgs.xfce.tumbler # found via dbus - ] - ++ optional cfg.enableXfwm pkgs.xfce.xfwm4 - ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager - ++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet - ++ optionals (!cfg.noDesktop) - [ pkgs.xfce.xfce4panel - pkgs.xfce.xfdesktop - pkgs.xfce.xfce4notifyd # found via dbus - ]; - - environment.pathsToLink = - [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ]; - - environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ]; - environment.variables.GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; - # Enable helpful DBus services. services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - }; - } diff --git a/nixos/release.nix b/nixos/release.nix index ad3337800384..846d87b18d6a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -304,6 +304,7 @@ in rec { tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; }; tests.nat.firewall-conntrack = callTest tests/nat.nix { withFirewall = true; withConntrackHelpers = true; }; tests.nat.standalone = callTest tests/nat.nix { withFirewall = false; }; + tests.netdata = callTest tests/netdata.nix { }; tests.networking.networkd = callSubTests tests/networking.nix { networkd = true; }; tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; }; # TODO: put in networking.nix after the test becomes more complete diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix new file mode 100644 index 000000000000..58733c1b3379 --- /dev/null +++ b/nixos/tests/netdata.nix @@ -0,0 +1,31 @@ +# This test runs netdata and checks for data via apps.plugin + +import ./make-test.nix ({ pkgs, ...} : { + name = "netdata"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ cransom ]; + }; + + nodes = { + netdata = + { config, pkgs, ... }: + { + environment.systemPackages = with pkgs; [ curl jq ]; + services.netdata.enable = true; + }; + }; + + testScript = '' + startAll; + + $netdata->waitForUnit("netdata.service"); + # check if netdata can read disk ops for root owned processes. + # if > 0, successful. verifies both netdata working and + # apps.plugin has elevated capabilities. + my $cmd = <<'CMD'; + curl -s http://localhost:19999/api/v1/data\?chart=users.pwrites | \ + jq -e '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0' + CMD + $netdata->waitUntilSucceeds($cmd); + ''; +}) diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 57107924b618..1420627c02a0 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "cava-${version}"; - version = "0.4.2"; + version = "0.6.0"; buildInputs = [ alsaLib @@ -16,14 +16,16 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "1c5gl8ghmd89f6097rjd2dzrgh1z4i4v9m4vn5wkpnnm68b96yyc"; + sha256 = "01maaq5pfd4a7zilgarwr1nl7jbqyrvir6w7ikchggsckrlk23wr"; }; nativeBuildInputs = [ autoreconfHook ]; postConfigure = '' - substituteInPlace Makefile \ + substituteInPlace Makefile.am \ --replace "-L/usr/local/lib -Wl,-rpath /usr/local/lib" "" + substituteInPlace configure.ac \ + --replace "/usr/share/consolefonts" "$out/share/consolefonts" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index d1ed4826c682..4ab11064eae3 100644 --- a/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchFromGitHub, freetype, libX11, libXt, libXft -, version ? "2016-10-08" -, rev ? "a17c4a9c2a1af2de0a756fe16d482e0db88c0541" -, sha256 ? "03xmfzlijz4gbmr7l0pb1gl9kmlz1ab3hr8d51innvlasy4g6xgj" -}: +{ stdenv, fetchFromGitHub, freetype, libX11, libXi, libXt, libXft }: stdenv.mkDerivation rec { - inherit version; + version = "2017-10-27"; name = "deadpixi-sam-unstable-${version}"; - src = fetchFromGitHub { - inherit sha256 rev; - owner = "deadpixi"; - repo = "sam"; - }; + + src = fetchFromGitHub { + owner = "deadpixi"; + repo = "sam"; + rev = "51693780fb1457913389db6634163998f9b775b8"; + sha256 = "0nfkj93j4bgli4ixbk041nwi14rabk04kqg8krq4mj0044m1qywr"; + }; postPatch = '' substituteInPlace config.mk.def \ - --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" + --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" \ + --replace "CC=gcc" "" ''; + CFLAGS = "-D_DARWIN_C_SOURCE"; makeFlags = [ "DESTDIR=$(out)" ]; - buildInputs = [ libX11 libXt libXft ]; + buildInputs = [ libX11 libXi libXt libXft ]; postInstall = '' mkdir -p $out/share/applications @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "Updated version of the sam text editor"; license = with licenses; lpl-102; maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index f6ce395a6f16..6595abe97ef3 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -20,20 +20,32 @@ rec { # Helper for the common case where we have separate feature and # plugin JARs. - buildEclipsePlugin = { name, srcFeature, srcPlugin, ... } @ attrs: - buildEclipsePluginBase (attrs // { - srcs = [ srcFeature srcPlugin ]; + buildEclipsePlugin = + { name, srcFeature, srcPlugin ? null, srcPlugins ? [], ... } @ attrs: + assert srcPlugin == null -> srcPlugins != []; + assert srcPlugin != null -> srcPlugins == []; - buildCommand = '' - dropinDir="$out/eclipse/dropins/${name}" + let - mkdir -p $dropinDir/features - unzip ${srcFeature} -d $dropinDir/features/ + pSrcs = if (srcPlugin != null) then [ srcPlugin ] else srcPlugins; - mkdir -p $dropinDir/plugins - cp -v ${srcPlugin} $dropinDir/plugins/${name}.jar - ''; - }); + in + + buildEclipsePluginBase (attrs // { + srcs = [ srcFeature ] ++ pSrcs; + + buildCommand = '' + dropinDir="$out/eclipse/dropins/${name}" + + mkdir -p $dropinDir/features + unzip ${srcFeature} -d $dropinDir/features/ + + mkdir -p $dropinDir/plugins + for plugin in ${toString pSrcs}; do + cp -v $plugin $dropinDir/plugins/$(stripHash $plugin) + done + ''; + }); # Helper for the case where the build directory has the layout of an # Eclipse update site, that is, it contains the directories @@ -125,6 +137,29 @@ rec { }; }; + antlr-runtime_4_5 = buildEclipsePluginBase rec { + name = "antlr-runtime-4.5.3"; + + src = fetchurl { + url = "http://www.antlr.org/download/${name}.jar"; + sha256 = "0lm78i2annlczlc2cg5xvby0g1dyl0sh1y5xc2pymjlmr67a1g4k"; + }; + + buildCommand = '' + dropinDir="$out/eclipse/dropins/" + mkdir -p $dropinDir + cp -v $src $dropinDir/${name}.jar + ''; + + meta = with stdenv.lib; { + description = "A powerful parser generator for processing structured text or binary files"; + homepage = http://www.antlr.org/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + anyedittools = buildEclipsePlugin rec { name = "anyedit-${version}"; version = "2.7.1.201709201439"; @@ -256,7 +291,7 @@ rec { }; }; - cup = buildEclipsePluginBase rec { + cup = buildEclipsePlugin rec { name = "cup-${version}"; version = "1.1.0.201604221613"; version_ = "1.0.0.201604221613"; @@ -266,31 +301,20 @@ rec { sha256 = "13nnsf0cqg02z3af6xg45rhcgiffsibxbx6h1zahjv7igvqgkyna"; }; - srcPlugin1 = fetchurl { - url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version_}.jar"; - sha256 = "0kif8kivrysprva1pxzajm88gi967qf7idhb6ga2xpvsdcris91j"; - }; - - srcPlugin2 = fetchurl { - url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/de.tum.in.www2.CupPlugin_${version}.jar"; - sha256 = "022phbrsny3gb8npb6sxyqqxacx138q5bd7dq3gqxh3kprx5chbl"; - }; + srcPlugins = [ + (fetchurl { + url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version_}.jar"; + sha256 = "0kif8kivrysprva1pxzajm88gi967qf7idhb6ga2xpvsdcris91j"; + }) - srcs = [ srcFeature srcPlugin1 srcPlugin2 ]; + (fetchurl { + url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/de.tum.in.www2.CupPlugin_${version}.jar"; + sha256 = "022phbrsny3gb8npb6sxyqqxacx138q5bd7dq3gqxh3kprx5chbl"; + }) + ]; propagatedBuildInputs = [ zest ]; - phases = [ "installPhase" ]; - - installPhase = '' - dropinDir="$out/eclipse/dropins/${name}" - mkdir -p $dropinDir/features - unzip ${srcFeature} -d $dropinDir/features/ - mkdir -p $dropinDir/plugins - cp -v ${srcPlugin1} $dropinDir/plugins/''${srcPlugin1#*-} - cp -v ${srcPlugin2} $dropinDir/plugins/''${srcPlugin2#*-} - ''; - meta = with stdenv.lib; { homepage = http://www2.cs.tum.edu/projects/cup/eclipse.php; description = "IDE for developing CUP based parsers"; @@ -383,6 +407,44 @@ rec { }; }; + jsonedit = buildEclipsePlugin rec { + name = "jsonedit-${version}"; + version = "1.0.1"; + + srcFeature = fetchurl { + url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar"; + sha256 = "19221409wzcsrlm2fqf6mrxzb5ip1x6y5ba8anw788p7aaz1w30k"; + }; + + srcPlugins = + let + fetch = { n, h }: + fetchurl { + url = "https://boothen.github.io/Json-Eclipse-Plugin/plugins/jsonedit-${n}_${version}.jar"; + sha256 = h; + }; + in + map fetch [ + { n = "core"; h = "05ipjbh9yz97zhqaqq6cja3zz44n0dn40ms13qnlgf4bxyaf0f6w"; } + { n = "editor"; h = "1i71rh2fd5hsx6gygnafz2gjz4hlb0ckazxn0maxmnlx4p5apjql"; } + { n = "folding"; h = "13p8vqdna23ln82w1jgchm59375f1ky0p2b1v7jih55yfhw1ymam"; } + { n = "model"; h = "0llswhsd58f0rjb9canjncavq4z7q8zidn26yl5gradbbz580p6w"; } + { n = "outline"; h = "1rs8g0iv2kklbl7j0p6nr26m6ii89yyr9bpi05mh21xva40pzkl5"; } + { n = "preferences"; h = "0vs074ahhiba7if43ryf9m8xd81sqj9grppy0pzcnkkdkbk870n0"; } + { n = "text"; h = "0nqpzjw8hhvh9jlpldpmcmg83a170wjdabgsvjq207j12jkvfiqq"; } + ]; + + propagatedBuildInputs = [ antlr-runtime_4_5 ]; + + meta = with stdenv.lib; { + description = "Adds support for JSON files to Eclipse"; + homepage = https://github.com/boothen/Json-Eclipse-Plugin; + license = licenses.epl10; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; version = "4.7.2"; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index dc57a3554f31..8fd65770afd5 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -100,6 +100,7 @@ let kdepim-runtime = callPackage ./kdepim-runtime.nix {}; kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; + kdialog = callPackage ./kdialog.nix {}; keditbookmarks = callPackage ./keditbookmarks.nix {}; kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; diff --git a/pkgs/applications/kde/kdialog.nix b/pkgs/applications/kde/kdialog.nix new file mode 100644 index 000000000000..df301af0cbac --- /dev/null +++ b/pkgs/applications/kde/kdialog.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kinit, kguiaddons, kwindowsystem +}: + +mkDerivation { + name = "kdialog"; + + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = with lib.maintainers; [ peterhoeg ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + propagatedBuildInputs = [ kinit kguiaddons kwindowsystem ]; +} diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 74ef55ee8cc8..80e1b9b69efb 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p "$out/share/bash-completion/completions" - ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/" + ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash" mkdir -p "$out/share/fish/vendor_completions.d" ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/" ''; diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 1fe72ac94500..531c9ca269c0 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b1"; + version = "59.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ach/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ach/firefox-59.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "ae8ce740bb4603230dde693b3aad390163bae5df46fa47668920449959355be9554c3ce8c2ed981829694927eee734c6d4b24bee39a3bc77374728849ddf3ccc"; + sha512 = "9d83074ae4b7731887ac7e9c7299ef0f986d4f4e0dec7c2ca81a49222d4f4edaa2c4bb755989a0c54e756fb344c93d8ba4638f4814180013e231aec2aefe118b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/af/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/af/firefox-59.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "0b354daa18ddd1daf23fb5336fbc1fc106c812f45e61b71d0f1e0d3e1f32e5b0d34b4125596cd6da9c156074423a22ac3bf1b8e43e8896037ddc5ba9c4c55338"; + sha512 = "28c98854c7675f51cdd70feb29d13818aa434a15427ef4ade1f2c534f46b15d065e8edb0c1a17dab51af5ff99e689afaca50d3efbb18e1e3a28b7ce639f3cd31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/an/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/an/firefox-59.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "a0db6f48eef44fa6d4b1983b1867ca25304208696a5f4fad3f3a74fa6133968685b02e727acc908cffbaa25b3a9873f13934132a5fd5dc6e3d1ce46809bbd536"; + sha512 = "5cc5ed6db010396314c7df15de7433fa3a19a6bd380c8c771c2d44fba98bb9fc8f86cc6007176d6edeb2e2dd6be01e1fcfc4f2ec70d462f0c2917da338b41dd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ar/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ar/firefox-59.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "c4be6036830fac52615ee0facfea79613a88c266efab90ee44ff122045f273699fe423146030875ecae6c1129761fa65c6b06855e8f4864a678e5fd795c91793"; + sha512 = "34cbc8eba818666b527d87e83d7eb3f9894bb8561b48e34952b4ccd71e4273c29d15ed403c4a8ebfd2c5fefd5619bcfa7fca2609b045be4e4a6946996c95b97c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/as/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/as/firefox-59.0b2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "25d66a2a3d479bb336612f1adedb0839b9c9b7bc9b66daa3bffb838d33b311223d25284f2966c989ac707fcad8070c609ad31c0bdb399c4707d812b8417fe1ab"; + sha512 = "def1fa9cd5ab1f645645ea7a5feaadf1c4a6e1e98f71d9092052a49848df640f62ce9f13c2fe7040eb57417140e11c68f3022bbc5d757051592c1f97ea8c6349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ast/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ast/firefox-59.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "4c0d1d06ca926e301bb3bf50ccb43bb78248bb116557d77b37c70eb40a43df2d03a02880d555580a4fe886b780900553eaca5c8600ec68085730d09cc389b9a2"; + sha512 = "bda44c2457f3e84bf7c8d48380e4cdc9bce978ecbfd7a40866d98dd2a0c737d842ef8648d5e014728050e06bd20de99fedf58d55d93c180cd7f0bca3c7fbfa62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/az/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/az/firefox-59.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "69143e3ef94735dbeb22f235fa15fff852388ab80bac2ec648f3a089fbe5ad15cb4ac435e6a1256e293b1b6d8bfed9d1de29ddb0e4191659b4f1ca1d55b273e8"; + sha512 = "c128912e74d1ec20f24da31d7e030a63ca4882c965c8e9956415c5b529a4165daa9436bdbfb117a349172b0462683fd763a76a2e823846d27d5436de7d8ac848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/be/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/be/firefox-59.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "acaa34474407490341449815f3d1d821f752e9a53b8248e8b71ffefa7d8da558362dc53c4339877706d532d20fdd73f281382db6b19ef8eaff6f8073bba819f0"; + sha512 = "2994d87543cdc6d5ce8a4a595fd3e1d8072ba21dc11a952c60cf7afabae1cd63febf7f92d71362a082c3980ae9154563d006caad728ff5f0fa3d973bc68f7e07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/bg/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/bg/firefox-59.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "ee135f1965df8d0971caef0563fa8c5c54682258a3a5b9e6de10055cd912adec2cb468f011581bcc89a390a038ccf1cb30444b8662218cc0906d7222bbba2154"; + sha512 = "ccf1b631eb0ea692a454c558fee700353b8710441c3a4d78389e17e2cf41d77a51291c5fbfe1f1438db264cf8bb5379ae47745a57692fd385ad676ece49ea488"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/bn-BD/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/bn-BD/firefox-59.0b2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "9f7b6dd396093da3b1ccf1033c8a3b5849bdc9bd9ddd6c5091602720f54ac2f414841232bccf073c068058583e8c76e244824ae8f395a6e33d754d34a2574002"; + sha512 = "20c6a02986ee17c6f16f824c50b346e2df964b17f365943af58d4c53e47d080d595c217e4b26194e23c29638726ce7edab714256dd33a030675f11045e9c7954"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/bn-IN/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/bn-IN/firefox-59.0b2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "1f54554ae3670af5826caeae9b87395527101ba14cfec464b4ce1b02c5684c6c790bd45de2e8ec71d2763a46ab1b9eb4be101533522c314483a1c34d41041c4c"; + sha512 = "9b842e9cf477413b218a19bd90904548206231518a332cb3da59e9cd3cf9f83132624bfb2904af6b189abef8d1f8bd7c080afe4df475ac7d52f404e14644a907"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/br/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/br/firefox-59.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "fa5bf2553b1eceb2e64fc8401f0901add89fb95a01192f337a5ab07ab690c08f296fddabcc7c96f45395173c5dc637c094d008c858c48e2f1957996f184373f5"; + sha512 = "eca790d8ac8924035a72346b7a1c2e6138962737c433cf71330771608d9882877674e659d4d5a8b7a6bc0d42413f851bc1adea2794330ce63b9bc864f317f098"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/bs/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/bs/firefox-59.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f1fbced09bbf5fe67a914e9cfecc92ba29d85461d7f44503fa75cb8597e744bdb593913d64d797ce61e52c2bbc949d0ddb8edf8eaa410eb3310de4542e9cc4f1"; + sha512 = "37980bcaedcc5c0b372dac660b55ffdb6362edbc08df99281517531088b9c30126450f76756b45eef6ee559902d4bc5cb9931d0af15fdc86d02bed8280203b22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ca/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ca/firefox-59.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "461e1ffef2b35fb751f2ae7a8e94c16f771a10b317c62fff4f8be28a086393368a6bbe519fd41998b630056ed3f051cb6aa293aa24ed0f8da2c014c2e8af4531"; + sha512 = "2f46a4db3a4dfe7f01aeec007741cc5adeceab7a0cb2c56d55a0415da930e1c2a7cf50b1dccaab3a4149e3eb98c3d27bcdd62da093f1fda2f0d37ff29abc8eaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/cak/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/cak/firefox-59.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "fa6cb145173261e0c45ec198e3d0cbae9c8f7ef8871de58781ad6fa0d8c6897a6c482a6409ff119c53bb1c445d1aabffa155f345e483673e4c24c03c231d6e22"; + sha512 = "daec77d846e2f52a7b3cb59de51728d33720715f90521d70d9ec97e6b267b8c7f463b2a238b83e666e863cfcd18328247c9ffa83a2275bcb945338b8c6ca3dc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/cs/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/cs/firefox-59.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "09c91fa965f855a0138579d665a119ce26dd467acb84dcb4a32034cc722cc0558539ea2a6b84a6deb9f49a184f00f313ce0e5db3a6595d78afbc0b44114b1568"; + sha512 = "c87c673a583985599eda3c9a52bd9c234aa9b1b69285ad9b6711ccce8db09bce269ece9b9184f4631d333aff44d640f6925770d5b5c491ee7554e9072616865c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/cy/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/cy/firefox-59.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "f1a14989c7b129bfeccf6a39e9e3e41b2473de0a0044083904f8d948506702921250b180e1285f7896eefac6dfa8193322ab8045f11ba2ef4bdc04760658b2e9"; + sha512 = "b02ed63f5bde4dd6cc4fdfbc2588dbd0419bfe7dc2072b0babc9e1cc6683589eaf6c27a70fc515e2862e32840435a82f1a14b68e08d054d453ae1e3d61c19210"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/da/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/da/firefox-59.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "2a49483a7458a001bd896ef4683f84a7e2f6c89afeb1467892e00ae9ed424bbf0e7a1f04cbb7621e50dd24ce5c4dd41c41ea24954c5484849f7dbd484f8daac5"; + sha512 = "602934656241088070ae525a83f1126cf15c2c2f4db20557b66d8a165dc5a859f46ad3cccf5d2d34d9fdd2c1521eaed8d4f445de5013167ef1216306464b0070"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/de/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/de/firefox-59.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "efd5d31fb66a7ec512f795e35d2ab020886b80a75bf3efb15230d70c291618171bee3935218bd6f8102d6ff0f9bed40364810b59c2a82d6bd2bb65f4f438f5e8"; + sha512 = "91329ab5bbc605292269d4b5c67fda81fd90502abbf8b75c6e847b8ab479eecbff8ee291753c53d52a16086fa668c06ade52ad613a9734f62796723846950e42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/dsb/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/dsb/firefox-59.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "502659e371e05e605992be92744346feb5bea5787d4a0a912bcad303392b0e6473ed15896e8e6ddc3ec14dde5fe7e061a0430dfaf80f61f788ca3e38ab59377b"; + sha512 = "4f499f1496d7eea952fbd3d3821d249320926c7e5a8fe1071d571409df501d3f8128670a0644a18486b7f559f67b26ba4eb2776311f45dd459f996579eb03b56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/el/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/el/firefox-59.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "6f70da3d019020f5bc307a9cf66566837b21db34c3983b649bc35a7ea09050aa59517659beb2056b0af25c439704b5144a8435faf0dcc911c0c8c6f7a7107b18"; + sha512 = "e9c6de10bf2ffb04bfe6b3fa73977a0fbd8a1b1a7bf27f0f2906687e65bfe497b18dc8714ffd2f1c66207149dc5852e56d3f1e1be9e0a28befb31bf4d34c7b27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/en-GB/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/en-GB/firefox-59.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "3fe34119687c840a2b121f1a65a2f6a75ec3990e0f51f853b01f665458f98ba3741e9188d0674ac2ae72b348a361475647823fc49ef47aba4c7c1300dbf4ed82"; + sha512 = "4ab5470f208629a0e370e2e13273e07a340262b4d0d6422a32fccafec41c2323497b975f650656e401446d0f20b64598a9493be285a657d65bba813b1d77e48e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/en-US/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/en-US/firefox-59.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "533112ad7bc5e1a74efbf9b21d1e3a715f26a88d02c6496b8b1ea51f69a22d9f22a64df9547effcb66728bfe11fa3852a7c61c8bed36fa26d12bb50fc76cd520"; + sha512 = "9f9a862cb013eba8286f1a03844e4da441533ed9d608943093c0b544d44d2ef1c2e807ac5111da7d9aa0d760fcb7ca0ed62dba89c391eb978f179ba4323dfa51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/en-ZA/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/en-ZA/firefox-59.0b2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "dbaeb649e7d95d80a6ac68852fd64f5f1bf852fcb2d7ddd8853e834f8cda2da1e968c239f9ab57cf9f6138c505dfbb607c39c5200e2161a876d783e69f648a93"; + sha512 = "e8eba88073877cbb16cb887b6af594f21edba37ac2dfc9c3f6b74b4a4057b34b0705dadaa9a76f627348985a31fff7a616a65bf852c5a60f79eba8c4061f5e1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/eo/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/eo/firefox-59.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "0c8256a7e314cadfd8f80e8892c9b1debf3488e9ce3175bce276ddc984f8f86d855093a5a7b8a7087aab5198f3eed2d902fa711762749d9d4413f072eb32873c"; + sha512 = "55c1513fb6dec3e31927f4cbc710b1025b955d0d1b0e940b0bd768998006cb702a8f5d57d9efb8730c5947d3258339c344b0a52bb0ab8da1ce1c6157ea6f5764"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/es-AR/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/es-AR/firefox-59.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "fc3772a6adeb97b336a741dcb41d77616e3eef5f98e4e20be9be7f864669c25d39a543fd62ad45c7416a861104b4d2b8ea04341e1a3f7a109371a92e0a298f07"; + sha512 = "1762176dafd956ee0a83effab4afa7f0ddd10a75ca8645bc912a1d26de8a6e0540b264a034c12b91514da94c55925c72f4b804105db95aab56e6a2ec84b1a407"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/es-CL/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/es-CL/firefox-59.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "22f75da22986647d4cf537b5884e4312e8fe534f69c38e36694c408404fd32c4cd4df89ea9a2c14d4fc9e790d6f1ea3322839ad892f34eb90c5eb86c75f115c4"; + sha512 = "964fd97569908d081d3cb0166c1bc16c5881ae891395acfcdb02333fc07a8adc5d6b3b2766a3893440ada3e2bd16244d34872838ef7a5f01ed067592658921fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/es-ES/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/es-ES/firefox-59.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "558b7cf5a72a31ba47281fa5cd3e87e01740d97e896a6042b059353b1abbacdc5c815c5cc1ec2169fb0f551316fea8144b33667c1001737ff6569fca1b1a1d36"; + sha512 = "995ce0e83594b8f068cbbec6f3abcc28672e0a16b19c76616be7c517791bfe40a397116ba83498f76a579a724a184fb5695a75c487d29872d7d9e54a718ec838"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/es-MX/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/es-MX/firefox-59.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "cba4d44e8ef31e754a1555d9182d429284713640b5967f3761f7b3d5f3e33f7118ca6fc2358d5ad5de9ee98d87fec677bc55a7a3b03697e344b1b73bbffd8cdd"; + sha512 = "8678bb5318bde45538d34b5fdbc2065b60a137c76646645c08010df28d80ee9c1c58a093bf05f94a4fca20aebbab3277923f86fb574d10c744d09864e0e71ce2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/et/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/et/firefox-59.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "531ab590d2ec52518f2b16754ef43b7485bd1158087425a5af8260bbce2c65e252cc1a9344648273e2fdeef7f9dcf36bb42d717902e2cce4ab8e5276f93e0d6a"; + sha512 = "3593d261a1957dbe8aa0912c37e5e80e81179c8cab887a7e8efe31367ec8c82726b97912b1b3d430784ef93f0f19d9530850755bb42f8a4cf98e19ca8714920a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/eu/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/eu/firefox-59.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "61c93a67ace444f1a653a43dc2e77cedd7e42e01ffbd0ef07cbdbeed05c169243a3a1f95ca8df13f5510cd9fceb4804e91e05341ba7011c7793486ff7d65c262"; + sha512 = "6731c132e3bb99c573494f77b3d7842d5cebe7738458d61f4af324ecc391b2b06a4bda92103dd4663b5e4e160ae46843512ce6358e961f61e89f4d22877f78c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/fa/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/fa/firefox-59.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9e9d76bcd4f3c5f806fa2518b47f88fc6cf4c0024e0e7230f86887ccdec7dedbcbe97f8f00b95c2f51da06e1e5418a381b2ff2a697c6c9d6019a8de82927c4e7"; + sha512 = "f10ccacd5d789d12750ea0ef9da09b72965057838cc9647e1c7f854865e460836bf584199bb54825ea8d7217b503180b536227300ab35eb0f693071109ec64b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ff/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ff/firefox-59.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "307d2ffb644b7f3017659077176f99d6387b14ab9df9fe73ca8a35398f31bb8c3d121d944e8b4f4a0d8eb3d3b6d676eddc9e498e47e99e256d7b7360fb973b61"; + sha512 = "64f19e45f75d9bbc4d689792929f1d5fea26cfedcfbc24efa66185962bb4aaa33ae4d0a89ba4234c32b5912f2073d1e7f763486329bc64023007536a2f261e7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/fi/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/fi/firefox-59.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "919a0f324fc319af95fa1b89aefe1cc2941df075bc0a9a73399783bf8c45109104bf83c849e898a432372f859474d80c7bd47cf9df9c638fa78fc7645deb785d"; + sha512 = "77f3e1e4ba18b3339edd133d2da787da751c83121f935e250f2b2e2a3af9681948e00848940a9366fffd7d7294fbc1c3a2c76bfea3457df2ad489be2b87198fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/fr/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/fr/firefox-59.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "b3cdc9444bc33df14efcb02b13dda7b693ec92feeb29d774a9778452af8cce80f4c31be54eb79f43ba5bfaf4dd650ecc27f6c90a4ba7370b49d36b46fca67539"; + sha512 = "7ff1d888e393c34f5240c327a47133bbc343f92af63389f7be95d118372a82125171ba490df4144841adb4c88157d91e81d2f13db49d259164e906d79f8ee1b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/fy-NL/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/fy-NL/firefox-59.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "689827ce2582190c6d334b806dbc6763df20c603504f9f8359dcb47db2751da20d22057a74677d2902d629f7971e30799587314613983c0d3b84db1d334ef857"; + sha512 = "3debcdbed89a67615b44745aac4fdfc024ba4491b4d46dc5323e2664daa55b35b22e89241c0a43a295bcdba39d5f56398c5f6eb5173c8d30c28c9374f08a7bcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ga-IE/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ga-IE/firefox-59.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "bd21df3598bef80f225f0d3abbb448c1a669ed09a9a428652ff9df6edb0555f0b5756471d43a98e99699dd05f443fa884076333f2e77ad346ab59971ce978666"; + sha512 = "51fd42eda958d56cb60f84356acadb32c16415ce502e5f250d05645874b0f351b2e148f7e6ebbebac81b42b3eb41dcca6e58397418878bedaeca9441bde6463e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/gd/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/gd/firefox-59.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "6e09eff050f04ef17bf20488855b09168d43476407bbcc532f378894b9f5f977b45df66451938cbacdc1e15c50fb942ec0eed030f6bd411d6f0573bcc822471b"; + sha512 = "a4b0afc036416f61841dc5fac00cb1efe4acaff6e3a195e5f8633b3bac00bfa0ee687643c43f8d65c81f6c6fb1407fc36e4f7ab21b139b224ea6afb8b698b922"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/gl/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/gl/firefox-59.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f2d02e394ff5cb30e981643a3501631a05464d49d1dcbf4b291c29cb95d08accaa097000510136b2a7bc4cc327cf84aeb8a7b6afa6d3922b8b6f722e3177c966"; + sha512 = "021e7fbbde49dad50577e1a5e4b05d28c13265009ab5b596b5c1e55ed689a9068f8d42f2033dc0a8284ebeb7c00765d655578c34ae4952dca00a2f2e41cfb5a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/gn/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/gn/firefox-59.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f2a262729fc5dc12120ca4d455f5b353e35d11c7ff9768c5820aa6e925d54377ac61b5efc5bdb4a1998534b44c69f139c37939e8548e0369a1a4f64ab2969aac"; + sha512 = "e62d437be1061a9a1b1296ed208005d6367d509124abaa8d5a202285728f7b2408ae109d05d1b5ea1221bc2ec547e25c6aa71d96ea7f76a53f869ed94fe6cb40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/gu-IN/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/gu-IN/firefox-59.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "7d50a4a4a64767444b8cac0eca0741eb484c2c3a2bd7d20738e3fa534b4e8501949cac22fcf5dfbb33606985cee48b782ff66d8838273f9ec8cbce111ea6fc9d"; + sha512 = "1909b5ad766bd08063900d0743b2a1fd786b7f756e6cbaaaca2b59e7a5ec62e9588d277cefc56fa02f7450ba1e219a35b726b2df82023874b186c4f551a679aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/he/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/he/firefox-59.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "771f3664c27b6460bd32b9a54d07f81cab3ce31096866fdb8d0b8346d66b1d0b7146e391c466638810417b01acc568d4f1842251c5727e8909d3f7726fe2e791"; + sha512 = "28ace041a79852500462099b2d968780256b0d8768caa8a486ec897d1d15d7dfef0e9d31949141c25fead1b66f5a2e37684d7233211c7083c42580e438004867"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/hi-IN/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/hi-IN/firefox-59.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "5e12ceb2ae27f825ab5dabf1c723a76769aaa11307319ce937c39b90951ea9bcb7968c49c7701afc34ae8fa93aafb71e8420444a5ad00fe30b541e392c15a73e"; + sha512 = "c634d21e6bbf277db6c62a002410abfc327dbd5b74f19bce2e5b6d75b4abea6ffce679d08b8a7d9d549c00c2cb6334e90f68286d6f0e2272e8dcab6c37e5a1c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/hr/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/hr/firefox-59.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "7131fbeda8f04cb40df913096b65cdbef310efc564241fca4378a75d987ae8d1780ede942e4c99be6ecf9226b2a55c7528e6970012162fbb4ccb777c68da8955"; + sha512 = "14d68c7f13f362a12d414dd8ff08b94ab6cb5e94315a78219b089ec73fbc2f81152e55236fff59bea8295d1fe637dfb0fd4da01513655211c520a4f9247831bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/hsb/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/hsb/firefox-59.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ce507e16150acd524a7bad91c329e2f405da43e254e5c5fd7154b1868d3ba6ee01516a5c636417d6e031b53d59b92435cd33bef44ae8df748f52e76737ca0407"; + sha512 = "638eace158e6531b7f3dcc49da853d4c5608bcbf4a344fba452ecb4945c22b7d043edd6563fc86421093f70cde7b9c906e46fb71d3c7dd796d6d5b4f67bde33a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/hu/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/hu/firefox-59.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "df47ea28cf2f9703e726252385c54abac5b170d8fa412ffb4e200d000258bd4441642a5a6c869ac1c45b40969840e91b1e8669f59f39ad60483f5d05e67aa25c"; + sha512 = "0d2b9c2f8d20893226a4a076a377a103e01f7f0737fc7a64a9821d7fc5076e9d3c21b65c313b5b4a42a64e871de3a17bb1ff1084d6007873d9e4239fe5b41290"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/hy-AM/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/hy-AM/firefox-59.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b262271b2c7c97148e73d3b865b4039f513b2906d6497b872c46fbc871d9172248d685e4740bb8810e77676ee955b47dfff1b7e70583ff9a952e6e1c75304e76"; + sha512 = "081505a00e796a7c45396fefef5e76b23a6c7196fab3ef2c73520799b366c86ed3a1467f877ea7337fbf97ded799edd4fa0d3653fa4bc54cecb79ae3221c8cc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ia/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ia/firefox-59.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "99f0b49037b1244a6117f7bc7eb9b39050abcd7997dcff3baee147f82eaf11216105a408561fa09be02f00a8989c17b6b7257fd0e5eaf3cbe0b2fa3ee0ba8b64"; + sha512 = "f162b7a4d990602e67682b46f4547da779257d3d9b38c39be73733f2c54c47fd68c7dc61e8cb9d0e2bc3073e84fafbf13d864d5262dc7c7fdaa784857917b420"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/id/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/id/firefox-59.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "452ad76e1aca0cb87dfba2827b5400e4044dfc7ac354977c9858c67cec852e62c205868ba53e561f0a6fff4ceaa2c943ed806b6aff255394b1d5f3000b682a01"; + sha512 = "aba8740b03a480b388a113daf80ba1edbe9fbfaed7e778805dbdbfbc39e643c928c06744df6d077c3b488d228e037902453155a106d17b8caacb4f384f58ff94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/is/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/is/firefox-59.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "2a524ea35f006c9f7346692c79b75f96242495c43a1059369b40c7598aedce591a718821871a508277f3a595b2de78df456efadb64623e11dced4d3f4a7e5bf8"; + sha512 = "01445b82aa36954f4e27e3354abfe09eebab46d9759bc08241731f5dc6b77c7474207f9825091419778cc5761b7506aa5c63d9d372596b3855d1d68202bf6bec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/it/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/it/firefox-59.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "5924ea6da00b023d855c3f0aa27041a3f4557f455146242deb3fc3264cb8416d634d6bafb00104763c3fd42ee8c242cde03ccb96865637196116b6a851cbd14f"; + sha512 = "6fa52acb8667ff774955c5d8c93c7263b0e73d61a40131b8625e7ecd75924ef48fb11c24c00d2ead6711c310017b03b50259a90ca8743981478c0c4d34e6c80d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ja/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ja/firefox-59.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "e528c309e5b2623c54f7cc7e97a7b5be1e7af23b1cbaad5f124b4be3c68af47ec4d69469da29aa3d9eb425a0e3b7254f600bf4d93dbc677ab6cfe3220c94e5c6"; + sha512 = "a0b24e4b4345a9bab0a9188a52830a04154fa7e300b052742e0e841395a948b274f39e3a6002d515d906e354f6b956c7ace251c4d41f84f737bc0c09398654a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ka/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ka/firefox-59.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "baf728ae6992faa753133c9c58a577f1f9db2b015b2ae298c2b7cc52fe63ea11207f54660255784eb1fb35ed10ab41f92576f12fa6e74f6e98f7a6202cf94b00"; + sha512 = "530321087765655b84ded7a7f056d72789da5f71df107cb238890038008f94b737f16ce80f07ffd01c727aa8813cbff3dabada05333259ab5ccca51ebc51ea46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/kab/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/kab/firefox-59.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d291d6aedc08b742a8bef33e42f23ad9c6d1c6c643632093d0fa2385a51d9549693dc3cff839bf9ef4bb010ba0baba27e795ac127ad548931f941d05a6729afa"; + sha512 = "e1dfb627581c4ff0c90a51a0d3bcdbe0acbb840a4bf07cedb026809ab158c8f07ecee828313a0003768c800df14787a2d51621792d45b169bbad5f43911a0ceb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/kk/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/kk/firefox-59.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c31db1edff534ce6139ced84c4d4f2c8ba62b1f4c527fc3d10fa8356c8c9f75cf9e89dd5b8cbab08403a80ff82e8b275b252cbd55d25ae22d33dc958f201e83e"; + sha512 = "838421b514ffb4226f1f5925a9e87819b8f418446298ba61a01446eba004c98ccace7a29ba405be546e8def2e6df06bdda3c8edf7e7476cb80da8457d471410b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/km/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/km/firefox-59.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "64423b677533b4e3512bf9738f2688fe81b4f7f01cba414ffb84ae87f8d22721e0197bc1bc5a2ef8d08b953c074b3323fefd383406dc7e59814a31e56ace4c90"; + sha512 = "fb8ce7c1343ba44c7287cf3b72cb42c386d184d97d738858c74daac4d2c1459d8b2449a8c238918bf3a02bf6ea41d5cd147e606c6f393428a4b5698cca1db2ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/kn/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/kn/firefox-59.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "47d693842b2660f0d0771d843b32bd21743439902883254220c0d03cc17a7a667185a8a4806148068125ebddbae4053dca0e1c38412ba1aa80a0879fe9eca946"; + sha512 = "3f758a46bf1c830addd2bcd30b658bdc38adff107edfc1c60c214f4ea9b8f9618371f01a17d081ee8ca09247be5e0e473cf8e91d3984327365cffd6b068d5428"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ko/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ko/firefox-59.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "f7fd914d9de633b6e1d063d869b43023c15b6700cc65266db04557391387a5b05f42b21134eb525765cb0fd4d3c2a37fab27b947cc3b9a5f2e5808b03eaeb749"; + sha512 = "9a6a0d17cc26acd48897d53bda159d28b342de617ae601d1cf67c3ab556e1623d0396445d1ecce85c44f06600305f1008d92fa9b7d9a4d8507c66c671dc6e666"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/lij/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/lij/firefox-59.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "854b73013847d909539415dc36f489f6e1a8a9087834bf0a8725f02542d2751abc8fce6ce4bb15e607a0e5a4a2bea3bda67f8ad1a425452e7540be427143639d"; + sha512 = "b8d0efbeeda3dd3ac90b3139d61ad4fedb8798f4da5efd8c0d76206129297da9347372f5f96f8a267d341dffa4e8a130c86d11ceb3abf34d4b18dbf14781237a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/lt/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/lt/firefox-59.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "6952abea7c5fe660a609e7c033096f457627412cc92d47da78c205e45f2f89df47d58a01048d3d9aeb179882fb8d1bfe6a761a84996bb1ee6acba4aec2b1788a"; + sha512 = "7d6c49495f6c85dfd615bc4f027f8043ce0c14e39291b4627294ac748e8ea1a3cea1035621ff4408238e09bc4781b6949a977b911a1e2587beced0004bc0f1ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/lv/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/lv/firefox-59.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "daeb9ec3adc9601f716625fae5a1b12276c3bc922e97891fcf0b6cd7cd1b62782234355099656f4b9b6dbf82905e2e194a50e08fb5af954c6d6bf7b33875e5f3"; + sha512 = "427490cf7a97ee7d148577273a90f84fc9a648e43d423d3b577222af48304ee6c621abc85d7904dc604c3ab7d97075da9969309167fe144c251da23fea9fc61b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/mai/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/mai/firefox-59.0b2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "889b45746ab8457b30b45788628dd416f7647e48ab967c01c67eff305bbecc22706807034bf375e549a379ab813080316b5eb4b505846cf84443deb9a9ffd301"; + sha512 = "975acc62b72e714fab2b2093545dad447c5f0fe8afaa0793e9850c19bbd8a164d8d7c47a8a51012f20616449e4070ef482ec0021bb156919d19e5dad1096de37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/mk/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/mk/firefox-59.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "894a9f606d41bc7f8ee8dbefeba6528758dac2c6db39a360e840fba06848fdb9a291d9366a805e21308b31831669580687318706a4e583edb1e0e2fd0b83e594"; + sha512 = "27c9e9f8889d5cf7c22febfb2ae68f33ea487bcf6fd52508397b010628049e5e6481f93e5aaa1672eb026b9c1153a6309b3274c80e32eb5318c5863c93537847"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ml/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ml/firefox-59.0b2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "d39f9ce6c541e2f2d5d8797daaa367910b9e2f03553a4b164a10be7d279df82232f30f5df1357f378a7daaac3bb5ccc32cb42a6c1e8d09c58ac1c6ba9fc9fe1f"; + sha512 = "d878f2a8ce4ae8d41da6b14bb9f21c5086298fba45a0babc7503877f5fccdb3353a6f38e59477ad848547ae752fa8838ec35e8f05c2b17599862d2a186d87c71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/mr/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/mr/firefox-59.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "08bf5dee6e49faf9b7355d8c4376b39b7e920dff195a0d1eb7e08526a7ccdab6a45c6b71ca3d44b0dee02748a8e05b692038811c9c41f4f10807e6fdc9ee763b"; + sha512 = "3b676c46549dad44b1ecadc3257d0155bd1bd89fc1e09b2d40ede35e4489df8940c8b157dcb9a3156a4ccf99f4d4250eb6b3917a1897780edea0c3579b0ac62f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ms/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ms/firefox-59.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "55843fae14f492554bee2c030519a0ab353c07b79534acb804ce5f00c975ff6289fe0ca928bf51d2f2a14dc418a46b6f941d0a39ca369db0b7e41763eb81108f"; + sha512 = "c119d6197d64e1bca4fa2b7a9a567a161f385c66cb954b9af65984b8a2171fae85ef3f32522bf1f006e676f4fece00819e83e546d670dd1531459638e8af4201"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/my/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/my/firefox-59.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "3cd642cac6dd6e43fea335cc184fb788be235b952a2cd2df82dd93c46c3c94b7cafeef2669383d0b8a0db4f0463c13eb63190a94478081461e9c6b388996b1d7"; + sha512 = "2da280c117a3c5f5b4710a8342be132ab8432af3b12662d3ce424fe55354636c803cc75f010b0010975247b11ce9d6fd4310705156687f347b41a8e7d1c06476"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/nb-NO/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/nb-NO/firefox-59.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c2e9e6813e99318a947bd7d2d1813e2384cb2afc0c5bdd25fede2242e8df4c10c5e4e50eae53a4ce03452bcc60f3a5237097c15aa8f84a8a06c2193c60412bbd"; + sha512 = "71fd2e1499a365053ca86df20322bf21d684167e105f23186b773ed449b090d5652a7bd4b6841b089bf1aa153856698915f5654d3ab0f5865bd4041712c61bfa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ne-NP/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ne-NP/firefox-59.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "43efdcaf91bfbed24879e8b4be11c5fe47419f641e9f7d8d1b25fd3beb7ba7766f489ffeb3c6f10d0c2c0dae54e1f9cef6a66af5de6340cb0fe85587744a6cce"; + sha512 = "3af89cae0c251f7d08cb657d28e0ae7fef905c6f579780a5ac6e70ee50233ad1c1eb6b83697a1a48ab4532c55d1629112a87ba86758721232ec4b7c662443a51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/nl/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/nl/firefox-59.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "1bd042de0e90677e55d15b383afc9116b2260b2cd7fba12a62a6388e0b84713d1a42bbc3bf2def8a3b904f8d76e7396900828ca7958aeac2e55a157da737ee05"; + sha512 = "c472bd4a28906a239df3575b15a5e8ce5d21539d54499d91dac655c3d1f77fd139927f48b6e9ba16339932670b4ad38c38d6d61fc41eeb2b49fcd66e7a14a218"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/nn-NO/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/nn-NO/firefox-59.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6cf95751f4047a72945c0b82a211e04a2c334827c949f921f5370adfdbc670554f5a69d0a48c953c7a6945f1407cf069dcf02e531e1cabf51fc2fdff935d27a0"; + sha512 = "329aabc4427d21a40a20caafdb0d7a0861d954d11bd184f4df1bdb3c26e96c96b7253c5fb27135b1d072b37c39c3ab874aa106d58e57c76ecdb1ddf3424f8556"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/or/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/or/firefox-59.0b2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "504c84058db18569ac1bbf4a689df45d7d6454092815f8c74eb7f5d49849d8719ebdc6ecd64fb09e1d618cdecdaed2eb037ac107336a58a505a7b8c2bfdbde76"; + sha512 = "e15176391bc41b6fd91556565e96cb006876bc972cba540b1e1a14d71addafdf4c7fdd531852a567c240c8cd984fd0576d64c791ca55a56a6a96673d3f1a74d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/pa-IN/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/pa-IN/firefox-59.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "fa83c3300c8124b12f0a91e25598787c7d3066c3057bb2d3f23a2965ef85eb5da7f7f81a68d28822e51d7fec946221965964de0b6b1e3fbec78a1cb512e62fc2"; + sha512 = "147bdff681ebb50c03dd659eb0fd068fdd1eabc328302f95d0d1f225ae7b842e7c5c33f25606dfc2936bbecb7d65052d29cabcbfe03e746b4ff9ea056630c165"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/pl/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/pl/firefox-59.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "081c6eb13dd971f53f4f3e1673f2584fb55c194257a8deb708aade74d1db3f15a248832cd35b97f4c3a439aa9ebb7abdb6db645c879e9d947b8f9f62e020c762"; + sha512 = "fb05c395ba97075fbd516ebbf2398753acd6aeddd173ae926f5f8afc8a2a70b97bee093e490f8759b7433b7e35103ad0e7d2bde97aba535845ecd6ad2303af96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/pt-BR/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/pt-BR/firefox-59.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "6255d09c6542fccff67d5a4eb0fa78a65320ca0af04737455bfbd6887a71450b26b9eec80fb9554e844ad26b9751d4b77c47c16a60dcb7ed03f480350e60d9bf"; + sha512 = "59e4632da1f429add0462c742ddf86268341621c347dfcfe8d78926336cf3fa2ecfaeddd506aa4764dbba093f893ffb2d2113aedaa27cab0541fe136f59e259b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/pt-PT/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/pt-PT/firefox-59.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e174a1322c08e8e536e70367a0dcfb16d17a5278be9983968060aa9dbc5d838e173466bab5d4218df0cf6313ac53046ef915bdb0a9dc8ba8b815ee3c0ffb514a"; + sha512 = "d2e868b2b446da9631eaaa2dc07cdbde5e6f8a4af6cd9739883b8c34eb5b363aed004e2f60a77c2c6e87e7334396f48fcd339265b5c1bc796673679920a8f6f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/rm/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/rm/firefox-59.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "24168f201152c1cc90e77f47a588ac248553be5ab9f3cc14640f2d489e92bff633098f10158e759983aa7091bfc4c2ad876ba2a7beac63c050a20b950c45f616"; + sha512 = "596f82003a62828a97efd0078f75ed32ad4ddae4a2885bf9eda09179f4c838f41a6dba3c5398154cbca4c65c52b1fcf31df55813ade3f7f244aa8fcec49e07f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ro/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ro/firefox-59.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "a4c9cf2bef20c6a656200e2915965ce78f7fb905699d6cfdd262c96aa0b982a799a4ed19c5ce68ead13976745da0a7b9de9068a88f83608f11d1201727db1dce"; + sha512 = "93bc8fff9c175319ef7010109397e317c9d40a6a36c396ffc1a9c294c4f69b0138c3b82d94a513e0b836ba928d874f94b93559c7fe967ff4b43ff7ef1a3373de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ru/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ru/firefox-59.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a934a61966b4b672529a4fb8f9c160966f074f7fc00c566fc61c7e1cc8df5272c3ef747f8467b26e62c840f65f31ab40b56f851e77a60c2fab26689b0c01b225"; + sha512 = "5e578aeac081c401874dd3ef0e859555db1f2e98f28cbedbba752db01cd293f1ac87e92dbfb6aa23c7bcc08be3d933c9ae7e93c4db43e9962548e8ba917a2529"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/si/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/si/firefox-59.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "ee60b9edac87d18fab032bd8adfc8e64afea91bac1ee753c7d96ae9d9ba7c74b68117a4690d9046b7c06b50f09227a196f79cb8385e91ee9fa81deb33c555359"; + sha512 = "1223131fe2eb31289a8cc3a47f5370ab6bd647765b25bbf3f13be9b5d9b46f8b52869f79b205ca32022a525b41ac061b14ed495a874ec31fb6466499c18cca15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/sk/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/sk/firefox-59.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "318b2a275cef50151246c99d236110379a61368632028768a567134fc357114c6f18e41a5f27f7be61330dcdff158e95b46aa4adfa892f5a7a70033500048750"; + sha512 = "9c3abe1509deaa9f817725656ceb046e41adf5b719bf826b56568834005d3a79bfae333cd390b7a95176978a7ce753a067fe48dff2094a166a9068d01f65dce6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/sl/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/sl/firefox-59.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "8a3c70c3fa5b9e572dad4bb35d6147db4b88626da45c7cdf6f690a52c4b63dd6c70911c898ca2959e9dce5a124539ee518f101f86550b26c72f994d3c0a05e26"; + sha512 = "b01fe550a82859fe823d6f166f0592a3b8a01d4708f6656b6d1d7376aaa85b37e3f774dc6b05dbce52da8b6b83c8c4c814bd75c3cc11d389b865b4cd2da61a5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/son/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/son/firefox-59.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "39701f0d0d2e52b0a5b71b120d9d88085a90d6409c225feb3420d71ec2243a19dabd29f2bea83cdfc75e41bf050e28fb0e6cd2c171b6da2c5786e1d52f4e9ca1"; + sha512 = "88b380c46e2bfa72980a5592f687763bc58399a75af27dd0d407bb5978ac618d304caac52c1a1d064ea23845a00a4be523a7422b8c41288c75f007deca24902c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/sq/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/sq/firefox-59.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "027836d02dc8bb5fe127738918e5d95783d7f3d90d6e06be868f6c9403b5bce3cbd9eea138c0fe8456ca4da80a97d1440a7f3c89090e6944daae16ad79f0ae33"; + sha512 = "27daa2ed842d4f58cf178576a8dd42cebaf09b2b6f62ce2f49f485776c5efc322013c96cdc11296b3ec988770ea1ad8e1cf012805c58804a949268d50d988950"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/sr/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/sr/firefox-59.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "4ce7c5d5339b1be376f55464dff77e23f4333a78897c2b2b7711594fa4247db021142b121ca00109ed8f485117896d48aee059393260be62bf7e9d7e3d86d2ff"; + sha512 = "35db5da3f76b1813da98aeaa578713ed8249d1d873a32dffff2bd6ec1aab7050fbdcb34490aba2f8a2ba0679d16b10334985192433b6339780a6abf054e43fb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/sv-SE/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/sv-SE/firefox-59.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "37899bba50f5ed45ef8eeeb706902dfce44b3555a3310a1331a114e664a9b336ae0342f6ea07cb0cdf5e3c45a2619a36c8cbb173ec6002330b0a9edf8f6519dd"; + sha512 = "afefc444ff55712cc40d9734148c2f9f33c3cdae55849e69b3177831ea2987643e75cdd67738ef7b598b70c83a1bdb6d2fac45f16b6374c3449f5a89e62e2c5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ta/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ta/firefox-59.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "3f77a211d6d6e9b7259cbf9c7b67fca512acbf6f0f9f54fd462e80a13f8ca869a52b4869c6ab806898c6a4e0cd5fac56cbc66134f06e19f8a2ad0068e1ab519c"; + sha512 = "49e4c3206266715a709b903165c0c02c60313101e85f052d92e7ce63da57e8d2e86c2496901c1518d43dd3d8aa3df2d94dfcd08946c195e896688b63127590dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/te/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/te/firefox-59.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ee97218a8540ce48cadfdc80862057e96eb7128e6b9a1855178c3c8802cf70583b5233e46931508e1308f9d46ab98d4623888e9562629f8dcc9d7a493ab6bd15"; + sha512 = "cae8d8fa587c19bf9e0906379e38e8a5d7244edea99355d588a402ec165181669251e2bdc2adec87e96a8c10fef0a113f907c737d9c58c30c6cf28fead37d7a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/th/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/th/firefox-59.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "c6bf64713bc693f2b0307877f33c6c292f1a5d52437aa95a2249b74c3fcc2a3502eed6893ff16a8a5ccd920a97ee0c49e0510efc43cfc6404c8acfe0bdba2013"; + sha512 = "9c4dea86cf8ac5bd98bffc9ff1f8ccacb494001b69a2b410ca8dfb1e3fe4f5792a1264492bcea56806b0521f1074c4db00cfd6c51d951956a7efb9c55ded7567"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/tr/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/tr/firefox-59.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "10c9d78032fcf3c5818b099604be21ad1cde63abdd0e6d3471682476ebb134d688f4762968c946768ad779fdf63b7ee4cbe248be2d62499fce471e15e595cc18"; + sha512 = "4534db68ae6e89473ec1f7dc50d7195c0b702983834c3c04115a2d45bc873a69b893f269c4a47d4beff7928c4c32432419f37d9b9827b94cffcced2b53dc7dc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/uk/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/uk/firefox-59.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "675dc7a7afe3a62ac583294e4ac30fba2b4c46831ad5c45d8a94c072c62d3e3ce7d4ec52814024ebdcbc3021ca7a9f35bb51232678b2c00a7b5045b4080335ed"; + sha512 = "1e50bde63f76c03793efa9c1d532b94d68d06cbdc497332d9461faa16ca4aa4207eefab01894e88bcea4922d93c3728a362a300900add8c658d6cbe2156b96e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/ur/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/ur/firefox-59.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "9927bd2ac0b1e189b54b2e75bba1b27ebe2d3cbab76eca8c2c5e068a2f8d7aabcc2c37ce19b09afc1466e9f5b601e334b9f2257782d8b60945bb8ecc433e0614"; + sha512 = "d9f25e556639a6b79ad2bd35e94bd5630e659f88c1e62ac2b934e5a7bab9bc1871bf2e528236cc48ca46531f61d04274c0be1f266106ed1a88c07f3097c5d0cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/uz/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/uz/firefox-59.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "0e998b84154a9931497ccd980724afcfaef9e2e69a56568c94c592ca30e0481f6ed94c15975e446766888b7efc61cb9a300c7c2eed4588659afd39cc4d1d3741"; + sha512 = "737c4013a4faa0f8bd60ace2c11ce55be2a3445ab61d0f3740e98143c8203ee4da28648742f9d0f15ac36d48cfcc377153e67b4ac4815ec30389bb7e6f7e6b90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/vi/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/vi/firefox-59.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b6ff1f027e3178a827a5628fb0d473173b367e39e030a36517ef3660959dbb7361e092988a58ef2056f0821082ec37743b2452e1491a29f9e96396bcf8f2d6b7"; + sha512 = "58434ae06ed3c9926d750a1c3be387ac23bb39644e3f770eaf8d5389189b8b12a26dcba9837aa892b6433cc27feca1d04efd35fe79f4ce1ca258a423d053f06c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/xh/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/xh/firefox-59.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "88efced7191403a7107eb0e6453dedaf99b8c41bead14012a411c6c44375f8bdd6a13aeb8bfa2e2423f95b1fcad42ea71456c01df25f152d11512cb06d860797"; + sha512 = "b381e16a906de42b2673b53b371dba85babc0d30d028a647a6be44322a2225f779205be849e6e1a9b149b13a0d38780af321baafef765cd9d24867b4ca25aaa3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/zh-CN/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/zh-CN/firefox-59.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "1d7f482e2847ea9d086e8d27a51a4677e8950768b783775d63b77723fe350e42e4a048eda9aaed630880e3aec9377d6633f60af1cf7d86b49c4cfaf959465d8f"; + sha512 = "d17127c9faf562b27365a5d07f48e186f776ff32dab123d19906d25e3c59f8de65b4c50fe76f17852de159eeeeddc63c90c08fc45fb3c1998f52c38f2fd42da7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-x86_64/zh-TW/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-x86_64/zh-TW/firefox-59.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c8ab87b2e2f545e18b409ebe9da0841223577892d7320846742b685075172e980fead8a618e9cb75958171a295835164ef3d7c08a862334635c99c1180cba557"; + sha512 = "fe49de9593d60505128ce017e8100e754f8d3396eb9294fca387a2e4f22599b8b832c197adc10bbb1f455f04f5380df23f8a9870fb72a4a5952e38ebd66794d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ach/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ach/firefox-59.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "907e79f6d32b2b67cd5a1c3a8735483401deadcface4933f298afbde781d1fba314d6e74b01ab6295c8327f1edbf24fc8f42736ae82b606f841ddcad16a5f565"; + sha512 = "87c8e6f90187632e547252a26e2ea0b771cea31852feccd4b61e85e014bfe28bf33100985c52292f17d43e10a4c84c12f7db61a40e32c5d5897f2e14304ecccf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/af/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/af/firefox-59.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "00748f7f308e7ecd15f440de531bc427fecd72a5389d11514806641767c95598c58cc1e5412119ee30048fff4f537a03becbdda0d97981b3f0e5c5c80c653714"; + sha512 = "5ebbaec607518664dfe31e9fc7510b8139b5c2ed9a16dff04f58f7bdd2e9d7dbf1d2f0a76f01549387701b90ec966e1d68303cc32814bf3b54563cafc19d40ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/an/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/an/firefox-59.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "d0b799fb4bdebb33753d05ed53cc842d343d5f3731d2f0dd68527bc3c6294511e4e5e39417846c7973f443ec69a7c6a65fcf1e966d7dff542efb0f65a96d1785"; + sha512 = "93d867df3558cada08d4cb74f90f2f86860163cbbbaf31a6e2a975c844db6cfef1acd471f120e400e55f1522d4491738f636e82030aaae0c0dca06e1e69a0dad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ar/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ar/firefox-59.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "fc31897c60769c6d2ac816fb3ac6600d0b32b7b876afa9c9980804b2451442d5a4d3e1477bfe274ae3029d576ba276ff4c0a9702714688a4f850d48ea10fd9a8"; + sha512 = "0fda3cdd46a9b68e1d4855e879b3f988f5c77bf5085299f782cf29d8116504ea51a182e74c3baf905012f300c32898317947e4cb9368ee28d5dc5622c01f00de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/as/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/as/firefox-59.0b2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "a893f71db1a40a2dc72935c92ecbfd9214d939800bba9458d6465ea77e7eac271a6251310304b9649a040d68825444fbc4be43ef17fe98688a4c1f61299a5dee"; + sha512 = "d5de572517cf7429ae85b59c10f4983456d4581a7be1d0a4609b40ca112f34d08c487e445032ff34cb429f9b38fef9adfb000d2cbff47799725575d101fed65b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ast/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ast/firefox-59.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "9b4e8b4182040c16f42eefe93cce53ece965894aa0b04df2a3e8722f563ebe61e2a4d4faafa2cc48bad20ffc23fb9dcf77b4e748c34400f3a58fa585a43bc02d"; + sha512 = "db14854cf081e9da31d6c4357b9e11941cc2cb80c1299a80f7eb44c14ae97b447705eafbed9bc4fe5d85c6723cb6253989066c946acbe5885d270fcade12d024"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/az/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/az/firefox-59.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "da071c56ec19d50d628e8a447fa7b0bd11cc00ebbe6ff1058c80f9688b852a7c93c69ab0206880153e3c96889569b555d94f7a5bcd1cbcad1cb08eba2ece7088"; + sha512 = "45d1c70484ffb5bf6203fbb86793af83d5997f3bed1f477ad2eb46adaff62ce7b037041cf749e572b8fc5987ba8333033c00cb324330c1784de622e7a8d54e5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/be/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/be/firefox-59.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "96e6e6ed438b267c47ff16a8ac92eb51c3e0a7de2f60f7f76cffd420963536df350f92dcc793c0530d923895dd1376e701c6732c1559129dff5f8d55cc580cb3"; + sha512 = "d15b996bb795ca189307372d0d6ed88964fbd726afdf5e7e614b1b6d5538e1d664a5639695ee4254eb5fe2172d4a59eb673715c12ee9a5205fd86aa17e3ff1a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/bg/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/bg/firefox-59.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "9e0ab2f70b5f7ddc57d34c134ad6133d928baa04b56996ba86f3ab54bd0587c9266982b6ece9d495f0851214a91b91fa9de615ef6ce25387115983c71c8db1f1"; + sha512 = "6021e83f3844462249463205bd7c87cebcc94eba84419215790884237c3c6e97d6b5d2ffce846b9f786bc8adbec91f0418dd965e9d32da50371517711c9fec75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/bn-BD/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/bn-BD/firefox-59.0b2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "dde932ca024bdfe7a669dbe9e0576c2252f97105a7c4b2583586fc8bcba9029501ba9a2a86056deb558ddaec9e21d6bd86fef531d7d7759441f7c2eb66936f12"; + sha512 = "82fd58b4ed827991649b738c195479af8528805f2cb9af88828598a607f4497ff1b2e383483074b3d7e9f98ebe80d6df2b7cc1da4cbb5612fd4955e4339c3a5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/bn-IN/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/bn-IN/firefox-59.0b2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "89d2b7f70a66bc307abe3d603f43b8c20f616c77262243e68224edcba43c4fe6c51fdf5ed485d16b8994df778aadea5345b24fc446c41c77dd6bb48704aef7c5"; + sha512 = "047f01095e249ae011086dffb975f6701de4e8f70c100ebeca0ee7c909b9fad06d81756b0cddd9187434f16889fd6466e6135958745f06a1ecc80167b8d0dc2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/br/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/br/firefox-59.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "e70dffe245d192bf45b37771d26f1660e1f3543738bfa3ff4a0ec038d6e4f1fda824f8c202546ada52b55993312fbba3aa88390de43fe683b5205eb8ca6147ad"; + sha512 = "0a7c62c5ddc39973fc57fb857d5c0bc070bb5ace655f5a859e25229e289ea1fcdec82b528ed8e1ca9230b809fddff664dd6dac1e76ae1c36eb7c590e6f07f019"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/bs/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/bs/firefox-59.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "bc9dd46ca16c7d5848944241161f0c35dcd91b7c58eb9da1ebb839e647814ed2ca148d04f3596d7a811b7ef238343a04e33d2259ae9aea14ee79cb4405342435"; + sha512 = "f0cf713285c4f29373cf029c57cf2c684d70b783f39c22346c0bcce2e6dfc3f4af87a988901d1d5466a48d9b0aa90176e4eb6fa9d6207a9762ea486be027456b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ca/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ca/firefox-59.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a3bafce06a0bf614260159bc3d4ee3ee87833329ebfe9f77e3f8aace8cc3c83876ab0b0088ca0e6849fc6466492ba0998d1ba9319f97dffa492cb4e550cfd317"; + sha512 = "526baee77b64ffc66136d86f995d030318145c2cc5fbd1619fcc17cd6451d1824b9e14f12fece6350c82380e9f3d70ca68c212234d322e1ceb214a26328c0b8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/cak/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/cak/firefox-59.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "aae91e9bdc51466aa522cd43584d32a035375746d2958963259ffa520ba00851c7cc189c4bca94c5ff798c5b548c76241ba7959dc262a879aecbc2fd4e7eba4e"; + sha512 = "9100f5487fde40da2b475e67b370fc42c53252280fae2a4a238c9e9267a7de2f5579bff60c9f9a960079e73b50d7701849ab0e7cd1f3cab3eaa3c383e99638be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/cs/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/cs/firefox-59.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "938a2151969f9272ef3ae5bbaf76571901c80bcfec3de25edf60b57c91483f752d117ced264fe1c082d067a91e94f3b7a3671ce23d4152bb4cbe718add5463ea"; + sha512 = "c18597954c59d0c709b16a8eb02cb3412f9e6711a756960a6025288fe34f6ca59a33e64a6d90caa8688ded6859c0a2303420f6f1ab8f4af8bbeb594f92873b46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/cy/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/cy/firefox-59.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "c37104c136d03de19903e4b6a0fd4680641f61d92dcd167d7cef12f272e34eb409d0cf7bb902842d139db2fdbe3ff009bd7e419553061941f67f9d016291cb76"; + sha512 = "65c5f07201cf6a2c90f58dda7e64f74fbd5f84b452c58ab8d8ac50bbf0384ee8fe8c481e04efa0006d6e9740bbc17c2dc841fcab90155a04817a567904680cd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/da/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/da/firefox-59.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "d56748e00bc5ce7d8a1fee9c0a70e306c83ab85af4b3ce3d3368fd0e6a68fedf56ec1adc064affe698674918fccc7cb9a021ebd411ef99b26cd6f2c5b6134a76"; + sha512 = "13c5111bf6514b6460b87d8eecc737d6143a4b29645143ba6e9247c6565a06aab88876eadc9803a953e499e9d44badff8d363e2c58e4ed3d66d2983d83d18857"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/de/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/de/firefox-59.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8b6dc6274026a97c887871f3e44dd0e387a8cd8405b0327146ff47fd3b2b0c668770d43a06fa5dd7de7005d5f44bc67abec940c913a7f9ee0ceb35372f0aaa7e"; + sha512 = "c4fbb620b2436a2f1656244482eae1e70bd1d6f3628b82f16ae730e14ae4b2ba7efbeb1f98608807eaaa23db1ce9ea592635c87d6446aa67f8cf85c35b1251b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/dsb/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/dsb/firefox-59.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9839bd9fc47fce59c408f42b831ef0c1432d31289c5259cd1c0ae184866134e3a354274c28428259106e838f3330fa4f7d138cef893610cf0f8d1b131756d091"; + sha512 = "ba00f077ff0ad368518a9489f4b6fd8dfc839d7c02dddd946509dd599b0a69a68596eb3d6e61debb8dff1621d7eeeeec5e1bd030a157ae5767cbc0108d2157b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/el/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/el/firefox-59.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8285167a63cdd0f86a50da2e94639cc57cda6003941b89dbee9c9aea36c9fa03c33a7eb2639d535e0188e3beaf28de464cf7f4aca2cbed1fd06554319f54c06d"; + sha512 = "86eec1935f260b2896ad90adad6706fc4c393a1093fbc33c645cfd511cd7b5e6c8999c80ab5278f1877164bc69ccface76e796353577f63b460acb4e4b71a869"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/en-GB/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/en-GB/firefox-59.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d7908eaa3b00520b12949c8834d673885cbf13a6d9dae24dcf801d5a2da9a11f93647513659f2fa87161ef657f8de0392895496f9800c29035d9f9b585b01ed3"; + sha512 = "61e4e61708523680bd130d2dc1e05141f1748982004fce82dc6647a386f0b81fb2149116ebe8e41313855edd49d4eadda026af4b3e105c635897d54e6f80afb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/en-US/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/en-US/firefox-59.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f805faac1f2edd151758e0e1f6f93dda6d664a89ab54816a07c321b86869c7e7a96cd40e2c8709b96756c01f7282b340d29119a7c10c90a99ace4cea2d5b3e79"; + sha512 = "ff4bb4454260a1acafaefd2e4dc67f5ecb846e650dc782b9c85d40838889a0b3fa7a4748a766da506fa31dcbae598110f9f6d4c02bbf2ce8b540e90a4ef88da9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/en-ZA/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/en-ZA/firefox-59.0b2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "580dda245fca3e3428e0baea7415b54b2f5320cfd3bc82a6334d007fa06301f453a2ef0444515b3ed1b5714cd3bf6e415d25757d52fac0f90dc91de8de249732"; + sha512 = "e6f318102a4def850f58dcbbc87742c57a55ec8060fd59a8c68009ecfeb9d2af99d1a3a2cfb77159863f2ac82853643771bf065b909b526cadaba272f6145964"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/eo/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/eo/firefox-59.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "c503368ede8873ac8bec98daa26233fff3e56729b8a7ae125ffc8661b4f0ecd01a7c6281a79eb426b0a0a1ee60fe7addf886a6fa152f912af33e3e66224946b8"; + sha512 = "32b32d07d749a7a54957c7101fc07da02acdc01ddcd71f7050fcd89c5571a4f88d4c2b86f16523a8b4804a6792eeb1a331039eca92dc223697238eaf29795aa9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/es-AR/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/es-AR/firefox-59.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "fc5e62dbd88b7fdb74507a8056629ef9fb321064e48834fe25b0f4414c23679334d39229a236156c6271fd1a0a936a020465af91f54659e346bd8eb794ea7683"; + sha512 = "954255c83d724bf2953554e80788aba016dbf16ec9658d4b0a73ec97f65253bca93a8727cbbd65aefc60835aece6677ebeebbf67754ad70ab6026d18ba4f04a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/es-CL/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/es-CL/firefox-59.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "6ac4b82ea982aa85deaea4c1f384562352d4bd3c16d78c9fdb4b6b5f33848f97d3450348fbdb2e9f6f58419d16af0f676002021930e412b9f07c44d824b0f0fa"; + sha512 = "9d28f78d180dc96bcfd01a0936b1a7bc7494e4b984b2832f1d77fa50ed0921eac86878fddf9bf85f17d1440f43ed4b375788a3efcbb0883a6e8e51ce4ee8daf0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/es-ES/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/es-ES/firefox-59.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "d57bca44715700653f9187712f90ce6a3d61fd98742ea8206854ef4ef8f1c38b348f462417c90f13d024fa1fb0407ba915b03a07dc648826ede1907d73fc7e01"; + sha512 = "ab9a07be80b295a18dfc1ec3bb134d8dfc3ba5267b78950bdc8089e429de768327d0b30dd3c8bfd8b2529f32d847333b52796952e3dd4e1f239cc9331b1419c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/es-MX/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/es-MX/firefox-59.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "c17ed380bb655abb75fa19b8f65fe2104e715e3c719eb67da3d5278064a725e14ca48a6fa0c0a8f471d21a2a77b602d3183163b048904582396a945477f3c1af"; + sha512 = "0ac06bf75b6bcc5dba737432844d35ec41d781884b15150e0e56f22ea641953d09fcf8278bc894e19fe7c7f1fd35d7b32acceffd6f5b32d2eb2f474ae2b1c1d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/et/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/et/firefox-59.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "2b205c5757d501afd68ba97caedac1a3e11410518d370944fc2b4044253453bed3c408bf3ac5b87d80dcfc546da32b9b3a4d4e85ca696abd6ce796a243e99554"; + sha512 = "a194c2f90128a4c2a7acfbfacfefb659457eb3dc65cdf15086350073f8a40e85a18aad0033c16d987b882f7520000c6a4a1974464b7b6596c66fdfb1625890e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/eu/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/eu/firefox-59.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ca821012b09fe45ada89f1604595e053b5023708bad0030d3e12bdf6ef27924d098525152daedbd95244abfd16a7e54b4c18d0d30760b067b76bdf3243611ca9"; + sha512 = "1e5c57f69c5677f93f081c5f0a6b2acf4a6cba5ce5d60cf7fec04c70299a4a0fd0582c8f235b95eebbab3ee6174d9cd851d26eaf82a92e72bbd8635e82bde9a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/fa/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/fa/firefox-59.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4bd992c1714996465ac155ad4fcb7d5c8ceccb6ea3bbf2b7d4937044e33f9a0fb3496f13fd461deb16d449baa99f7050f0cfb2137f26da0d94d701cd08e401a9"; + sha512 = "4c950be377fb051e6e1a1fea5398a812d12a919485b79c40e8de5a4019f2220a95c563ee6fb3056e5aa30a9ab48b8812406650a4c1fe34cd7951adc4e05824ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ff/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ff/firefox-59.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "c906951cdecea1acf21ca8a7c9bab471accacbe1f8f371cdb7b24a58ec4d4b2faf6b5675580b9b0c54c31286e6e59b261e1df5761440fac45d1869e2fe6c6ad4"; + sha512 = "63cb8e917af186d3bbc57c69d3589758089327be0c35843f506782310d6ca164cc88dd98f7a0d82a66a53ac13a40dabe28d48f95be8c80fa44f6c9c6a5d0af5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/fi/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/fi/firefox-59.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "20a9d1102d482002a4fea0bb29fc09708756f2517ff93186a69272f2a953c483d91891771fa3ad8c8571d45167ed06436139683b828149246a1ff9a87f2644ac"; + sha512 = "11edc091d994c57936a9b0ef19661e840d86d91c45aaa661d4c8ab53ffb4cd12bdf40a827c328afbe3d6640b32e170056d7a47fb69a4c5fea98b8b283de86909"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/fr/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/fr/firefox-59.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7abbf120eb0cf3cf9d3805ed59c716ca561eba35ff8c03ef1dfaeab1f73cf2d88f782c0204a1c80d593f5f0dcd71fb9b1f0d03eb8785a637cbce50d5e83a5cde"; + sha512 = "a8ecec2e214984b76399aedd3a6577743c5bc4e5c3ec4ee1c08b328cad305391eb0aabbd36bc3db978a9cc121bef52f8be7ee4313908af4ed9141f3ff7159950"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/fy-NL/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/fy-NL/firefox-59.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "1c3dad9c289014ecc4f2141465bca4b48a275388d13b94df04576b9a24b3cd1205ca32cd227f3bb307c43af76a3c442fdfb994272b0367ee530370f97d78ba07"; + sha512 = "aa467f4d70c6f8e39a13c3c7e30520d374c8850a16cc3b49c211ddd3f3eb2b6058d2320c87b281e014e7f3000c6ffefae9de9e50dd367594ffe1a4a48270ca23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ga-IE/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ga-IE/firefox-59.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "91a74a1da46e29aa1c5b783fa4980edb4c7dded67a5dfcbcb9d193ecc40607c4f8a2b72eba07a451080aff1bcdd05470134b49d568c252f1181508c53a837eea"; + sha512 = "6a397cc50ff807c2cf5dbf13cd2a4bec63c0460569ba6d0093021d950a51e1e1b7852d2587e93514bb06b7a71c4048a1bf5d253c84097ff7d560f2a11145be8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/gd/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/gd/firefox-59.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "1ebab5227e62976ed365fd1486b984ca8d0e5d5ee778870d0dd9f3e3a819c28f48e7024110bbd3815d682b275e7c2d53a7841acc73280b4d8237bf9d82a064af"; + sha512 = "7dbd0e860a07e0fd4f63538321886c5dec496811c40857ab4fc3d397163b58106e9797f5e21215536de3540286c5601edb428de770e0e52452a58a907017d940"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/gl/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/gl/firefox-59.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "fdce1b98475bc89ad70654dfa4fe5f6e5b8628a6717d6299742701f26fca4c87169180df9eecdc5c95f84c7617eecca933811e13cebb756fd3cb2a12f89e6cc1"; + sha512 = "d405da04d8ffe63ff1dc2acdc8972df3200fa3041482ea08e14a9a7d2039edc2b6bf94b2236303a0f5f23739558b820f9013a7ea229959f6fd7fd912d194e6da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/gn/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/gn/firefox-59.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "668c4e7a5ea6a1583b5f4da5c817f29016bd5cb072d7f2a2f790016aeb70234ab64d0dc799dc52de8e1993da3087449a04991cb0969032065e932444c6cc8c30"; + sha512 = "4194a7e18a52c371d9e4dc2ebe9eb4278dc826f7226e02e1af71a41e60851267df45b926b03418f6677e402e8474db1c4e3c9ba6ecfb9f643ad6db2b5c81f919"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/gu-IN/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/gu-IN/firefox-59.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "7cf14969fafb5ae070c2b6339852ff981f2f4bbbaa070014a7d24d5075ab7d27ed3a182a0c00d1c53cc72e5b5edf17aef29f3aa2b04407b4fc35173e190b4517"; + sha512 = "16b70f1ccd3045ebff212da462a6dc7123ae8e464b1add96047739ac97c2866069f91e8e954eee73d74c8f08e462c9223efad0ae39594f1e438844910abd5037"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/he/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/he/firefox-59.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "cdf40414e536322038e8cf6db0c4f1c1ee2ec25a356f9ce89e9c744e8596f221d4334a909e7b9ba439bf129920df00bb1d9817969a00b4386c11380f0098a9dd"; + sha512 = "c4f8edd1b6dc3ceaf7a07139ac36b105543af6f4301085c1092ebfbaf66f3db689ed851a03d1c245294ae273c8ddaa48a1bc194dd4f2362faa8da69a12fdd8d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/hi-IN/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/hi-IN/firefox-59.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "ee90f9beb614e17e61d568ab0f8f5775519530133b3d659a1639c6dd59aeb400f45479577947b955019a5d3f130380c70763e134e03e048a14402522c3338a67"; + sha512 = "63f98138f38e2a86084f9191688fc24a4d02eb152aba89547b8013b8eedf92c5c99fca8eb2bbdddc55e846c8f0a2dced75fee616c16f533364b3a1954d977f47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/hr/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/hr/firefox-59.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "2c377dd29bb44990b59a1d2fea8cd4ed51d100e53dbf40f2f6912c19e4d387c878bb3fe0dcc3715143731b9914d5f856837917fca00f8b0f1ad9a2595b152c60"; + sha512 = "0ec041ae94183a685bcf8606084e1d45162dd7ee70dd96fc531b9aecdd39696674c1087ecd732271b67945ace1fa25ff3d0fa65ae7fef5434549fc4f5fc553c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/hsb/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/hsb/firefox-59.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "3cfba31357ce6b1cd3aa4501087d31c38430a514cd8ef4b1c4f854c682e6874c816ef3c9bd0e1f4394e23b9afc906dcd1ffbf0eb843f003f1d52f8981b9444b8"; + sha512 = "ee269dc0951621262f8e97ac2e496db71074e89236feabdae4f26a32d9961e8a27c61729c6a4d3f6ab5f105e6bb1c02885861ad997c6fcf8793a0219705c035e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/hu/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/hu/firefox-59.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "56d0a42e5c1628278a3d10eb7f2dcd1ee3295abddf2372886ada74fdc2f0fd9cf9410b381ea29c5343ea08c480abf41f81e2bf78999464f6023116a1cf3d8353"; + sha512 = "e98ed7c3bd4a66f382a1b07565e4a40f21ba709764b5fcfd966c83a78b17a92579d0efb7bc4277588a603b87c1175b2f90ffa35013544c059381146c9e0df3d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/hy-AM/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/hy-AM/firefox-59.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ca9dbb5741107af2ce914a05b2a8dbac4f90422ef891c9f23e5f4ea85a50f641862b52dd3a2d62314f0cbc19081c50f78af4064172bb49f724d78743495d8a29"; + sha512 = "42a9ae492bb1656c77c83f97944c8e935ffa35196f49ce2ad4b376585124882a8754058b99d895d16012aded38e7c836f5068532e9731a33093492e649d57f1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ia/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ia/firefox-59.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "c44cc137d7a273713a8b7bb914cf1c11b6f1e9e55a230356e0429863c3aa7855fbb0439c88fcc05e2ba44e43f8693cb3b5426c9ec62a887ade198782c1e76565"; + sha512 = "4065f70b730a0524608a14e5d98265e7620b3d74ef3382584c054a46582ee25e7078b8ebd41faf65e23b5031d257bceff0d7696c688bc7ea02f17301a6c55088"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/id/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/id/firefox-59.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "263a235b91b281933bfb88862dfe5d13b47422bf603d65bfec70b36c70b176df4cc1989b13b3ec51310891c1d6ec8b30c50b4035f9ce9b60976f13d499de6e50"; + sha512 = "2bc5d2ca02b0a3778c6581dcd68ff6daa33713b8ab477807b0c7b5e393a0b61bb751d7f296a90e72349896462851d001cc9bc1c110b6f1037b374efcad6628da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/is/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/is/firefox-59.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0a1d168cdd7b6672280b311dffa8531d190fb34aede1e82f5aeb24dd8adfe09d4163d290653ee76c46864b86d4fce75f4c8bcf5fa94d377058e84c4c2476b519"; + sha512 = "6f59cc2b65eca9d48947ba8be90e3ab27a4054fb3dc8767d117617f6cf13375aead498a0f95c4e9b0fe940c5ad027ec0389d9aa08fa0ec027dea74a27547e865"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/it/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/it/firefox-59.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "bb125859b7fe54b1d4f786df983c3d5175458c31b3b0c82f976a0617b25093d7f6379fa3f598e3512ae83142ab38d1fb220c11b6a16db48344fa657aa3587cf8"; + sha512 = "01175dbf54d8771e0489f203ef87884354a2ffa120b087cf197949f06f99f31619ac29b902cabe772f3e133cbeaeb1402ed776fc74590c58f020d6391ec035f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ja/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ja/firefox-59.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "053e78898d96dde5ae0894f14d81934b538a7f3067e696b66d90f6005a328bbe84d96d2f9727adbc3befd44d683d0eb90e5b6995eb5f19bc91dc3bb9724fac09"; + sha512 = "e6e9a0fbdae9a95a9f656bdde0c4fdf0a6cfe23922afdd882d697dd2a9a8d02da78af99f2f1ebdf8c13da63c481f9752d696d8a740a1475a9a73ed8ab2adf76f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ka/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ka/firefox-59.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b4ce22bf93fccc91ab7352c8cfd950aa6841796fa1d189cc1fa7994cb549158186fcb74447d61445ca3db2429c45d2d6a0c7d8075d11c9d0f51c9d4f87c89bc1"; + sha512 = "0dcf74d3ffce539d297caea0f6f838989e409ca515ea032732a5b26f5d0903bbe2dc65ba7c8933f1e3521baac1a239e01fb8dcadb12d3ecf7a84af68f4409efc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/kab/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/kab/firefox-59.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "b3f2ae90bb3acf469c633ff4a46b5293566104575254adb512e98018fc3edced2e05da72f6ee6782e9ca5f9cec4de32219b7aa0d2a9c0abfdc806033cc06caac"; + sha512 = "3889344a422d87da5ea77c2e616d341dba642c7948fab8f88c1bf0ad1e88a3432d0cb286248d6a15bd33416bd142e0af0c1e1ed4b5e376197ee15dfb6d546967"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/kk/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/kk/firefox-59.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "1223651e153401b65020d472a55f5d5f4846ce6bdac93ab150060794d43989531e1e1f8a93e787297df2c2c00a3fe25238015f2e23ba0a2f07bc4a69509cee6d"; + sha512 = "024e28e2c3d2aa7dd094f7d76b42b8bf048f1049fb9fecf3026f629c89b19803c96e9c6fb26d756b34f35eaded3e305fe45f41f2796a16e7744c5e10847b1c5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/km/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/km/firefox-59.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "51858735567c5f01d4972b3035c6d21ebec82560677dc3de7ef2f91cbac4963ebe6c02991cee749503cc5cae5bebc1e3587225618303059fa3792380245004a2"; + sha512 = "4496f4600c053b9629d8b9a7f983478410025a45f9614198df668f88ec24ece18c127eeab86c2479834fe968e5101ba7a4589be6e7722ff88eac241d7e823000"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/kn/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/kn/firefox-59.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "4b4fbaf1cd470e2a28bf5b6c7535eaf138ba316eb3630f6f1923f9c580eb74f86358e84871647d7e98522a19034e17a19da3a752297ee984e4892a88f7ddf795"; + sha512 = "29e71f29ccfa3530b7759b5f28661e7d024f64c21bee512f7e0717436e4812895243231b04c1add36bc697cddba256e682088f6963e00890e1db0d808d93fb0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ko/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ko/firefox-59.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "039c7def1c716b6e7917787cc1e1f4797451222f2d795043810587f0f3f23b23b6570e53952abef4479d589e782e4122c60b3bdfd053262c00bcfb6b3d36f359"; + sha512 = "6fff4462fd36b967d2d012ac30182e9a9b8d8af34973a3c73e04ea8d9b2a2ffb685c9aaceae1a12380c2d2690aba353219504e95c748105340089d0db99af56a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/lij/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/lij/firefox-59.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "ab5017e874962aa81a5ec0c2c65445ed941f5c18d080829e96302b02f9ec175af0eb583ebdee3f6422710f3556f34726bd5a0030f9e7a0a724f04bacabc40b06"; + sha512 = "3545dd5a80eb2ece52ec4d927a04c3eb9767af089ff23663a68eab683fcdff871c73a6af5d8cba80e05e32ffa30ee0e027e63ad88ed7eb81e7056ac8150d99bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/lt/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/lt/firefox-59.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "63bd62caf0126dcd4725a81ef5988da21eb0fbcb6ca0c86b911fb10f726a44da71294f8165f53dd2f97c950e05104640d2a9d32c879133bca00af9ef764fa229"; + sha512 = "afdfef9956579633f156c8f9eba70fb888a5502183bbdb26f3354da3775b2f05ad47eb1a58d5eb14b7d1a9caa668af90ceba1475672801b22226101ba336a478"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/lv/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/lv/firefox-59.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c2b4cce39a772de27aa2e658fecb0bcd1660d7996317eb773b5fb16cac9072d7fd75b5c46cdf16bb57bd4eeb8353dfdcd846e2fecd61333e6c419c7b68a3da7d"; + sha512 = "542b3887a363a7c46443c3cdc690ed720bc270b91b857176016c01cef8797f45b9c3ff71b440f208843dbb6b1d617a0ddfd150229923a3ab55513ca46e2449fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/mai/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/mai/firefox-59.0b2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b3f70e150c2ed6e344742904b3fdf73faa409fb09194ef080f707ba8cadb17cdfbc3327c5ab1c11b35d2b50ae09bc4090c2ca40a5aa094ae3ea1a682c59566c4"; + sha512 = "81f1ad814c8852481b2b27bc853bf6cce2058b7b5ce149383a4881556e050ad75feec5a023e0c3d8198c57aa6424ca50b618470d1c2bdecdcfa1eab6cf58e387"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/mk/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/mk/firefox-59.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "fcb1c9bc83be932a0a9565f88c9a8c71d5a2d6633270b55aede640ca98a04e2e7c5f599a8408c0dfaaf84c4a898461c18aa8e2305abf6e32e1d2ba6ffe401be2"; + sha512 = "91ad42c6c1207d293b5732f2d5c3d0ee7dc1ac7eef789184d8a94cd3d069cb8b94ef502733fbff10091e0826b07e5589150c551a84fa720680560fe82acd344b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ml/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ml/firefox-59.0b2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "b526f0ca3698969cba417fa21e2d892385ddf2957dde9b2f0257508d5e77a46385805f8170e8e604dca92e653525e42e0684b29ba2a995771087d32e383a4224"; + sha512 = "d192cc2b55dee9a744b7f49e4eb70269735f96d1d6ef81468b13fccc8c4f6872f4b2259842f8644962025a65aae546bb8015c67a1113241a817eee20653b761d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/mr/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/mr/firefox-59.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "9d957221acdb09bf3290c9973ba5f1a936f08f72a510513f40ebfedd6963b7036b610b4f723545151014dfe2449244b3460f66a8a00b2486ec2500a1c14e046c"; + sha512 = "1a86a512c36d3500ff32f9f88975165038f8396ce8df88668ed28435b7b6df63785348ba1cfcf4cf948e0e21a547a533dcff4286721b558336be02168f3cf7dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ms/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ms/firefox-59.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d1187aa9d9871d446d82d9ff7c8dc6bf735e1910ce8303b796060152a651406e739d663b801236d15bf347fa808e318f538b341ab817749418fada054bb16cea"; + sha512 = "65627bd8252f3ef03ad6fe54a71acf5400a345db11734924f34b21a1013f7e4cf18f7b7b08cb3f3e4d65d3a2ad403a3d821c2bb13ce0ccc3635b7a6b6a82efaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/my/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/my/firefox-59.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c4fa1023fe3443b8de1d4b3d1ebb58fa14b48ff2b484c5ff1bfcd5f63a809ae5624762fac579d4985b77118753c04d2a5bb91ed6a9998a5311d2f0df405d5239"; + sha512 = "8755ddb588106252cb8fee08efeab122687f323894ac2072a0429a0a63e2865297f9654776b96807ee0ba5c50edb920142040597a40e89786f11e4f1ef8a90a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/nb-NO/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/nb-NO/firefox-59.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "be78d93ca6791b377770d355dd4573fb7a1f14e7c747cd8d7427f533ccf58dc46b908188b90e5d0dbb5217bf7622b1318ff1e1e79486a74b62df7121a000c79c"; + sha512 = "44012b529f5bfb8c2b43b28f9a6fdaf9e27937b4b79cc182d475a6845af9a73fd5deec20d2c2208599c8f4317213e125e332a03a47c6a70ee522d0a569642594"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ne-NP/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ne-NP/firefox-59.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "a92afb25ad52cae05fcc91fad8eeda1d4cebd362b0555b5463fda29635c40393c348becd7a73fa822e298ef2ee3f9ed58401727bbbc7bf40fd31d302a7283016"; + sha512 = "5bd491daad220feb614550e761c192720fc002ce7ccb31a9f8e1b9b3721fb46b07890e80573f8a383a47784b19ba2f1d415b8aafd1cf57e60a33c34cce01dad0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/nl/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/nl/firefox-59.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c98b2a27e647239382d43d9e83b3b92ce4febc0c114744ba59030e7a23d7a2093797cb713cbd985d7d6109217a4d8eea964db332f1d4f6957d4076aed2c0b9a2"; + sha512 = "231dd43d879f08a91d755b2a021a04a07f5ccd50aa326916513e9d61bf5365b17cfd03a881bda93a6ece8300194947b9542a3ae208d80e6e3d4ac9efe80ccf8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/nn-NO/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/nn-NO/firefox-59.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "1f46fd39dbc5a025ae627c60b2cc38aad8b37c07af3eea57d2cc250793ac1556c6f8a3fd0a2d3acef6e3d97c6e594854dce6ba175c496db4a773a6e1a81a8808"; + sha512 = "6691240ad1d14c1f3afa4bc648779801c9fa0434174b7b561be23301ccc69996204179f304f7ba3df9eba3959e9f7f2e3da82c44647343969c95ae368c9b1a92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/or/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/or/firefox-59.0b2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "d486499b3a72abd0fb0b6849f4c8ed9dcaeec60429ef03ebdf29ee4c97588602de10d8cc596eb6888bc562b2b6fabc45dcd810c96478d43d48f258fb69f53060"; + sha512 = "2acdfc88c074845d236f76dc6cae80610cc83cba2083114a5ed8fb610c718c342849ffdd22af96554c5cb411f253c2f7e6642bee392ac8044a4ab4e53a05a7b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/pa-IN/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/pa-IN/firefox-59.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "6106fad18184214ef6f70483c18a502ff40b8de781f9d41997480f6441dbafe6144d333046cae8a804879740bb4e292a50d975f2ed21406c4295fa96b455aae1"; + sha512 = "f22c8a741cfd7475d2ae7da22b4aaea010302f0dafbdef4fcf133f9e7315d8554fd8e48dd93dba3d51dde3e0bfaf5dbfa93b89df2c17cb43438184c128194855"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/pl/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/pl/firefox-59.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "5be60a0e879a484881ec4868f5b063d2703f5cc92c368d2aac650190fb8ef1cb2e66d2ad2e325f486454b3d72befd2542ba9aa6a1fe39e7053c0975380b65e4d"; + sha512 = "e57c5c1ccd1365902c932e4fa902ba1f04bb906d6fa0b0af63a017586ef166e7601ba3742e657b23c9f57a14df0ec0a10ab8743fa8b3dcee6a309801fa9e245b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/pt-BR/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/pt-BR/firefox-59.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e32cc890fdb4bcfbebac043dd3fa6fc770193f3e95307688e9d0f9d66e2b9dad82618143f8dde82e49704f7ff71cf193db939e82cacf3170f4f876c9eeb6e5a6"; + sha512 = "5987bf659a80bae27a9de8e6f694b42279f7b1bdb540b161f9ecc5a6e28646301d559bdfd7263e0e64346208c6305f1ed5e3de14964da289e15618ed57c1ec22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/pt-PT/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/pt-PT/firefox-59.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "59addceb43cf1d5c3be0dab69fbdc123375c30b892cd0717eb2959c5ee1c859af4b053c392561490f02e16dd2fbe20d56185447dc76b23938294f339e670e79c"; + sha512 = "c8b0e3263f2c5a91710d60ca7d98de7dacdaf082b82237a4275f21f198850085df68ebf422923baa9ec62f4e9eae7c6ea77d3b2f683766a71369744e85082254"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/rm/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/rm/firefox-59.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "ca9a0f846027922e96a55f6580fd0891ce4d652824f1d0283a935e11d1ebb2d3071831f85c346cc30dd657ed1cc0c021d4433bc594f381e6689a2aab66f63f95"; + sha512 = "ff3670a53d34b6a745026b16e4023da074c8a6690344772418ec231c2a9d24b0296fe06ffa52d18ad5c2a67075d6f35cec3f1d56e754e635b5994d048f3b919b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ro/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ro/firefox-59.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "55ea139210ad77c544f2dd43e9a61c4b45beb009a2d318ec2eb7719106380b954c3a18e6390fd9604adf0d4e4bad51b31b7839d3bfc139ec7bd8ff1cd87e06dc"; + sha512 = "6b02829839c8f653e278e39e5e160e994f15e58fcc50799edd19ebc73b0ddacf7a10c245b9b61f73bf603affc70bf8f642ec8df51ee9acbf804b2eedc8c3dba9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ru/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ru/firefox-59.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "f33c6b72f728171f072f0aa8305b679ac0762bbba00f499f49bbf79635a8a527ac3326a081131631c2e993a688f92efc2a89dac5160348088be96f9dfe7a7a00"; + sha512 = "45e028342f6e26b2cf506c5bdd8758459972452b8da11be7e0350f18f514557933000e4e3c80cce13f1a477fbf2b14982843eda16117085389d6e224757e6565"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/si/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/si/firefox-59.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a29b714d4189c4b26ec8b3bcfe01f0694df8d919a66c54aebd3becc4f8aeae2933dd1ab5992294e794e871469b77319e7f6e5646b4a90c8bf2f6c9ae2ad70a00"; + sha512 = "30b3cd1a9e19066bfbc89efa5bfb1b583971da896cf1af9619e38f3356e76f4510d8aa027fae81e1901fcfd32f9aef724f0760cc913882af8d604503d3b0a5a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/sk/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/sk/firefox-59.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1a534c6c3cc9c8400b4749c277dfd55fb9864e78aea4887e8d14a9066194fd2861f76252be13499c4d6d92c6a9fef7c2ff6e0f1716eb717c9514af14d17f07a9"; + sha512 = "85d5900f70164d8582a750c178a77688f19440b2e735f08c93eb27c0368cc6ec49185b3d70c52aca2083216127d66ee1c6e5009d162d8fa0a0c3f270538b8e5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/sl/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/sl/firefox-59.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "90c1b0ef07cc608b2f483a7173d810a42301239757682c3ea3e5f9401a9b6a7a8b579807a87a772ad99bb68fdfd0ec2462a4c33bf1730baae845aebceba1a1cc"; + sha512 = "e7fe3285350328f9600aeab5c20ffafb49b402197074a5f72b952d78d3be7500cad91f33f576a4a5ead6cbd02ec41349f63018b1d31e5ad57e52df87e86cff9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/son/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/son/firefox-59.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "70605a3b9e047deb9cf356c9b61d9a771ae7b7ed662a2df3fc03a8b2505835c21db838ce03247c446ab64103e4f598f7c861e9837f28a9ca613ca78589431fca"; + sha512 = "cffd18f57f5d930f430455a17517e9e99d1d7663628758cf63b4a32512d7a860dcb361fb3fa35bb4bcec5722e7205605e5b308aff8247267dd299edbe542b18e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/sq/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/sq/firefox-59.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3dc9883fc02ce9a32d0e228fd2d390c29e19aa26125dc197d9bfeea32e8bbd57a28bec3463ad83ce245db00f107acd258eb52c43904eedca5f1afdd38bfc927a"; + sha512 = "899f73f254d3c29b27d53d529e9c6f093e956c8e29c103363fb57c06d4db7f57e837efa038748ec2dde2d96f63021ab6aca1d5dd3149a0b92275f854826f06f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/sr/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/sr/firefox-59.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "bbb74bd3ecd5a0c290b14bb635ec24d2a5f3f2c7916106fb3f3bc451b3c89120abe2e3bfb2ea71611d71b2524cf9c383bf96c47bad4f7b21b40e807f0f3202b5"; + sha512 = "92aa58b2d02ab429d0ea7ca9146b54d1408009cace3aa8a2605e03db962aa203572c8f37e97385801e620a9560e17b54ac78aa997b30deb7d44fe92b290944c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/sv-SE/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/sv-SE/firefox-59.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "908bf991e8c63be7acef158283ab2352c60ade7b6c1f77ac61f5e2f07a6d3da6ccb599529b1beb728dd44edcc5878292dcbda225f770102a9aa47574b0c415ed"; + sha512 = "28b65f6801696ea86cbb3f004862f9f540c3e8d230b1038e9b5929fa05a3a1c50039d26f96024de7b201166317e5f09d0be17d16e4e3c2755d77950817aa982e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ta/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ta/firefox-59.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "20987bdce313aacc2744c09a6b57fd320f64b313114c468e36c4dc3a7f92a687df004409b9efcda0fdaa06028d8ff3416fdda212307c4cae7ee7180607d4011d"; + sha512 = "05592945ab64d947e786e396af0369edc5b4b86c6dae67a42f5e82d93bea628f9352ffe659d9456d5f87912592f2075d6f10c665302e97455f15657158e2b76c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/te/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/te/firefox-59.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "923d57831d68b704a4527aca504bfe1fbcc34f3652882203b6cddf540de5ad247114896d8bbaa306559259a394be312743646084b53f4117d3523bb206b72a51"; + sha512 = "5ab709938d1748d3993a10e91f373c150caf590f502924b251db544eb81d03945fbd3ba1f6188d9775cd818fe903075d29bf9c9a16c79df285aff3c986761879"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/th/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/th/firefox-59.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "7b7b9ce2016435e730b3c9114bef904cbc960f8662d0bd531f17796de387695dad2d31fc3d9ea1b08b6e08a6d645e3fcf543f9b8b6cb0dcb5e55d1c357f1d3e6"; + sha512 = "3861e4c2b3f08993db0accac688070d3855967875a6a2c0f1d281464da3d5bb7ef27173c83087006345b4e7ed7ceb7d7f32a84f1c77f51f76308559fd959b2f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/tr/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/tr/firefox-59.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "6e2ec7e344fb89b52024a69030163baee6b46202f6d0985d485003dbbc7353687072fe8118043b77c3dba3b87490a2bf1f5d001ecb92eeedeee6f16c71779d51"; + sha512 = "0d6e3badf4737c629669a24c8f0bbd49383481948a31665a82c5ea6366ec6bbc78a9cde9a5b7c1efa46a5b71f20a41e739595ccafaf54eac3ee66434268d2e4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/uk/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/uk/firefox-59.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "31bf927670c7795d61a35fbd035efcc121c9f0dd4d315c7c52c7e23da0732a93ea4475c42f22ded28852074c394ed58de834477eeff1531f64a5760eaf83bbec"; + sha512 = "9dae8af7c0f1876ee6cfcb308a35065b79b64e94d672af2664025f365ff9c4e456cbc4a4c70264305354683e44e303d2049b078c890e5cf80eae5a56ba0624ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/ur/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/ur/firefox-59.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "05bc9d6fe17d3caeef0b41a4dc72c7b0ba23f734f04b98dcc2f4978779ed2e5cfbbc63c592685dd9d82cecc2fbe85490e4d0761ec90dd49f284fa8bcecd08db4"; + sha512 = "1f875edf0892c31b24be5f03234e055293e38d8aa17eb7fdeff20bec65364a157951bb8a2d8ef4d6280934e30259f169f88588bf0045baaf141b199408e1356d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/uz/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/uz/firefox-59.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "8ee547b9bc0a3dd43b52e2b0b90e4491819bde4ebe8d5565c3cc41fefef2dbc80082283993857e3fa7f5cbff75bc3000a4cc74f4fe44ea690a09c1180f46f529"; + sha512 = "56df1b9ff64761f99afb22281f65cfbefcf90bb8de4d1018c66073395cddfc5d4fed16a605337f9e3e549b94a9bd68835d3fd0bd5443fd10608c32915f6bba54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/vi/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/vi/firefox-59.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "0186d6e62762d902e898c758204c9dca009eca0d86681240542e8cc108ddf8a29b23e3cbc114d2a04a0995e048e71c513443f6f8e5004d77b7ef1e9fcc4e4444"; + sha512 = "cbd5977c31dcf5a600a4ddc144821b49c6f18c72f51ac080ad8e6ce7d82716d06278542861df779cde3703f74396bc2295a8e9fe773369352dd64d5ec4ee50f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/xh/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/xh/firefox-59.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "2c6d149a67e69120559c51f101684c3c165e1c2c59df6b04a6fd469b6890e803286e41f010e3e906dad51c8a1f5fee663bfd47f41f7dd8367069db374cec2a6a"; + sha512 = "659b61ee20bd1b0a0cf129cfd77bcdc4e535c82a92687555f0b181f25774128189f823f9086b18468dd2eb5c5def2869b74e85c7dcc8a8850940008ef01b9de8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/zh-CN/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/zh-CN/firefox-59.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d7b7f84ca038355fec2e5be77cd6e0a5c5de93d2d1973c27114f676c7c80e9ebbb220257e0775df9c4720ea8def81e77487cfea0a38c80608a0a5d8a8a4d2839"; + sha512 = "91e7968e00d763c027b686409f9d9d81a3f4a6ec6753005adb9e024522e332cac1e61b2da2143cdc55a1490919b642d8bdbddcbea9eb25ea8cffbb9d28f0c7cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b1/linux-i686/zh-TW/firefox-59.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b2/linux-i686/zh-TW/firefox-59.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "eb71a4fc08afc2426856ed09852a54158131a70182b575645a7471fe5f88f18c5ac7176f90ffd77a3860b2cb960350e6ca2b47abea57488468adf8c32cd2c10b"; + sha512 = "2bbf3ceb091a928f948252d5138b9cd7f2b3d184a0a7a1fae9f344c3a4c37f47457fdeb04b1ed7c3a4355b8e8ea4861e903805aff4ec25b4595bac94c608846a"; } ]; } diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 210d78369da6..ddfa4fd607d1 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.29.0"; in +let version = "3.30.0"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "0najf2w6p5j4qc8jmglx6j63mph749s5p90lz2nkmwwwy5sfvlga"; + sha256 = "1w0zqkccbsbmnjc9pfd1i3ywzwrdp0pprryvdk4sfn5ms9nnf2wi"; }; configureFlags = [ diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 627b6aac29cb..a140de2c236a 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,30 +1,33 @@ { callPackage, stdenv }: let - stableVersion = "2.1.2"; - previewVersion = "2.1.2"; + stableVersion = "2.1.3"; + # Currently there is no preview version. + previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; + guiSrcHash = "1yya0alc4ifgikka513ps243l8211rvifm0xz1ymx8nck0s6sj35"; + serverSrcHash = "16d698gpj2r3z7qvvlrsx8ylgb1nfkmia2pcvk22068p3ajwypx1"; in { guiStable = mkGui { stable = true; - sha256Hash = "1p3z1dlank0nzj5yyap2n2gv1xa66x9iqi4q7vvy0xcxbqzmqszk"; + sha256Hash = guiSrcHash; }; guiPreview = mkGui { stable = false; - sha256Hash = "1p3z1dlank0nzj5yyap2n2gv1xa66x9iqi4q7vvy0xcxbqzmqszk"; + sha256Hash = guiSrcHash; }; serverStable = mkServer { stable = true; - sha256Hash = "0nd7j33ns94hh65b9j0m177b7h25slpny74ga8qppghvv2iqsbp8"; + sha256Hash = serverSrcHash; }; serverPreview = mkServer { stable = false; - sha256Hash = "0nd7j33ns94hh65b9j0m177b7h25slpny74ga8qppghvv2iqsbp8"; + sha256Hash = serverSrcHash; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 5a201dfc4074..1bc8e4c15d11 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -20,7 +20,7 @@ let })); yarl = (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs: - { propagatedBuildInputs = [ multidict_3_1_3 ]; })); + { propagatedBuildInputs = [ multidict_3_1_3 pythonPackages.idna ]; })); aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs: rec { diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 3f438c625088..82302ad5db39 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,36 +1,42 @@ -{ mkDerivation, lib, fetchgit, pkgconfig, gyp, cmake -, qtbase, qtimageformats -, gtk3, libappindicator-gtk3, dee -, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio -, gcc +{ mkDerivation, lib, fetchgit, fetchpatch +, pkgconfig, gyp, cmake, gcc7 +, qtbase, qtimageformats, gtk3, libappindicator-gtk3 +, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.1.23"; + version = "1.2.6"; # Submodules src = fetchgit { url = "git://github.com/telegramdesktop/tdesktop"; rev = "v${version}"; - sha256 = "0pdjrypjg015zvg8iydrja8kzvq0jsi1wz77r2cxvyyb4rkgyv7x"; + sha256 = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w"; fetchSubmodules = true; }; + # TODO: Not active anymore. tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; - rev = "885d0594d8dfa0a17c14140579a3d27ef2b9bdd0"; - sha256 = "0cdci8d8j3czhznp7gqn16w32j428njmzxr34pdsv40gggh0lbpn"; + rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e"; + sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc"; }; - buildInputs = [ - gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip - libopus alsaLib libpulseaudio + patches = [ + (fetchpatch { + name = "tdesktop.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=f0eefac36f529295f8b065a14b6d5f1a51d7614d"; + sha256 = "1a4wap5xnp6zn4913r3zdpy6hvkcfxcy4zzimy7fwzp7iwy20iqa"; + }) ]; - nativeBuildInputs = [ pkgconfig gyp cmake gcc ]; + nativeBuildInputs = [ pkgconfig gyp cmake gcc7 ]; - patches = [ "${tgaur}/tdesktop.patch" ]; + buildInputs = [ + qtbase qtimageformats gtk3 libappindicator-gtk3 + dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + ]; enableParallelBuilding = true; @@ -54,7 +60,7 @@ mkDerivation rec { "-I${libopus.dev}/include/opus" "-I${alsaLib.dev}/include/alsa" "-I${libpulseaudio.dev}/include/pulse" - ]) [ "QtCore" "QtGui" ]; + ]) [ "QtCore" "QtGui" "QtDBus" ]; CPPFLAGS = NIX_CFLAGS_COMPILE; preConfigure = '' @@ -69,6 +75,9 @@ mkDerivation rec { -e 's,-flto,,g' sed -i Telegram/gyp/qt.gypi \ + -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \ + -e 's,\d+",\d+" | head -n1,g' + sed -i Telegram/gyp/qt_moc.gypi \ -e "s,/usr/bin/moc,moc,g" sed -i Telegram/gyp/qt_rcc.gypi \ -e "s,/usr/bin/rcc,rcc,g" @@ -105,6 +114,6 @@ mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; homepage = https://desktop.telegram.org/; - maintainers = with maintainers; [ abbradar garbas ]; + maintainers = with maintainers; [ abbradar garbas primeos ]; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index f6c4728eb531..d17cd2a7ab75 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar ]; + propagatedUserEnvPkgs = [ gconf ]; configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix new file mode 100644 index 000000000000..98499ca009af --- /dev/null +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, which, gfortran, mesa_glu, xorg } : + +stdenv.mkDerivation rec { + version = "5.7"; + name = "molden-${version}"; + + src = fetchurl { + url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; + sha256 = "0gaq11gm09ax25lvgfrvxv9dxvi76hps116fp6k7sqgvdd68vf0s"; + }; + + nativeBuildInputs = [ which ]; + buildInputs = [ gfortran mesa_glu xorg.libX11 xorg.libXmu ]; + + postPatch = '' + substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \ + --replace '-I/usr/X11R6/include' "" \ + --replace '/usr/local/' $out/ \ + --replace 'sudo' "" \ + --replace '-C surf depend' '-C surf' + sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Display and manipulate molecular structures"; + homepage = http://www.cmbi.ru.nl/molden/; + license = { + fullName = "Free for academic/non-profit use"; + url = http://www.cmbi.ru.nl/molden/CopyRight.html; + free = false; + }; + platforms = platforms.linux; + maintainers = with maintainers; [ markuskowa ]; + }; +} + diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 5878f3a8b74c..988911d2eb7b 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diff-so-fancy-${version}"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "1hgppp8ngjbjzbi96529p36hzi0ysdndrh6d6m71gs21am8v4m9r"; + sha256 = "0j8dxfl4js7agwdpcvxwigzpp0lik33h7s3vsjg0pd413h2j4mvz"; }; # Perl is needed here for patchShebangs diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index b18f3466770a..d83e51a676cd 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,106 +1,208 @@ -{ config, pkgs, newScope }: +{ lib, pkgs }: -let - -callPackage = newScope (deps // xfce_self); +lib.makeScope pkgs.newScope (self: with self; { + #### NixOS support -deps = { # xfce-global dependency overrides should be here inherit (pkgs.gnome2) libglade libwnck vte gtksourceview; inherit (pkgs.gnome3) dconf; inherit (pkgs.perlPackages) URI; + gtk = pkgs.gtk2; -}; -xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach + # Samba is a rather heavy dependency + gvfs = pkgs.gvfs.override { samba = null; }; - #### NixOS support + xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc"; - gvfs = pkgs.gvfs.override { samba = null; }; # samba is a rather heavy dependency - xinitrc = "${xfce4session}/etc/xdg/xfce4/xinitrc"; + #### CORE - #### CORE from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2" + exo = callPackage ./core/exo.nix { }; + + garcon = callPackage ./core/garcon.nix { }; + + # When built with GTK+3, it was breaking GTK+3 app layout + gtk-xfce-engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = false; }; + + libxfce4ui = callPackage ./core/libxfce4ui.nix { }; + + libxfce4util = callPackage ./core/libxfce4util.nix { }; + + libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; + + thunar-bare = callPackage ./core/thunar-build.nix { }; + + thunar = callPackage ./core/thunar.nix { }; + + # NB: thunar already has it + thunar-volman = callPackage ./core/thunar-volman.nix { }; + + thunar-archive-plugin = callPackage ./thunar-plugins/archive { }; + + thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; + + tumbler = callPackage ./core/tumbler.nix { }; + + # TODO: impure plugins from /run/current-system/sw/lib/xfce4 + xfce4-panel = callPackage ./core/xfce4-panel.nix { }; + + xfce4-session = callPackage ./core/xfce4-session.nix { }; + + xfce4-settings = callPackage ./core/xfce4-settings.nix { }; + + xfce4-power-manager = callPackage ./core/xfce4-power-manager.nix { }; + + xfconf = callPackage ./core/xfconf.nix { }; + + xfdesktop = callPackage ./core/xfdesktop.nix { }; + + xfwm4 = callPackage ./core/xfwm4.nix { }; + + xfce4-appfinder = callPackage ./core/xfce4-appfinder.nix { }; + + xfce4-dev-tools = callPackage ./core/xfce4-dev-tools.nix { }; + + #### APPLICATIONS + + gigolo = callPackage ./applications/gigolo.nix { }; + + mousepad = callPackage ./applications/mousepad.nix { }; + + orage = callPackage ./applications/orage.nix { }; + + parole = callPackage ./applications/parole.nix { }; + + ristretto = callPackage ./applications/ristretto.nix { }; + + xfce4-mixer = callPackage ./applications/xfce4-mixer.nix { }; + + xfce4-mixer-pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; }; + + xfce4-notifyd = callPackage ./applications/xfce4-notifyd.nix { }; + + xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager.nix { }; + + xfce4-terminal = callPackage ./applications/terminal.nix { }; - exo = callPackage ./core/exo.nix { }; - garcon = callPackage ./core/garcon.nix { }; - gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix - { withGtk3 = false; }; # = true; was completely breaking GTK3 app layout - libxfce4ui = callPackage ./core/libxfce4ui.nix { }; - libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; }; - libxfce4util = callPackage ./core/libxfce4util.nix { }; - libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; - thunar-build = callPackage ./core/thunar-build.nix { }; - thunar = callPackage ./core/thunar.nix { }; - thunarx-2-dev = thunar-build; # Plugins need only the `thunarx-2` part of the package. Awaiting multiple outputs. - thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now - thunar-archive-plugin - = callPackage ./thunar-plugins/archive { }; - thunar-dropbox-plugin - = callPackage ./thunar-plugins/dropbox { }; - tumbler = callPackage ./core/tumbler.nix { }; - xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4 - xfce4panel_gtk3 = xfce4panel.override { withGtk3 = true; }; - xfce4session = callPackage ./core/xfce4-session.nix { }; - xfce4settings = callPackage ./core/xfce4-settings.nix { }; - xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix { }; - xfce4_power_manager_gtk3 = callPackage ./core/xfce4-power-manager.nix { withGtk3 = true; }; - xfconf = callPackage ./core/xfconf.nix { }; - xfdesktop = callPackage ./core/xfdesktop.nix { }; - xfwm4 = callPackage ./core/xfwm4.nix { }; - - xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { }; - xfce4_dev_tools = callPackage ./core/xfce4-dev-tools.nix { }; # only if autotools are needed - - #### APPLICATIONS from "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2" - - gigolo = callPackage ./applications/gigolo.nix { }; - mousepad = callPackage ./applications/mousepad.nix { }; - orage = callPackage ./applications/orage.nix { }; - parole = callPackage ./applications/parole.nix { }; - ristretto = callPackage ./applications/ristretto.nix { }; - terminal = xfce4terminal; # it has changed its name - xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; - xfce4mixer_pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; }; - xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { }; - xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; - xfce4terminal = callPackage ./applications/terminal.nix { }; xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { }; - xfce4volumed = callPackage ./applications/xfce4-volumed.nix { }; - xfce4volumed_pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; - - #### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2" - - xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; - xfwm4themes = callPackage ./art/xfwm4-themes.nix { }; - - #### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}" - - xfce4_battery_plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { }; - xfce4_clipman_plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { }; - xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; - xfce4_cpugraph_plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { }; - xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; - xfce4_dict_plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { }; - xfce4_dockbarx_plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { }; - xfce4_embed_plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; - xfce4_eyes_plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { }; - xfce4_fsguard_plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { }; - xfce4_genmon_plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { }; + + xfce4-volumed = callPackage ./applications/xfce4-volumed.nix { }; + + xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; + + #### ART + + xfce4-icon-theme = callPackage ./art/xfce4-icon-theme.nix { }; + + xfwm4-themes = callPackage ./art/xfwm4-themes.nix { }; + + #### PANEL PLUGINS + + xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { }; + + xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { }; + + xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; + + xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { }; + + xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; + + xfce4-dict-plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { }; + + xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { }; + + xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; + + xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { }; + + xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { }; + + xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { }; + xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { }; - xfce4_namebar_plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { }; - xfce4_netload_plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { }; - xfce4_notes_plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { }; - xfce4_mailwatch_plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { }; - xfce4_mpc_plugin = callPackage ./panel-plugins/xfce4-mpc-plugin.nix { }; - xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { }; - xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; - xfce4_timer_plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { }; - xfce4_verve_plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { }; - xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; - xfce4_weather_plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; - xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { }; - xfce4_windowck_plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { }; - xfce4_pulseaudio_plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { }; - -}; # xfce_self - -in xfce_self + + xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { }; + + xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { }; + + xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { }; + + xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { }; + + xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin.nix { }; + + xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { }; + + xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; + + xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { }; + + xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { }; + + xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; + + xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; + + xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { }; + + xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { }; + + xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { }; + + #### GTK+3 (deprecated, see NixOS/nixpkgs#32763) + + libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; }; + + xfce4panel_gtk3 = xfce4-panel.override { withGtk3 = true; }; + + xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; }; + + #### ALIASES - added 2018-01 + + terminal = xfce4-terminal; + thunar-build = thunar-bare; + thunarx-2-dev = thunar-build; + thunar_volman = thunar-volman; + xfce4panel = xfce4-panel; + xfce4session = xfce4-session; + xfce4settings = xfce4-settings; + xfce4_power_manager = xfce4-power-manager; + xfce4_appfinder = xfce4-appfinder; + xfce4_dev_tools = xfce4-dev-tools; + xfce4mixer = xfce4-mixer; + xfce4mixer_pulse = xfce4-mixer-pulse; + xfce4notifyd = xfce4-notifyd; + xfce4taskmanager = xfce4-taskmanager; + xfce4terminal = xfce4-terminal; + xfce4volumed = xfce4-volumed; + xfce4volumed_pulse = xfce4-volumed-pulse; + xfce4icontheme = xfce4-icon-theme; + xfwm4themes = xfwm4-themes; + + xfce4_battery_plugin = xfce4-battery-plugin; + xfce4_clipman_plugin = xfce4-clipman-plugin; + xfce4_cpufreq_plugin = xfce4-cpufreq-plugin; + xfce4_cpugraph_plugin = xfce4-cpugraph-plugin; + xfce4_datetime_plugin = xfce4-datetime-plugin; + xfce4_dict_plugin = xfce4-dict-plugin; + xfce4_dockbarx_plugin = xfce4-dockbarx-plugin; + xfce4_embed_plugin = xfce4-embed-plugin; + xfce4_eyes_plugin = xfce4-eyes-plugin; + xfce4_fsguard_plugin = xfce4-fsguard-plugin; + xfce4_genmon_plugin = xfce4-genmon-plugin; + xfce4_hardware_monitor_plugin = xfce4-hardware-monitor-plugin; + xfce4_namebar_plugin = xfce4-namebar-plugin; + xfce4_netload_plugin = xfce4-netload-plugin; + xfce4_notes_plugin = xfce4-notes-plugin; + xfce4_mailwatch_plugin = xfce4-mailwatch-plugin; + xfce4_mpc_plugin = xfce4-mpc-plugin; + xfce4_sensors_plugin = xfce4-sensors-plugin; + xfce4_systemload_plugin = xfce4-systemload-plugin; + xfce4_timer_plugin = xfce4-timer-plugin; + xfce4_verve_plugin = xfce4-verve-plugin; + xfce4_xkb_plugin = xfce4-xkb-plugin; + xfce4_weather_plugin = xfce4-weather-plugin; + xfce4_whiskermenu_plugin = xfce4-whiskermenu-plugin; + xfce4_windowck_plugin = xfce4-windowck-plugin; + xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin; +}) diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 404b65c56ab7..6f84e4b88950 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -5,7 +5,7 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation { + self = stdenv.mkDerivation ({ name = "clang-${version}"; unpackPhase = '' @@ -37,9 +37,8 @@ let patches = [ ./purity.patch ]; - postBuild = stdenv.lib.optionalString enableManpages '' - cmake --build . --target docs-clang-man - ''; + # XXX: TODO: This should be removed on next rebuild + postBuild = ""; postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp @@ -49,8 +48,7 @@ let sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt ''; - outputs = [ "out" "lib" "python" ] - ++ stdenv.lib.optional enableManpages "man"; + outputs = [ "out" "lib" "python" ]; # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix @@ -69,13 +67,6 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test - '' - + stdenv.lib.optionalString enableManpages '' - # Manually install clang manpage - cp docs/man/*.1 $out/share/man/man1/ - - # Move it and other man pages to 'man' output - moveToOutput "share/man" "$man" ''; enableParallelBuilding = true; @@ -93,5 +84,23 @@ let license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; - }; + } // stdenv.lib.optionalAttrs enableManpages { + name = "clang-manpages-${version}"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man page for Clang ${version}"; + }); in self diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 89cb181e405e..562f9e3457dd 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -20,7 +20,7 @@ let # Add man output without introducing extra dependencies. overrideManOutput = drv: let drv-manpages = drv.override { enableManpages = true; }; in - drv // { man = drv-manpages.man; /*outputs = drv.outputs ++ ["man"];*/ }; + drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; llvm = callPackage ./llvm.nix { inherit compiler-rt_src stdenv; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 33147b07599c..711024c7d3ca 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -27,7 +27,7 @@ let # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; concatStringsSep "." (take 2 (splitString "." release_version)); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (rec { name = "llvm-${version}"; unpackPhase = '' @@ -39,8 +39,7 @@ in stdenv.mkDerivation rec { ''; outputs = [ "out" ] - ++ stdenv.lib.optional enableSharedLibraries "lib" - ++ stdenv.lib.optional enableManpages "man"; + ++ stdenv.lib.optional enableSharedLibraries "lib"; nativeBuildInputs = [ perl groff cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; @@ -129,10 +128,7 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ''; - postInstall = stdenv.lib.optionalString enableManpages '' - moveToOutput "share/man" "$man" - '' - + stdenv.lib.optionalString enableSharedLibraries '' + postInstall = stdenv.lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ @@ -160,4 +156,22 @@ in stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; platforms = stdenv.lib.platforms.all; }; -} +} // stdenv.lib.optionalAttrs enableManpages { + name = "llvm-manpages-${version}"; + + buildPhase = '' + make docs-llvm-man + ''; + + propagatedBuildInputs = [ ]; + + installPhase = '' + make -C docs install + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man pages for LLVM ${version}"; +}) diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index aaddd020a729..021971a45431 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -5,7 +5,7 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation { + self = stdenv.mkDerivation ({ name = "clang-${version}"; unpackPhase = '' @@ -37,9 +37,8 @@ let patches = [ ./purity.patch ]; - postBuild = stdenv.lib.optionalString enableManpages '' - cmake --build . --target docs-clang-man - ''; + # XXX: TODO: This should be removed on next rebuild + postBuild = ""; postPatch = '' sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ @@ -50,8 +49,7 @@ let sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt ''; - outputs = [ "out" "lib" "python" ] - ++ stdenv.lib.optional enableManpages "man"; + outputs = [ "out" "lib" "python" ]; # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix @@ -70,13 +68,6 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test - '' - + stdenv.lib.optionalString enableManpages '' - # Manually install clang manpage - cp docs/man/*.1 $out/share/man/man1/ - - # Move it and other man pages to 'man' output - moveToOutput "share/man" "$man" ''; enableParallelBuilding = true; @@ -94,5 +85,23 @@ let license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; - }; + } // stdenv.lib.optionalAttrs enableManpages { + name = "clang-manpages-${version}"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man page for Clang ${version}"; + }); in self diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 26342095da79..13e1d2308f8c 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -20,7 +20,7 @@ let # Add man output without introducing extra dependencies. overrideManOutput = drv: let drv-manpages = drv.override { enableManpages = true; }; in - drv // { man = drv-manpages.man; /*outputs = drv.outputs ++ ["man"];*/ }; + drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; llvm = callPackage ./llvm.nix { inherit compiler-rt_src stdenv; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 6c7fd9eb0a38..400ffa341171 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -27,7 +27,7 @@ let # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; concatStringsSep "." (take 2 (splitString "." release_version)); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (rec { name = "llvm-${version}"; unpackPhase = '' @@ -39,8 +39,7 @@ in stdenv.mkDerivation rec { ''; outputs = [ "out" ] - ++ stdenv.lib.optional enableSharedLibraries "lib" - ++ stdenv.lib.optional enableManpages "man"; + ++ stdenv.lib.optional enableSharedLibraries "lib"; nativeBuildInputs = [ perl groff cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; @@ -123,10 +122,7 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ''; - postInstall = stdenv.lib.optionalString enableManpages '' - moveToOutput "share/man" "$man" - '' - + stdenv.lib.optionalString enableSharedLibraries '' + postInstall = stdenv.lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ @@ -154,4 +150,22 @@ in stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; platforms = stdenv.lib.platforms.all; }; -} +} // stdenv.lib.optionalAttrs enableManpages { + name = "llvm-manpages-${version}"; + + buildPhase = '' + make docs-llvm-man + ''; + + propagatedBuildInputs = []; + + installPhase = '' + make -C docs install + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man pages for LLVM ${version}"; +}) diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index de19e4b633e7..7621bd56d47b 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { postBuild = '' find . -name 'config' -type f | xargs \ sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" \ - -e "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" \ + -e 's#[^"]*libgdiplus[^"]*"#${libgdiplus}/lib/libgdiplus.so"#' \ ''; # Without this, any Mono application attempting to open an SSL connection will throw with diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 51e39593fe14..a8012f6bb9e6 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; - platforms = with stdenv.lib.platforms; darwin ++ linux; + platforms = with stdenv.lib.platforms; allBut [ "aarch64-linux" ]; maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ]; license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? }; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 66d0c89344d9..5922cd1272d3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -605,6 +605,9 @@ self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; }; + # Needs newer version of its dependencies than we have in LTS-10.x. + hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; }); + # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fbfeea52b794..6af9693bf61b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1123,7 +1123,6 @@ default-package-overrides: - hjsonschema ==1.7.1 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.6.1 - - hlint ==2.0.11 - hmatrix ==0.18.1.0 - hmatrix-gsl ==0.18.0.1 - hmatrix-gsl-stats ==0.4.1.7 @@ -2759,12 +2758,9 @@ package-maintainers: - shakespeare abbradar: - Agda - - lambdabot alunduil: - - collection-json - network-arbitrary - network-uri-json - - siren-json dont-distribute-packages: # hard restrictions that really belong into meta.platforms @@ -3230,6 +3226,7 @@ dont-distribute-packages: battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] + bdcs: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ] beam: [ i686-linux, x86_64-linux, x86_64-darwin ] beamable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3498,6 +3495,7 @@ dont-distribute-packages: cao: [ i686-linux, x86_64-linux, x86_64-darwin ] cap: [ i686-linux, x86_64-linux, x86_64-darwin ] Capabilities: [ i686-linux, x86_64-linux, x86_64-darwin ] + capataz: [ i686-linux, x86_64-linux, x86_64-darwin ] capri: [ i686-linux, x86_64-linux, x86_64-darwin ] car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3690,6 +3688,7 @@ dont-distribute-packages: cmv: [ i686-linux, x86_64-linux, x86_64-darwin ] cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] + coalpit: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3705,6 +3704,7 @@ dont-distribute-packages: collada-output: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-types: [ i686-linux, x86_64-linux, x86_64-darwin ] collapse-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + collection-json: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-api: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] collections: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4417,6 +4417,7 @@ dont-distribute-packages: explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] explore: [ i686-linux, x86_64-linux, x86_64-darwin ] exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + expressions-z3: [ i686-linux, x86_64-linux, x86_64-darwin ] extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4440,6 +4441,8 @@ dont-distribute-packages: falling-turnip: [ i686-linux, x86_64-linux, x86_64-darwin ] fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ] family-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-combinatorics: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-nats: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-tagsoup: [ i686-linux, x86_64-linux, x86_64-darwin ] fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4688,6 +4691,7 @@ dont-distribute-packages: geek: [ i686-linux, x86_64-linux, x86_64-darwin ] gegl: [ i686-linux, x86_64-linux, x86_64-darwin ] gemstone: [ i686-linux, x86_64-linux, x86_64-darwin ] + gen-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] gen-passwd: [ i686-linux, x86_64-linux, x86_64-darwin ] gencheck: [ i686-linux, x86_64-linux, x86_64-darwin ] gender: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4779,6 +4783,7 @@ dont-distribute-packages: gi-gdkx11: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-ggit: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gio: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4797,6 +4802,7 @@ dont-distribute-packages: gi-secret: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-soup: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-vte: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-xlib: [ i686-linux, x86_64-linux, x86_64-darwin ] giak: [ i686-linux, x86_64-linux, x86_64-darwin ] Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ] ginsu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5036,6 +5042,7 @@ dont-distribute-packages: haddock-test: [ i686-linux, x86_64-linux, x86_64-darwin ] haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] haddocset: [ i686-linux, x86_64-linux, x86_64-darwin ] + hadolint: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-formats: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5350,6 +5357,7 @@ dont-distribute-packages: heap: [ i686-linux, x86_64-linux, x86_64-darwin ] hecc: [ i686-linux, x86_64-linux, x86_64-darwin ] heckle: [ i686-linux, x86_64-linux, x86_64-darwin ] + hedgehog-gen-json: [ i686-linux, x86_64-linux, x86_64-darwin ] Hedi: [ i686-linux, x86_64-linux, x86_64-darwin ] hedis-config: [ i686-linux, x86_64-linux, x86_64-darwin ] hedis-pile: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5847,6 +5855,7 @@ dont-distribute-packages: hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] hweblib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hwhile: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6014,6 +6023,7 @@ dont-distribute-packages: irc-fun-color: [ i686-linux, x86_64-linux, x86_64-darwin ] Irc: [ i686-linux, x86_64-linux, x86_64-darwin ] ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + iri: [ i686-linux, x86_64-linux, x86_64-darwin ] iridium: [ i686-linux, x86_64-linux, x86_64-darwin ] iron-mq: [ i686-linux, x86_64-linux, x86_64-darwin ] ironforge: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6212,7 +6222,9 @@ dont-distribute-packages: lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-haskell-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6475,9 +6487,11 @@ dont-distribute-packages: lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ] LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + ltk: [ i686-linux, x86_64-linux, x86_64-darwin ] lua-bc: [ i686-linux, x86_64-linux, x86_64-darwin ] luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] luautils: [ i686-linux, x86_64-linux, x86_64-darwin ] + lucid-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] lucid-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ] Lucu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6508,6 +6522,7 @@ dont-distribute-packages: macosx-make-standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] madlang: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] + magic-wormhole: [ i686-linux, x86_64-linux, x86_64-darwin ] magicbane: [ i686-linux, x86_64-linux, x86_64-darwin ] MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ] magico: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6666,6 +6681,7 @@ dont-distribute-packages: mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] + mmark-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6972,6 +6988,7 @@ dont-distribute-packages: notzero: [ i686-linux, x86_64-linux, x86_64-darwin ] np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] + ntha: [ i686-linux, x86_64-linux, x86_64-darwin ] ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ] NTRU: [ i686-linux, x86_64-linux, x86_64-darwin ] null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6985,6 +7002,7 @@ dont-distribute-packages: numeric-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-array: [ i686-linux, x86_64-linux, x86_64-darwin ] + numhask-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask: [ i686-linux, x86_64-linux, x86_64-darwin ] Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6993,6 +7011,7 @@ dont-distribute-packages: NXTDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] nylas: [ i686-linux, x86_64-linux, x86_64-darwin ] nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ] + o-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] oanda-rest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ] obd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7132,6 +7151,7 @@ dont-distribute-packages: paprika: [ i686-linux, x86_64-linux, x86_64-darwin ] paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ] + Parallel-Arrows-Eden: [ i686-linux, x86_64-linux, x86_64-darwin ] parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7480,6 +7500,7 @@ dont-distribute-packages: pyffi: [ i686-linux, x86_64-linux, x86_64-darwin ] pyfi: [ i686-linux, x86_64-linux, x86_64-darwin ] python-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] + q4c12-twofinger: [ i686-linux, x86_64-linux, x86_64-darwin ] qc-oi-testgenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] qd-vec: [ i686-linux, x86_64-linux, x86_64-darwin ] qd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7752,6 +7773,7 @@ dont-distribute-packages: ridley: [ i686-linux, x86_64-linux, x86_64-darwin ] riemann: [ i686-linux, x86_64-linux, x86_64-darwin ] riff: [ i686-linux, x86_64-linux, x86_64-darwin ] + rio: [ i686-linux, x86_64-linux, x86_64-darwin ] riot: [ i686-linux, x86_64-linux, x86_64-darwin ] ripple-federation: [ i686-linux, x86_64-linux, x86_64-darwin ] ripple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8085,6 +8107,7 @@ dont-distribute-packages: singnal: [ i686-linux, x86_64-linux, x86_64-darwin ] sink: [ i686-linux, x86_64-linux, x86_64-darwin ] siphon: [ i686-linux, x86_64-linux, x86_64-darwin ] + siren-json: [ i686-linux, x86_64-linux, x86_64-darwin ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] sitepipe: [ i686-linux, x86_64-linux, x86_64-darwin ] sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9067,6 +9090,7 @@ dont-distribute-packages: why3: [ i686-linux, x86_64-linux, x86_64-darwin ] WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] + wild-bind-task-x11: [ i686-linux, x86_64-linux, x86_64-darwin ] windns: [ i686-linux, x86_64-linux, x86_64-darwin ] windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] winerror: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9083,6 +9107,7 @@ dont-distribute-packages: wobsurv: [ i686-linux, x86_64-linux, x86_64-darwin ] woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] + word2vec-model: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9295,6 +9320,7 @@ dont-distribute-packages: yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] z3-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] + z3: [ i686-linux, x86_64-linux, x86_64-darwin ] zabt: [ i686-linux, x86_64-linux, x86_64-darwin ] zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 87066df86dc4..eee6110c649e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -13097,6 +13097,7 @@ self: { libraryHaskellDepends = [ array base integer ]; description = "A binary I/O library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {integer = null;}; @@ -14226,6 +14227,7 @@ self: { homepage = "https://github.com/s4ke/Parrows#readme"; description = "Eden based backend for @Parallel-Arrows-Definition@"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Parallel-Arrows-Multicore" = callPackage @@ -15888,6 +15890,7 @@ self: { librarySystemDepends = [ SDL2_ttf ]; description = "Binding to libSDL-ttf"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {SDL2 = null; inherit (pkgs) SDL2_ttf;}; @@ -27658,6 +27661,7 @@ self: { ]; description = "A library and programs for creating hardlinked incremental archives or backups"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {debian-mirror = null; help = null;}; @@ -28635,6 +28639,7 @@ self: { executableHaskellDepends = [ base containers ghc-binary parsec ]; description = "Haskell Assembler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -29387,31 +29392,24 @@ self: { }) {}; "ats-format" = callPackage - ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base - , Cabal, cli-setup, composition-prelude, criterion, deepseq - , directory, file-embed, happy, hspec, hspec-dirstream - , htoml-megaparsec, lens, optparse-applicative, process - , recursion-schemes, system-filepath, text, unordered-containers + ({ mkDerivation, alex, ansi-wl-pprint, base, Cabal, cli-setup + , directory, file-embed, happy, htoml-megaparsec, language-ats + , optparse-applicative, process, text, unordered-containers }: mkDerivation { pname = "ats-format"; - version = "0.1.3.1"; - sha256 = "1ysclgzacbbyykiwi3dng4qnkrl764ij479x78pldkpsb4sw8w8f"; + version = "0.2.0.5"; + sha256 = "1b5sawd2i890cnj5wkp99psfgk0l52wv82xa00vr25nb708k8pkw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base composition-prelude deepseq - directory file-embed htoml-megaparsec lens optparse-applicative - process recursion-schemes text unordered-containers + ansi-wl-pprint base directory file-embed htoml-megaparsec + language-ats optparse-applicative process text unordered-containers ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base hspec hspec-dirstream system-filepath - ]; - benchmarkHaskellDepends = [ base criterion ]; homepage = "https://hub.darcs.net/vmchale/ats-format#readme"; description = "A source-code formatter for ATS"; license = stdenv.lib.licenses.bsd3; @@ -30376,6 +30374,7 @@ self: { homepage = "https://github.com/data61/aviation-cessna172-diagrams"; description = "Diagrams for the Cessna 172 aircraft in aviation"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {aviation-cessna172-weight-balance = null; aviation-units = null; aviation-weight-balance = null;}; @@ -31093,6 +31092,7 @@ self: { ]; description = "Specify axioms for type classes and quickCheck all available instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {control-invariants = null;}; @@ -32064,12 +32064,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "basement_0_0_5" = callPackage + "basement_0_0_6" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; - version = "0.0.5"; - sha256 = "1i2n300q7b1bm1kbkmfwzjvkrm00iw8qiv3m8rgqhmyr3q2k9pmd"; + version = "0.0.6"; + sha256 = "1xszp4nf55hr6iglqf1dx1yb9pgm3gpw81wwpjkwdn0602a3p8lw"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell-foundation/foundation"; description = "Foundation scrap box of array & string"; @@ -32394,6 +32394,7 @@ self: { homepage = "https://github.com/weldr/bdcs"; description = "Tools for managing a content store of software packages"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ostree;}; "bdd" = callPackage @@ -32460,6 +32461,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-core" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, tasty + , tasty-hunit, text, time, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.6.0.0"; + sha256 = "1pnxmy5xv84fng0391cckizwdrwzh0p0v3g0vc29z5vpksqr24kg"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri text time vector-sized + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text time + ]; + homepage = "http://travis.athougies.net/projects/beam.html"; + description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "beam-th" = callPackage ({ mkDerivation, base, beam, doctest, doctest-discover, microlens , mtl, tasty, tasty-hunit, template-haskell, text, th-expand-syns @@ -33101,6 +33123,7 @@ self: { homepage = "http://www.leksah.org"; description = "Leksah plugin base"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {leksah-dummy = null; leksah-main = null; leksah-plugin-pane = null;}; @@ -33609,6 +33632,7 @@ self: { ]; description = "Format to store data using the binary transform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {binary-transform = null;}; @@ -35131,6 +35155,7 @@ self: { homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; description = "Instant, two-party Bitcoin payments"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {blockchain-restful-address-index-api = null;}; @@ -39286,6 +39311,7 @@ self: { doHaddock = false; description = "placeholder for Cabal package, you want the upper case Cabal"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {youProbablyWantCapitalCabal = null;}; @@ -39560,35 +39586,35 @@ self: { "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers - , directory, extra, filepath, ghc-prim, mtl, process - , template-haskell, temporary, transformers, unix, utf8-string + , directory, exceptions, filepath, ghc, ghc-paths, ghc-prim, mtl + , process, semigroupoids, template-haskell, temporary, transformers + , unix, unix-compat, utf8-string }: mkDerivation { pname = "cabal-helper"; - version = "0.7.3.0"; - sha256 = "194j278109q5wdp0kl85y172n3c8hg0sms9gxfn2kl2x43smah3r"; - revision = "1"; - editedCabalFile = "0jhv5hx807zqrsa7fpzmhrhl6l1zjrpm96bvfsq0sq1bmi9y9h0y"; + version = "0.8.0.0"; + sha256 = "050g5y74ldpv8haj8grqpk2cw72l3gm0hypza72f556dl9j5hz2m"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ - base Cabal containers directory filepath process template-haskell - transformers - ]; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ - base Cabal directory filepath ghc-prim mtl process transformers + base Cabal directory filepath ghc-prim mtl process semigroupoids + transformers unix unix-compat ]; executableHaskellDepends = [ - base bytestring Cabal directory filepath ghc-prim mtl process - template-haskell temporary transformers utf8-string + base bytestring Cabal containers directory exceptions filepath + ghc-prim mtl process template-haskell temporary transformers unix + unix-compat utf8-string ]; + executableToolDepends = [ cabal-install ]; testHaskellDepends = [ - base bytestring Cabal directory extra filepath ghc-prim mtl process - template-haskell temporary transformers unix utf8-string + base bytestring Cabal directory exceptions filepath ghc ghc-paths + ghc-prim mtl process template-haskell temporary transformers unix + unix-compat utf8-string ]; testToolDepends = [ cabal-install ]; doCheck = false; - description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; + description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -41057,6 +41083,7 @@ self: { homepage = "https://github.com/roman/Haskell-capataz#readme"; description = "OTP-like supervision trees in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "capped-list" = callPackage @@ -41827,6 +41854,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cassava-records" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, cassava, containers + , foldl, HUnit, lens, pptable, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, unordered-containers + , vector + }: + mkDerivation { + pname = "cassava-records"; + version = "0.1.0.1"; + sha256 = "0j089vmjckdcvkbzr1w156kgxz9k94flja45xndsf602c7r21382"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring cassava foldl template-haskell text + unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec base bytestring cassava foldl lens pptable + template-haskell text unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring cassava containers foldl HUnit + QuickCheck tasty tasty-hunit tasty-quickcheck template-haskell text + unordered-containers vector + ]; + homepage = "https://github.com/gdevanla/cassava-records#readme"; + description = "Auto-generation of records data type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cassava-streams" = callPackage ({ mkDerivation, base, bytestring, cassava, io-streams, QuickCheck , tasty, tasty-quickcheck, vector @@ -46254,6 +46311,7 @@ self: { ]; description = "Command-line options and DSV parsing and printing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "code-builder" = callPackage @@ -46719,8 +46777,8 @@ self: { }: mkDerivation { pname = "collection-json"; - version = "1.1.2.0"; - sha256 = "1i95s4pyijy8rpjlisadvqz152kchxkg00dzbs7q9kw739qw0qwi"; + version = "1.1.2.1"; + sha256 = "1x43b1rmlrsv8jmr2mawy2ykwljbbb4h8cfcfd6gxrkzxwvlxhsl"; libraryHaskellDepends = [ aeson base network-uri network-uri-json text ]; @@ -46733,7 +46791,7 @@ self: { homepage = "https://github.com/alunduil/collection-json.hs"; description = "Collection+JSON—Hypermedia Type Tools"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ alunduil ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "collections" = callPackage @@ -47080,6 +47138,7 @@ self: { ]; description = "Commonmark (markdown) to HTML renderer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {comark-testutils = null;}; @@ -47106,6 +47165,7 @@ self: { ]; description = "Parser for Commonmark (markdown)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {comark-testutils = null;}; @@ -47197,6 +47257,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "combinatorial_0_1" = callPackage + ({ mkDerivation, array, base, containers, QuickCheck, transformers + , utility-ht + }: + mkDerivation { + pname = "combinatorial"; + version = "0.1"; + sha256 = "1a5l4iixjhvqca8dvwkx3zvlaimp6ggr3fcm7vk7r77rv6n6svh9"; + libraryHaskellDepends = [ + array base containers transformers utility-ht + ]; + testHaskellDepends = [ + array base containers QuickCheck transformers utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/combinatorial/"; + description = "Count, enumerate, rank and unrank combinatorial objects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "combinatorial-problems" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-lexing , containers, parsec, random @@ -48437,14 +48517,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_3_0_0" = callPackage + "concurrency_1_4_0_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.3.0.0"; - sha256 = "1z75m5wgvdp4lx6v18ap60pdqgdhf1132qlamm07m4dlpkd5il98"; + version = "1.4.0.0"; + sha256 = "0rpljvcswb1smidvxh7nwb6ms2gr8wf0gzs0kapiqc9g3wlr1r9r"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -49316,13 +49396,13 @@ self: { }) {}; "config-parser" = callPackage - ({ mkDerivation, base, hspec, lens, parsec, text }: + ({ mkDerivation, base, extra, hspec, lens, parsec, text }: mkDerivation { pname = "config-parser"; - version = "1.0.0.0"; - sha256 = "0ak3yhlfnw24d8rbv0z8mpkg839048ywp0c64slbxam3sxs8g170"; + version = "1.1.0.1"; + sha256 = "1v3lqq8bnp2s9zyfpa9jq80wwbnsx3mww82xmwc3yi4mvw7vnmc1"; libraryHaskellDepends = [ base parsec text ]; - testHaskellDepends = [ base hspec lens parsec text ]; + testHaskellDepends = [ base extra hspec lens parsec text ]; homepage = "https://github.com/protoben/config-parser"; description = "Parse config files using parsec and generate parse errors on unhandled keys"; license = stdenv.lib.licenses.mit; @@ -54871,6 +54951,7 @@ self: { homepage = "https://gitlab.com/haskell-hr/basic"; description = "A database library with a focus on ease of use, type safety and useful error messages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {basic = null;}; @@ -57638,17 +57719,23 @@ self: { }) {}; "debug-pp" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, aeson, base, debug-hoed, directory, filepath, yaml + }: mkDerivation { pname = "debug-pp"; - version = "0.1.0.0"; - sha256 = "05cq6qlp014a9d7zvi7kablswxdf0801ybi29c4m2v9vkqakhwcj"; + version = "0.1.1"; + sha256 = "1hja3kgczsr9zr7vf0glsi0czdfgb97kchwwqhi1gr5nfdphncjb"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ + aeson base debug-hoed directory filepath yaml + ]; homepage = "https://github.com/pepeiborra/debug-hoed-pp#readme"; + description = "A preprocessor for the debug package"; license = stdenv.lib.licenses.bsd3; - }) {}; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {debug-hoed = null;}; "debug-time" = callPackage ({ mkDerivation, base, clock, containers }: @@ -58129,14 +58216,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_0_0_0" = callPackage + "dejafu_1_0_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, profunctors, random, ref-fd, transformers }: mkDerivation { pname = "dejafu"; - version = "1.0.0.0"; - sha256 = "0d7darip6dkvpn9gqvr8lkid0b19a5sxd31f5rn8b5fpgc368i8v"; + version = "1.0.0.1"; + sha256 = "1v2hizvwf4clvqwwaab6ijlmwv7n97h8ag7dw9a63w4lipfl2anf"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck profunctors random ref-fd transformers @@ -61866,6 +61953,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist_0_8_0_4" = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: + mkDerivation { + pname = "dlist"; + version = "0.8.0.4"; + sha256 = "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dlist-instances" = callPackage ({ mkDerivation, base, dlist, semigroups }: mkDerivation { @@ -69062,6 +69163,7 @@ self: { ]; description = "Existential types with lens-like accessors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {control-invariants = null;}; @@ -69399,6 +69501,7 @@ self: { ]; description = "Encode and Decode expressions from Z3 ASTs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extcore" = callPackage @@ -70056,6 +70159,7 @@ self: { homepage = "https://github.com/vmchale/fast-arithmetic#readme"; description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-builder" = callPackage @@ -70096,6 +70200,7 @@ self: { homepage = "https://github.com//fast-combinatorics#readme"; description = "Fast combinatorics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-digits" = callPackage @@ -71142,6 +71247,7 @@ self: { homepage = "https://github.com/markus-git/feldspar-signal"; description = "Signal Processing extension for Feldspar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {feldspar-compiler-shim = null; monadic-edsl-priv = null;}; @@ -73315,18 +73421,20 @@ self: { "fltkhs" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath - , mtl, parsec, text + , mtl, OpenGLRaw, parsec, text }: mkDerivation { pname = "fltkhs"; - version = "0.5.4.3"; - sha256 = "1cn98f0lzzgyrjcw2xr68xm5129wl9zr3jy4la8hw4fwbvcjphnv"; + version = "0.5.4.4"; + sha256 = "1bv7djak2ilirk7ajm8w6100bk6vx14znf3699blih72kyql6rgh"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base bytestring text ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base directory filepath mtl parsec ]; + executableHaskellDepends = [ + base directory filepath mtl OpenGLRaw parsec text + ]; homepage = "http://github.com/deech/fltkhs"; description = "FLTK bindings"; license = stdenv.lib.licenses.mit; @@ -74569,14 +74677,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "foundation_0_0_18" = callPackage + "foundation_0_0_19" = callPackage ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; - version = "0.0.18"; - sha256 = "1y15ibqrap49ylggjl723gvda11m3x8iglb5psx4wl95zav1kr3n"; - revision = "1"; - editedCabalFile = "0595hq5wa42wqrcypxf286csrymhrby43icw2imy9gkalmrqdbil"; + version = "0.0.19"; + sha256 = "053g5fdg9p74irvdh3g19hkb6g28h0sngkh2zqwplbxwy59dhfxq"; libraryHaskellDepends = [ base basement ghc-prim ]; testHaskellDepends = [ base basement ]; benchmarkHaskellDepends = [ base basement gauge ]; @@ -74814,6 +74920,7 @@ self: { executableHaskellDepends = [ pretty ]; description = "A simple web framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -75862,6 +75969,7 @@ self: { homepage = "https://github.com/mr/ftp-client"; description = "Transfer file with FTP and FTPS with Conduit"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ftp-clientconduit = null;}; @@ -77315,6 +77423,7 @@ self: { homepage = "https://github.com/clintonmead/gen-imports#readme"; description = "Code to generate instances for the package \"ghc-instances\""; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gen-passwd" = callPackage @@ -79280,6 +79389,7 @@ self: { homepage = "https://github.com/ranjitjhala/ghc-options.git"; description = "Utilities for extracting GHC options needed to compile a given Haskell target"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {bin-package-db = null;}; @@ -80022,6 +80132,7 @@ self: { ]; description = "Virtual-dom bindings for GHCJS"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghcjs-ffiqq = null; ghcjs-prim = null;}; @@ -80360,6 +80471,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gobjectIntrospection;}; "gi-glib" = callPackage @@ -80991,6 +81103,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) x11;}; "giak" = callPackage @@ -87783,6 +87896,7 @@ self: { ]; description = "A library for analyzing and transforming LLVM (3.5) assembly codes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {hooplext = null;}; @@ -89386,6 +89500,7 @@ self: { homepage = "https://github.com/hadolint/hadolint"; description = "Dockerfile Linter JavaScript API"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hadoop-formats" = callPackage @@ -89670,6 +89785,7 @@ self: { ]; description = "Multi-app web platform framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {quickcheck-lio-instances = null;}; @@ -90393,6 +90509,7 @@ self: { homepage = "http://halvm.org"; description = "A simple, static HaLVM web server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {HALVMCore = null; XenDevice = null;}; @@ -90767,6 +90884,7 @@ self: { homepage = "https://github.com/tolysz/hans-pfq"; description = "Driver for real ethernet devices for HaNS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {pfq = null;}; @@ -92825,19 +92943,19 @@ self: { "haskell-dap" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , directory, filepath, ghc, ghc-boot, ghci, haskeline, process - , time, transformers, unix + , directory, filepath, ghc, ghc-boot, ghc-paths, ghci, haskeline + , process, time, transformers, unix }: mkDerivation { pname = "haskell-dap"; - version = "0.0.1.0"; - sha256 = "1wny1ab0x1wdaa8xhza478abyv1sd2pq4clc08bz3b2aa0qd13y8"; + version = "0.0.2.0"; + sha256 = "1wxidyga0abxyxwiy9qxjl8qj456rlcflav18jz3227yc6y4ziwz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ array base bytestring containers deepseq directory filepath ghc - ghc-boot ghci haskeline process time transformers unix + ghc-boot ghc-paths ghci haskeline process time transformers unix ]; homepage = "https://github.com/phoityne/haskell-dap"; description = "haskell-dap is a GHCi having DAP interface"; @@ -94980,6 +95098,7 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HSQL Oracle driver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {hsql-oracle = null;}; @@ -95018,6 +95137,7 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HSQL SQLite driver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {hsql-sqlite = null;}; @@ -96295,6 +96415,7 @@ self: { homepage = "http://haste-lang.org/"; description = "Haskell To ECMAScript compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {bin-package-db = null;}; @@ -97978,6 +98099,7 @@ self: { homepage = "https://github.com/githubuser/haskell-hedgehog-gen-json#readme"; description = "JSON generators for Hedgehog"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedgehog-quickcheck" = callPackage @@ -99849,6 +99971,7 @@ self: { homepage = "http://code.haskell.org/~thielema/hgl-example/"; description = "Various animations generated using HGL"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {HTam = null;}; @@ -100488,6 +100611,7 @@ self: { homepage = "http://www.haskell.org/himerge"; description = "Haskell Graphical User Interface for Emerge"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {mozembed = null;}; @@ -101878,32 +102002,6 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.0.11"; - sha256 = "040p4rr7jjr40i6239vwkr2qqva7r9ccksg5n9k9r7ljbh8rf66b"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring cmdargs containers cpphs - data-default directory extra filepath haskell-src-exts - haskell-src-exts-util hscolour process refact text transformers - uniplate unordered-containers vector yaml - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/ndmitchell/hlint#readme"; - description = "Source code suggestions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hlint_2_0_15" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs - , containers, cpphs, data-default, directory, extra, filepath - , haskell-src-exts, haskell-src-exts-util, hscolour, process - , refact, text, transformers, uniplate, unordered-containers - , vector, yaml - }: - mkDerivation { - pname = "hlint"; version = "2.0.15"; sha256 = "0k9y9dj9sq8rwkjnca4s6wv0ncba536lmcpq10vpyvy47x5dzs2d"; isLibrary = true; @@ -101919,7 +102017,6 @@ self: { homepage = "https://github.com/ndmitchell/hlint#readme"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlint-test" = callPackage @@ -103358,11 +103455,10 @@ self: { ({ mkDerivation, array, base, FPretty, ghc-prim }: mkDerivation { pname = "hood"; - version = "0.3"; - sha256 = "08k15fvrqjnh3fab90ck3b3mb5wr15js6bw76m9k86nh0pxjv5pi"; - revision = "1"; - editedCabalFile = "0r2awfxb2xfvfr725g7a6a0s5d850fqglxv4z6j1syvlgyfdzfgr"; + version = "0.3.1"; + sha256 = "0bi1knfp6h6x7rrw5gggiip0h7ynhw2ds7k2q2fynrhsg9jdp5qv"; libraryHaskellDepends = [ array base FPretty ghc-prim ]; + testHaskellDepends = [ base ghc-prim ]; homepage = "http://ku-fpg.github.io/software/hood"; description = "Debugging by observing in place"; license = stdenv.lib.licenses.bsd3; @@ -104143,6 +104239,7 @@ self: { homepage = "http://rd.slavepianos.org/?t=hosc-utils"; description = "Haskell Open Sound Control Utilities"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {www-minus = null;}; @@ -105355,6 +105452,7 @@ self: { homepage = "https://github.com/iand675/brotli#readme"; description = "Compression and decompression in the brotli format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {brotli = null; brotlidec = null; brotlienc = null; libbrotlidec = null; libbrotlienc = null;}; @@ -111554,6 +111652,7 @@ self: { homepage = "http://github.com/hunt-framework"; description = "A Command line Interface for the Hunt server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {hunt-client = null;}; @@ -112347,6 +112446,7 @@ self: { testHaskellDepends = [ array base Cabal containers mtl ]; description = "An implementation of Neil D. Jones' While language"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hworker" = callPackage @@ -115165,6 +115265,7 @@ self: { homepage = "http://www.nomyx.net"; description = "Reactive programming language based on a DSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {Imprevu = null;}; @@ -116120,6 +116221,7 @@ self: { executableHaskellDepends = [ aether base text ]; description = "Console client for encyclopedias"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {aether = null;}; @@ -117874,6 +117976,7 @@ self: { homepage = "https://github.com/nikita-volkov/iri"; description = "RFC-based International Resource Identifier library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iridium" = callPackage @@ -121662,6 +121765,7 @@ self: { homepage = "https://github.com/marcelbuesing/kcd"; description = "Kayak .kcd parsing library."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {kcd-parser = null;}; @@ -122642,6 +122746,7 @@ self: { ]; description = "Utilities for working with many HStringTemplate templates from files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {string-templates = null;}; @@ -123267,7 +123372,7 @@ self: { homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -123320,6 +123425,7 @@ self: { homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-irc-plugins" = callPackage @@ -123848,6 +123954,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-ats" = callPackage + ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base + , composition-prelude, criterion, deepseq, happy, hspec + , hspec-dirstream, lens, recursion-schemes, system-filepath + , unordered-containers + }: + mkDerivation { + pname = "language-ats"; + version = "0.1.0.3"; + sha256 = "08y6k7hz2lybk05f3ijyxyva622gvd97fr5mkwsjw4dgbzvnakzc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base composition-prelude deepseq + lens recursion-schemes unordered-containers + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base hspec hspec-dirstream system-filepath + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/vmchale/language-ats#readme"; + description = "Parser and pretty-printer for ATS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-bash" = callPackage ({ mkDerivation, base, parsec, pretty, process, QuickCheck, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck @@ -129109,6 +129240,7 @@ self: { executableHaskellDepends = [ base ]; description = "Liveplotting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {andromeda = null;}; @@ -131185,6 +131317,7 @@ self: { homepage = "https://github.com/dbp/lss"; description = "Lexical Style Sheets - a language for writing styles that is focused around lexical (ie, static) scoping and re-use of large components"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {language-css-attoparsec = null;}; @@ -131273,6 +131406,7 @@ self: { homepage = "http://www.leksah.org"; description = "Leksah tool kit"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "ltl" = callPackage @@ -131410,6 +131544,7 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Helper functions for using lucid with colonnade"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-extras" = callPackage @@ -132232,8 +132367,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "4.0.0.3"; - sha256 = "01jnhwxflphimnm2ga8zbhpkmvc4k92a7vicrmx0h6dhjyhmm7m7"; + version = "4.0.0.4"; + sha256 = "1rfax7s4sc63943izc1r0gk848ji0kxsjgsb81i2f6dc5860xkz9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -132311,6 +132446,7 @@ self: { homepage = "https://github.com/LeastAuthority/haskell-magic-wormhole#readme"; description = "Interact with Magic Wormhole"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "magicbane" = callPackage @@ -135266,14 +135402,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "memory_0_14_12" = callPackage + "memory_0_14_13" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, foundation , ghc-prim, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "memory"; - version = "0.14.12"; - sha256 = "0qb67lmsq4clcx726hgq1ichjs72cqnjkpcsqa7ply21zq23an6q"; + version = "0.14.13"; + sha256 = "0ycxk9yp0bd29jqn48vzblxaa8sny8mw652icyvg3zg3sjg9pjxd"; libraryHaskellDepends = [ base basement bytestring deepseq foundation ghc-prim ]; @@ -137190,7 +137326,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmark_0_0_5_0" = callPackage + "mmark_0_0_5_1" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, data-default-class, deepseq, dlist, email-validate , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid @@ -137200,8 +137336,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.5.0"; - sha256 = "17vbj5hc57dikhqc4ngps61vkswlpff6vq1d8jbb79pr467zczgv"; + version = "0.0.5.1"; + sha256 = "0zx2lcz8ha1s5apr3hnxv4kms1n2c5rajyxhz9gck7kxpx2yviqz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -137239,6 +137375,7 @@ self: { homepage = "https://github.com/mmark-md/mmark-cli"; description = "Description"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmark-ext" = callPackage @@ -139604,6 +139741,7 @@ self: { homepage = "http://github.com/bumptech/montage"; description = "Riak Resolution Proxy"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {riak-bump = null; stats-web = null;}; @@ -139627,6 +139765,7 @@ self: { homepage = "http://github.com/bumptech/montage-haskell-client"; description = "Riak Resolution Proxy Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {riak-bump = null; stats-web = null;}; @@ -139834,6 +139973,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "morte_1_6_14" = callPackage + ({ mkDerivation, alex, array, base, binary, code-page, containers + , criterion, deepseq, Earley, http-client, http-client-tls + , microlens, microlens-mtl, mtl, optparse-applicative, pipes + , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit + , tasty-quickcheck, text, text-format, transformers + }: + mkDerivation { + pname = "morte"; + version = "1.6.14"; + sha256 = "1wrm982gxm8hg2x8srm5ibp2s8752apsz2ljlldway2n49cf2bsm"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary containers deepseq Earley http-client + http-client-tls microlens microlens-mtl pipes system-fileio + system-filepath text text-format transformers + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ + base code-page optparse-applicative text text-format + ]; + testHaskellDepends = [ + base mtl QuickCheck system-filepath tasty tasty-hunit + tasty-quickcheck text transformers + ]; + benchmarkHaskellDepends = [ base criterion system-filepath text ]; + description = "A bare-bones calculus of constructions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mosaico-lib" = callPackage ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels @@ -143423,6 +143595,7 @@ self: { homepage = "http://phaul.hobby-site.org/node/4123"; description = "Concurrent over the network execution library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -145629,6 +145802,7 @@ self: { homepage = "https://github.com/v0d1ch/nmis-parser#readme"; description = "NMIS file parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {Nmis = null;}; @@ -145892,6 +146066,7 @@ self: { homepage = "http://www.nomyx.net"; description = "Web gui for Nomyx"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {nomyx-auth = null;}; @@ -146362,6 +146537,7 @@ self: { homepage = "https://github.com/zjhmale/ntha"; description = "A tiny statically typed functional programming language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nthable" = callPackage @@ -146763,20 +146939,25 @@ self: { }) {}; "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest - , ghc-typelits-natnormalise, numhask, protolude, singletons + ({ mkDerivation, accelerate, accelerate-llvm + , accelerate-llvm-native, adjunctions, base, deepseq, dimensions + , distributive, doctest, ghc-typelits-natnormalise, numhask + , protolude, QuickCheck, singletons, tasty, tasty-quickcheck , typelits-witnesses, vector }: mkDerivation { pname = "numhask-array"; - version = "0.0.2"; - sha256 = "0gbmwkpxdp1flzyndsqc5zgm2nlrpc8q4s0d2z8pws8g2gyymyj9"; + version = "0.1.0.0"; + sha256 = "0m8xgdizpw80dxhbdx45bhn8m71a4lk2zy6ckczrly02g272mqxv"; libraryHaskellDepends = [ - adjunctions base deepseq distributive ghc-typelits-natnormalise - numhask protolude singletons typelits-witnesses vector + accelerate accelerate-llvm accelerate-llvm-native adjunctions base + deepseq dimensions distributive ghc-typelits-natnormalise numhask + protolude QuickCheck singletons typelits-witnesses vector ]; - testHaskellDepends = [ base doctest numhask ]; - homepage = "https://github.com/tonyday567/numhask-array"; + testHaskellDepends = [ + base doctest numhask QuickCheck tasty tasty-quickcheck + ]; + homepage = "https://github.com/tonyday567/numhask-array#readme"; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -146801,6 +146982,7 @@ self: { homepage = "https://github.com/tonyday567/numhask-histogram#readme"; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numhask-range" = callPackage @@ -147099,6 +147281,7 @@ self: { homepage = "https://github.com/serokell/o-clock"; description = "Type-safe time library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "oanda-rest-api" = callPackage @@ -149943,8 +150126,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "packcheck"; - version = "0.1.0"; - sha256 = "03asx4j9bj2fka6ydgc8qh3j8kzk7mdi7420rcj7n5g4ma4hhhb3"; + version = "0.1.1"; + sha256 = "10c822mx6vjf42d0lzi950s61s8hcw6451ckxq5g7wg4pavyr7zp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; @@ -150078,8 +150261,8 @@ self: { }: mkDerivation { pname = "packman"; - version = "0.4.0"; - sha256 = "1x02dbaydw8mz4r0730hmdwx10pg0pwk8b6zlh3jqmkf9093jfms"; + version = "0.5.0"; + sha256 = "1xnh1jl33a84pi0cyz62wxwrgfx3amdwc3f906a1wa9bwy7xkcih"; libraryHaskellDepends = [ array base binary bytestring ghc-prim primitive ]; @@ -150453,7 +150636,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_13_0_1" = callPackage + "pandoc-citeproc_0_14" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -150462,8 +150645,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.13.0.1"; - sha256 = "01kwaqz7w8rrkikmcp5r1fbbh44d5qmbk17q0d8blpv66vgmln6v"; + version = "0.14"; + sha256 = "1pbbkfrvwr4qg1p6vdnpg1zlxj48r23bprz48k35jbriw1j6i452"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -150903,6 +151086,7 @@ self: { homepage = "http://chriswarbo.net/projects/activecode"; description = "Pandoc filter to unwrap nested blocks"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {lazysmallcheck2012 = null;}; @@ -152348,6 +152532,7 @@ self: { homepage = "https://github.com/PasswordManager/passman-core#readme"; description = "Deterministic password generator core"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -153123,6 +153308,7 @@ self: { homepage = "https://github.com/NCrashed/pdf-slave-server#readme"; description = "Web service for pdf-slave tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {pdf-slave-server-api = null;}; @@ -163684,6 +163870,7 @@ self: { homepage = "https://github.com/quasicomputational/mega/tree/master/packages/twofinger"; description = "Efficient alternating finger trees"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qc-oi-testgenerator" = callPackage @@ -164184,6 +164371,7 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Analysis and parsing library for SQL queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {predicate-class = null;}; @@ -164204,6 +164392,7 @@ self: { ]; description = "Parsing for Hive SQL queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {predicate-class = null;}; @@ -164224,6 +164413,7 @@ self: { ]; description = "Parsing for Presto SQL queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {predicate-class = null;}; @@ -164244,6 +164434,7 @@ self: { ]; description = "Parsing for Vertica SQL queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {predicate-class = null;}; @@ -166735,6 +166926,7 @@ self: { homepage = "http://paychandoc.runeks.me/"; description = "RESTful Bitcoin Payment Channel Protocol Servant API description"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {bitcoin-payment-protocol = null;}; @@ -171879,6 +172071,7 @@ self: { ]; description = "A standard library for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riot" = callPackage @@ -178733,8 +178926,8 @@ self: { pname = "servant-mock"; version = "0.8.3"; sha256 = "0fwkygv4rx98qys8apj7aby4xhssgzqdgsxmb6vh4ky71vjq0q5m"; - revision = "1"; - editedCabalFile = "11aaf3gj0j0c3sjcv55rx9184ryavv9nr8smpadrd8ldy43bfq33"; + revision = "2"; + editedCabalFile = "00dq310ik9nm20mxxr9d46jilp9h6k54f5mdl1ii2ggwy2mck1dm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180468,6 +180661,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shake-ext" = callPackage + ({ mkDerivation, base, composition-prelude, language-ats, shake }: + mkDerivation { + pname = "shake-ext"; + version = "0.3.1.3"; + sha256 = "0yz8d4jycgr32sspdda1zy4z61bj91xi40dcr084w11z00a3yhms"; + libraryHaskellDepends = [ + base composition-prelude language-ats shake + ]; + homepage = "https://hub.darcs.net/vmchale/shake-ext"; + description = "Helper functions for linting with shake"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shake-extras" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , shake @@ -181185,6 +181392,7 @@ self: { homepage = "https://github.com/fgaz/shine"; description = "Declarative graphics for the browser using GHCJS"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghcjs-prim = null;}; @@ -182914,8 +183122,8 @@ self: { }: mkDerivation { pname = "siren-json"; - version = "0.1.3.0"; - sha256 = "1dhza76kvifjsi6cznvy61r6pv7vbaqc7xk5ygd1lw1kw6ksmq9s"; + version = "0.1.3.1"; + sha256 = "1chwf9kldwf039qad55la4yh13wjax64g0pi99hw2b46x7dx4qm1"; libraryHaskellDepends = [ aeson base bytestring containers http-media http-types network-uri network-uri-json text unordered-containers @@ -182930,7 +183138,7 @@ self: { homepage = "https://github.com/alunduil/siren-json.hs"; description = "Siren Tools for Haskell"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ alunduil ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sirkel" = callPackage @@ -183377,6 +183585,7 @@ self: { homepage = "https://github.com/jdevelop/skypelogexport/wiki"; description = "Export Skype chat logs to text files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -187414,6 +187623,7 @@ self: { homepage = "https://bitbucket.org/tdammers/sprinkles"; description = "JSON API to HTML website wrapper"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {pandoc-creole = null;}; @@ -189198,6 +189408,7 @@ self: { libraryHaskellDepends = [ applicative base transformers ]; description = "The ST monad and STRefs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {applicative = null;}; @@ -193403,6 +193614,7 @@ self: { homepage = "http://github.com/brentlintner/synt"; description = "Similar code analysis"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {Synt = null;}; @@ -193735,6 +193947,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing with dynamic physical dimensions"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {UniqueLogicNP = null;}; @@ -194145,6 +194358,7 @@ self: { homepage = "https://github.com/jcristovao/system-util"; description = "Various system utils lifted to EitherT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {easy-data = null;}; @@ -195439,6 +195653,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-ant-xml_1_1_2" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers + , xml + }: + mkDerivation { + pname = "tasty-ant-xml"; + version = "1.1.2"; + sha256 = "10k8092iz8klx7wa3ajfny8zvrxv3clz330v3qz3k7dmbj596nhq"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving ghc-prim mtl + stm tagged tasty transformers xml + ]; + homepage = "http://github.com/ocharles/tasty-ant-xml"; + description = "Render tasty output to XML for Jenkins"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-auto" = callPackage ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec , tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -195846,6 +196079,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-rerun_1_1_9" = callPackage + ({ mkDerivation, base, containers, mtl, optparse-applicative + , reducers, split, stm, tagged, tasty, transformers + }: + mkDerivation { + pname = "tasty-rerun"; + version = "1.1.9"; + sha256 = "0piwv5nrqvwnzp76xpsjlncrl2cd9jsxxb1ghkaijn2fi2c63akd"; + libraryHaskellDepends = [ + base containers mtl optparse-applicative reducers split stm tagged + tasty transformers + ]; + homepage = "http://github.com/ocharles/tasty-rerun"; + description = "Run tests by filtering the test tree depending on the result of previous test runs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process @@ -197849,6 +198100,31 @@ self: { license = "GPL"; }) {}; + "texmath_0_10_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, network-uri, pandoc-types, parsec, process, split, syb + , temporary, text, utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.10.1.1"; + sha256 = "0q2fld5mdcd6j1n3rrg3bjpndbgbn17cwg0xbnvscrpa0s767jaj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + executableHaskellDepends = [ network-uri ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -202701,6 +202977,7 @@ self: { homepage = "https://github.com/ocharles/transformers-eff"; description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {effect-interpreters = null;}; @@ -203977,12 +204254,12 @@ self: { }) {}; "tuple-ops" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, type-combinators }: mkDerivation { pname = "tuple-ops"; - version = "0.0.0.0"; - sha256 = "0n6jv8l2kkvibxy24rf7zlyp0m6sqy4zyllczv23fdgpq7g6hi35"; - libraryHaskellDepends = [ base ]; + version = "0.0.0.1"; + sha256 = "0hhj6dlyrsw1yvbzjmvknbbl292rzb8hyy2llr09yc1k13gxgx1i"; + libraryHaskellDepends = [ base type-combinators ]; homepage = "https://github.com/pierric/tuple-ops"; description = "various operations on n-ary tuples via GHC.Generics"; license = stdenv.lib.licenses.bsd3; @@ -204129,7 +204406,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "turtle_1_5_0" = callPackage + "turtle_1_5_1" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, criterion, directory, doctest, exceptions, foldl , hostname, managed, optional-args, optparse-applicative, process @@ -204138,8 +204415,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.0"; - sha256 = "1ivskskvqbwm4bp8m2pfhb3ma9y747jfg5gfcsadwmqyqzzf90l5"; + version = "1.5.1"; + sha256 = "06yya57w3i598b6h3gkhv8zs0a3f1az12x8viy16sgdbgwph8scm"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -205719,6 +205996,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typelits-witnesses_0_3_0_0" = callPackage + ({ mkDerivation, base, base-compat, constraints, reflection + , transformers + }: + mkDerivation { + pname = "typelits-witnesses"; + version = "0.3.0.0"; + sha256 = "1rjc2wxm6cmvf03m3w3r19a9kya5ksk27zy00dmm3zqhq58ccb4v"; + libraryHaskellDepends = [ + base base-compat constraints reflection transformers + ]; + homepage = "https://github.com/mstksg/typelits-witnesses"; + description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typeof" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -206551,6 +206845,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unfoldable_0_9_5" = callPackage + ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck + , random, transformers + }: + mkDerivation { + pname = "unfoldable"; + version = "0.9.5"; + sha256 = "0ll29dvizh8hqhqncrmzwzgbb1q9br2f7326r38dr7xmdpmpjsbn"; + libraryHaskellDepends = [ + base containers ghc-prim one-liner QuickCheck random transformers + ]; + homepage = "https://github.com/sjoerdvisscher/unfoldable"; + description = "Class of data structures that can be unfolded"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unfoldable-restricted" = callPackage ({ mkDerivation, base, constraints, containers, hashable , transformers, unfoldable, unit-constraint, unordered-containers @@ -210047,8 +210358,8 @@ self: { pname = "vector"; version = "0.12.0.1"; sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i"; - revision = "1"; - editedCabalFile = "1xjv8876kx9vh86w718vdaaai40pwnsiw8368c5h88ch8iqq10qb"; + revision = "2"; + editedCabalFile = "0vzr8kra73anchp86knkmkq2afkd1hw6hirldn9vn69frynb1n6y"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base HUnit QuickCheck random template-haskell test-framework @@ -210483,6 +210794,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vectortiles_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , hashable, hex, microlens, microlens-platform, protocol-buffers + , protocol-buffers-descriptor, tasty, tasty-hunit, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "vectortiles"; + version = "1.3.0"; + sha256 = "1hvnk2b3g6dm58az7wyl8bcq4h8s0fkz0v0pig9gpad5smkmgjk0"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable protocol-buffers + protocol-buffers-descriptor text transformers unordered-containers + vector + ]; + testHaskellDepends = [ + base bytestring containers hashable hex protocol-buffers + protocol-buffers-descriptor tasty tasty-hunit text + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion hashable microlens + microlens-platform protocol-buffers protocol-buffers-descriptor + text unordered-containers vector + ]; + homepage = "https://github.com/fosskers/vectortiles"; + description = "GIS Vector Tiles, as defined by Mapbox"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "verbalexpressions" = callPackage ({ mkDerivation, base, regex-pcre }: mkDerivation { @@ -211327,6 +211669,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_19_2" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , deepseq, directory, filepath, hashable, HUnit, microlens + , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck + , quickcheck-assertions, random, smallcheck, stm, string-qq + , terminfo, test-framework, test-framework-hunit + , test-framework-smallcheck, text, transformers, unix, utf8-string + , vector + }: + mkDerivation { + pname = "vty"; + version = "5.19.2"; + sha256 = "158afcgzcwq7ybjw7jk28q799xzpns47m1l4sivc3wrrfklqh7xz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq directory filepath + hashable microlens microlens-mtl microlens-th mtl parallel parsec + stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers deepseq HUnit + microlens microlens-mtl mtl QuickCheck quickcheck-assertions random + smallcheck stm string-qq terminfo test-framework + test-framework-hunit test-framework-smallcheck text unix + utf8-string vector + ]; + homepage = "https://github.com/jtdaugherty/vty"; + description = "A simple terminal UI library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -213330,6 +213708,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_2_15" = callPackage + ({ mkDerivation, array, async, auto-update, base, blaze-builder + , bytestring, case-insensitive, containers, directory, doctest + , gauge, ghc-prim, hashable, hspec, http-client, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.2.15"; + sha256 = "10l2qk4qn6vf898fp4ahdyhn49f8zjhlczxv0d93wkc695m59his"; + libraryHaskellDepends = [ + array async auto-update base blaze-builder bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base blaze-builder bytestring + case-insensitive containers directory doctest ghc-prim hashable + hspec http-client http-date http-types http2 HUnit iproute + lifted-base network process QuickCheck silently simple-sendfile stm + streaming-commons text time transformers unix unix-compat vault wai + word8 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network unix unix-compat + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -214221,6 +214635,7 @@ self: { ]; description = "Parser and Pretty Printer for the Web IDL Language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {LEXER = null;}; @@ -214948,6 +215363,7 @@ self: { homepage = "https://github.com/Haskell-mouse/wigner-ville-accelerate"; description = "Wigner-ville transform using the Accelerate library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {wigner = null;}; @@ -215038,6 +215454,7 @@ self: { homepage = "https://github.com/debug-ito/wild-bind"; description = "Task to install and export everything you need to use WildBind in X11"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wild-bind-x11" = callPackage @@ -215682,6 +216099,7 @@ self: { homepage = "https://gonito.net/gitlist/word2vec-model.git"; description = "Reading word2vec binary models"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "word8" = callPackage @@ -222691,6 +223109,7 @@ self: { homepage = "http://bitbucket.org/iago/z3-haskell"; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {gomp = null; inherit (pkgs) z3;}; "z3-encoding" = callPackage diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index af1c4d5b0e88..fef827cd9a11 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -156,7 +156,7 @@ rec { enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}"; disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}"; - markBroken = drv: overrideCabal drv (drv: { broken = true; }); + markBroken = drv: overrideCabal drv (drv: { broken = true; hydraPlatforms = []; }); markBrokenVersion = version: drv: assert drv.version == version; markBroken drv; enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; }); diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 66eddd0e3602..0048634f5b45 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -3,40 +3,21 @@ # args: Additional arguments to pass to mkDerivation. Generally should include at least # name and src. { stdenv, idris, gmp }: args: stdenv.mkDerivation ({ - preHook = '' - # Library import path - export IDRIS_LIBRARY_PATH=$PWD/idris-libs - mkdir -p $IDRIS_LIBRARY_PATH - - # Library install path - export IBCSUBDIR=$out/lib/${idris.name} - mkdir -p $IBCSUBDIR - - addIdrisLibs () { - if [ -d $1/lib/${idris.name} ]; then - ln -sv $1/lib/${idris.name}/* $IDRIS_LIBRARY_PATH - fi - } - - # All run-time deps - addEnvHooks 0 addIdrisLibs - ''; - buildPhase = '' - ${idris}/bin/idris --build *.ipkg + idris --build *.ipkg ''; doCheck = true; checkPhase = '' if grep -q test *.ipkg; then - ${idris}/bin/idris --testpkg *.ipkg + idris --testpkg *.ipkg fi ''; installPhase = '' - ${idris}/bin/idris --install *.ipkg --ibcsubdir $IBCSUBDIR + idris --install *.ipkg --ibcsubdir $IBCSUBDIR ''; - buildInputs = [ gmp ]; + buildInputs = [ gmp idris ]; } // args) diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index 32424ba1f862..c67624337bbb 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -9,6 +9,9 @@ symlinkJoin { wrapProgram $out/bin/idris \ --suffix PATH : ${ stdenv.lib.makeBinPath path } \ --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} + + mkdir -p $out/nix-support + substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook ''; } diff --git a/pkgs/development/idris-modules/setup-hook.sh b/pkgs/development/idris-modules/setup-hook.sh new file mode 100644 index 000000000000..30a487ea80d4 --- /dev/null +++ b/pkgs/development/idris-modules/setup-hook.sh @@ -0,0 +1,16 @@ +# Library import path +export IDRIS_LIBRARY_PATH=$PWD/idris-libs +mkdir -p $IDRIS_LIBRARY_PATH + +# Library install path +export IBCSUBDIR=$out/lib/@name@ +mkdir -p $IBCSUBDIR + +addIdrisLibs () { + if [ -d $1/lib/@name@ ]; then + ln -sv $1/lib/@name@/* $IDRIS_LIBRARY_PATH + fi +} + +# All run-time deps +addEnvHooks 1 addIdrisLibs diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 62c63ef6c5c3..14a4bac47f62 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurlBoot, enableThreading ? stdenv ? glibc }: +{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc }: with lib; @@ -19,7 +19,8 @@ let libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; libcInc = lib.getDev libc; libcLib = lib.getLib libc; - common = { version, sha256 }: stdenv.mkDerivation rec { + crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; + common = { version, sha256 }: stdenv.mkDerivation (rec { name = "perl-${version}"; src = fetchurlBoot { @@ -50,6 +51,8 @@ let pwd="$(type -P pwd)" substituteInPlace dist/PathTools/Cwd.pm \ --replace "/bin/pwd" "$pwd" + '' + stdenv.lib.optionalString crossCompiling '' + substituteInPlace cnf/configure_tool.sh --replace "cc -E -P" "cc -E" ''; # Build a thread-safe Perl with a dynamic libperls.o. We need the @@ -58,8 +61,10 @@ let # contains the string "perl", Configure would select $out/lib. # Miniperl needs -lm. perl needs -lrt. configureFlags = - [ "-de" - "-Dcc=cc" + (if crossCompiling + then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" ] + else [ "-de" "-Dcc=cc" ]) + ++ [ "-Uinstallusrbinperl" "-Dinstallstyle=lib/perl5" "-Duseshrplib" @@ -69,14 +74,13 @@ let ++ optional stdenv.isSunOS "-Dcc=gcc" ++ optional enableThreading "-Dusethreads"; - configureScript = "${stdenv.shell} ./Configure"; + configureScript = stdenv.lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; - dontAddPrefix = true; + dontAddPrefix = !crossCompiling; - enableParallelBuilding = true; + enableParallelBuilding = !crossCompiling; - preConfigure = - '' + preConfigure = optionalString (!crossCompiling) '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" '' + optionalString (stdenv.isArm || stdenv.isMips) '' configureFlagsArray=(-Dldflags="-lm -lrt") @@ -121,7 +125,23 @@ let maintainers = [ maintainers.eelco ]; platforms = platforms.all; }; - }; + } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { + crossVersion = "1.1.8"; + + perl-cross-src = fetchurlBoot { + url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz"; + sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; + }; + + nativeBuildInputs = [ buildPackages.stdenv.cc ]; + + postUnpack = '' + unpackFile ${perl-cross-src} + cp -R perl-cross-${crossVersion}/* perl-${version}/ + ''; + + configurePlatforms = [ "build" "host" "target" ]; + }); in rec { perl = perl524; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index a7ef0290734b..a630e9cead8a 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2 }: +{ stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { name = "SDL2_gfx-${version}"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn"; }; - buildInputs = [ SDL2 ]; + buildInputs = [ SDL2 ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx"; @@ -38,6 +39,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = with maintainers; [ bjg ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 6eada0c83e52..00251adb9153 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which , SDL2, libogg, libvorbis, smpeg2, flac, libmodplug +, CoreServices, AudioUnit, AudioToolbox , enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { @@ -17,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig which ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ]; configureFlags = [ "--disable-music-ogg-shared" ] @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; - platforms = platforms.linux; + platforms = platforms.unix; homepage = https://www.libsdl.org/projects/SDL_mixer/; maintainers = with maintainers; [ MP2E ]; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index cf81fc0cac83..780444d51f4f 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2 }: +{ stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { name = "SDL2_net-${version}"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; + buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + propagatedBuildInputs = [ SDL2 ]; meta = with stdenv.lib; { @@ -16,6 +18,6 @@ stdenv.mkDerivation rec { homepage = https://www.libsdl.org/projects/SDL_net; license = licenses.zlib; maintainers = with maintainers; [ MP2E ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 010ca46695a3..87436119ef47 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, freetype, mesa_noglu }: +{ stdenv, darwin, fetchurl, SDL2, freetype, mesa_noglu }: stdenv.mkDerivation rec { name = "SDL2_ttf-${version}"; @@ -9,11 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; }; - buildInputs = [ SDL2 freetype mesa_noglu ]; + buildInputs = [ SDL2 freetype mesa_noglu ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; meta = with stdenv.lib; { description = "SDL TrueType library"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.zlib; homepage = https://www.libsdl.org/projects/SDL_ttf/; }; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 4a13bfd9994b..8152c1ea8524 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "libsigsegv-2.11"; + name = "libsigsegv-2.12"; src = fetchurl { url = "mirror://gnu/libsigsegv/${name}.tar.gz"; - sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x"; + sha256 = "1dlhqf4igzpqayms25lkhycjq1ccavisx8cnb3y4zapbkqsszq9s"; }; patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null; diff --git a/pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch b/pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch new file mode 100644 index 000000000000..2eee84d1c4b8 --- /dev/null +++ b/pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch @@ -0,0 +1,41 @@ +Adapted from https://github.com/zcash/libsnark/pull/10 + +diff --git a/depends/libff/libff/common/profiling.cpp b/depends/libff/libff/common/profiling.cpp +index f2a1985..319149c 100755 +--- a/depends/libff/libff/common/profiling.cpp ++++ b/depends/libff/libff/common/profiling.cpp +@@ -27,6 +27,13 @@ + #include <proc/readproc.h> + #endif + ++#ifdef __MACH__ ++#include <time.h> ++#include <sys/time.h> ++#include <mach/clock.h> ++#include <mach/mach.h> ++#endif ++ + namespace libff { + + long long get_nsec_time() +@@ -42,10 +49,20 @@ long long get_nsec_cpu_time() + return 0; + #else + ::timespec ts; ++#ifdef __MACH__ ++ clock_serv_t cclock; ++ mach_timespec_t mts; ++ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); ++ clock_get_time(cclock, &mts); ++ mach_port_deallocate(mach_task_self(), cclock); ++ ts.tv_sec = mts.tv_sec; ++ ts.tv_nsec = mts.tv_nsec; ++#else + if ( ::clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts) ) + throw ::std::runtime_error("clock_gettime(CLOCK_PROCESS_CPUTIME_ID) failed"); + // If we expected this to work, don't silently ignore failures, because that would hide the problem and incur an unnecessarily system-call overhead. So if we ever observe this exception, we should probably add a suitable #ifdef . + //TODO: clock_gettime(CLOCK_PROCESS_CPUTIME_ID) is not supported by native Windows. What about Cygwin? Should we #ifdef on CLOCK_PROCESS_CPUTIME_ID or on __linux__? ++#endif + return ts.tv_sec * 1000000000ll + ts.tv_nsec; + #endif + } diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix new file mode 100644 index 000000000000..578053bbb427 --- /dev/null +++ b/pkgs/development/libraries/libsnark/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps, fetchpatch, patchutils }: + +let + rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; + inherit (stdenv) lib; +in stdenv.mkDerivation rec { + name = "libsnark-pre${version}"; + version = stdenv.lib.substring 0 8 rev; + + buildInputs = [ cmake pkgconfig openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; + + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "scipr-lab"; + repo = "libsnark"; + sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; + fetchSubmodules = true; + }; + + patches = [ ./darwin-fix-clock-gettime.patch ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "C++ library for zkSNARKs"; + homepage = https://github.com/scipr-lab/libsnark; + license = licenses.mit; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index c2c102ccf9bd..659c4fb7cff6 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "opensaml-cpp-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-opensaml.git"; - rev = "61193de29e4c9f1ccff7ed7e1f42c2748c62be77"; - sha256 = "1jlxa1f2qn0kd15fzjqp80apxn42v47wg3mx1vk424m31rhi00xr"; + rev = version; + sha256 = "0wjb6jyvh4hwpy1pvhh63i821746nqijysrd4vasbirkf4h6z7nx"; }; buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib ]; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 9433eb87109f..0ea58e6c434f 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; + # tells CMake to use this CA bundle file if it is accessible + preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; + + # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) + cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; + meta = with stdenv.lib; { description = "Qt 5 Cryptographic Architecture"; homepage = http://delta.affinix.com/qca; diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 2265d0df3949..4976399a66a6 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # tells CMake to use this CA bundle file if it is accessible + preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; + + # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) + cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; + meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.10/default.nix index 34ab82d42abe..cf66e60d5696 100644 --- a/pkgs/development/libraries/qt-5/5.10/default.nix +++ b/pkgs/development/libraries/qt-5/5.10/default.nix @@ -24,7 +24,7 @@ top-level attribute to `top-level/all-packages.nix`. # options developerBuild ? false, decryptSslTraffic ? false, - debug ? null, + debug ? false, }: with stdenv.lib; @@ -37,7 +37,7 @@ let srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; patches = { - qtbase = [ ./qtbase.patch ]; + qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch new file mode 100644 index 000000000000..e85a284f3bb6 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch @@ -0,0 +1,57 @@ +diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm +index 341d3bccf2..3368234c26 100644 +--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm ++++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm +@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations() + QMacAutoReleasePool pool; + userProfiles.clear(); + +- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + + CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; +@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate() + + QMacAutoReleasePool pool; + +- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + scanThread->interfaceName = QString::fromNSString(ifName); + scanThread->start(); +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index d1f19f2..1ac2cf1 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -1699,7 +1699,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window) + + if (!m_drawContentBorderGradient) { + window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask; +- [window.contentView.superview setNeedsDisplay:YES]; ++ [[window.contentView superview] setNeedsDisplay:YES]; + window.titlebarAppearsTransparent = NO; + return; + } +diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm +index e846fa0..4171cd4 100644 +--- a/src/plugins/platforms/cocoa/qnswindow.mm ++++ b/src/plugins/platforms/cocoa/qnswindow.mm +@@ -224,7 +224,7 @@ static bool isMouseEvent(NSEvent *ev) + if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) { + NSPoint loc = [theEvent locationInWindow]; + NSRect windowFrame = [self convertRectFromScreen:self.frame]; +- NSRect contentFrame = self.contentView.frame; ++ NSRect contentFrame = [self.contentView frame]; + if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO)) + [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent]; + } +@@ -253,7 +253,7 @@ static bool isMouseEvent(NSEvent *ev) + + (void)applicationActivationChanged:(NSNotification*)notification + { + const id sender = self; +- NSEnumerator<NSWindow*> *windowEnumerator = nullptr; ++ NSEnumerator *windowEnumerator = nullptr; + NSApplication *application = [NSApplication sharedApplication]; + + #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 9ad5af8eecd2..1200884a30ce 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -33,7 +33,7 @@ existing packages here and modify it as necessary. # options developerBuild ? false, decryptSslTraffic ? false, - debug ? null, + debug ? false, }: with stdenv.lib; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 7bf61c98086a..9afa818c36e3 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -24,7 +24,7 @@ top-level attribute to `top-level/all-packages.nix`. # options developerBuild ? false, decryptSslTraffic ? false, - debug ? null, + debug ? false, }: with stdenv.lib; diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 97bd09c327b2..739c9b4a1608 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -11,17 +11,18 @@ let qmakeFlags = (args.qmakeFlags or []) - ++ optional (debug != null) - (if debug then "CONFIG+=debug" else "CONFIG+=release"); + ++ [ ("CONFIG+=" + (if debug then "debug" else "release")) ]; - NIX_CFLAGS_COMPILE = optional (debug != null) "-DQT_NO_DEBUG"; + NIX_CFLAGS_COMPILE = + optional (!debug) "-DQT_NO_DEBUG" + ++ lib.toList (args.NIX_CFLAGS_COMPILE or []); cmakeFlags = (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ optional (debug != null) - (if debug then "-DCMAKE_BUILD_TYPE=Debug" - else "-DCMAKE_BUILD_TYPE=Release"); + ++ [ + "-DBUILD_TESTING=OFF" + ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release")) + ]; enableParallelBuilding = args.enableParallelBuilding or true; diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 219cda38bc28..74f861297d1a 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "shibboleth-sp-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-sp.git"; - rev = "9ebba5c3a16d03769f436e383e4c4cdaa33f5509"; - sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj"; + rev = version; + sha256 = "01q13p7gc0janjfml6zs46na8qnval8hc833fk2wrnmi4w9xw4fd"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 10386a7b33e4..3207bdb3a7f2 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }: +{ stdenv, darwin, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }: stdenv.mkDerivation rec { name = "smpeg2-svn${version}"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; - buildInputs = [ SDL2 ]; + buildInputs = [ SDL2 ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; preConfigure = '' sh autogen.sh @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { homepage = http://icculus.org/smpeg/; description = "SDL2 MPEG Player Library"; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index f2d7711c9f00..8e1d71fab3fa 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "xml-tooling-c-${version}"; - version = "1.6.0"; + version = "1.6.3"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-xmltooling.git"; - rev = "db08101c3854518a59096be95ed6564838381744"; - sha256 = "0rhzvxm4z3pm28kpk34hayhm12bjjms2kygv1z68vnz8ijzgcinq"; + rev = version; + sha256 = "09z2pp3yy3kqx22vwgxyi3s0vlpdv9camw8dpi3q8piff6zxak3q"; }; buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index b719780b1d55..7efcc77ef90b 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -499,13 +499,13 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; - "class-utils-0.3.5" = { + "class-utils-0.3.6" = { name = "class-utils"; packageName = "class-utils"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz"; - sha1 = "17e793103750f9627b2176ea34cfd1b565903c80"; + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; }; }; "cliui-3.2.0" = { @@ -814,6 +814,15 @@ let sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; }; }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; "deprecated-0.0.1" = { name = "deprecated"; packageName = "deprecated"; @@ -985,13 +994,13 @@ let sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; }; }; - "extglob-2.0.3" = { + "extglob-2.0.4" = { name = "extglob"; packageName = "extglob"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-2.0.3.tgz"; - sha512 = "31zb5fc59ps76hnxlnrcmm3lkv4pjd3cw55h5h7r9pn1q259bs15hw0bn4gp8kn91qwabgbj0cwkx9pxp8fgsj3ljlvmfv0xijnsah3"; + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; }; }; "extsprintf-1.3.0" = { @@ -2956,13 +2965,13 @@ let sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; }; }; - "rc-1.2.3" = { + "rc-1.2.4" = { name = "rc"; packageName = "rc"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.3.tgz"; - sha1 = "51575a900f8dd68381c710b4712c2154c3e2035b"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; + sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; }; }; "read-pkg-1.1.0" = { @@ -3172,13 +3181,13 @@ let sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; }; - "semver-5.4.1" = { + "semver-5.5.0" = { name = "semver"; packageName = "semver"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; }; "send-0.16.1" = { @@ -3802,13 +3811,13 @@ let sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; }; }; - "uuid-3.1.0" = { + "uuid-3.2.1" = { name = "uuid"; packageName = "uuid"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; - sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; + sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; }; }; "v8-debug-1.0.1" = { @@ -4296,7 +4305,7 @@ in sources."is-extendable-0.1.1" ]; }) - (sources."extglob-2.0.3" // { + (sources."extglob-2.0.4" // { dependencies = [ (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -4449,7 +4458,7 @@ in }) ]; }) - (sources."class-utils-0.3.5" // { + (sources."class-utils-0.3.6" // { dependencies = [ sources."arr-union-3.1.0" (sources."define-property-0.2.5" // { @@ -4479,23 +4488,6 @@ in }) ]; }) - (sources."lazy-cache-2.0.2" // { - dependencies = [ - (sources."set-getter-0.1.0" // { - dependencies = [ - (sources."to-object-path-0.3.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - ]; - }) (sources."static-extend-0.1.2" // { dependencies = [ (sources."object-copy-0.1.0" // { @@ -5089,7 +5081,7 @@ in ]; }) sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" + sources."uuid-3.2.1" ]; }) sources."rimraf-2.6.2" @@ -5328,6 +5320,7 @@ in sources."bytes-3.0.0" (sources."http-errors-1.6.2" // { dependencies = [ + sources."depd-1.1.1" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" ]; @@ -5344,7 +5337,7 @@ in sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -5377,6 +5370,7 @@ in sources."destroy-1.0.4" (sources."http-errors-1.6.2" // { dependencies = [ + sources."depd-1.1.1" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" ]; @@ -5428,7 +5422,7 @@ in ]; }) sources."path-is-absolute-1.0.1" - (sources."rc-1.2.3" // { + (sources."rc-1.2.4" // { dependencies = [ sources."deep-extend-0.4.2" sources."ini-1.3.5" @@ -5607,7 +5601,7 @@ in ]; }) sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" + sources."uuid-3.2.1" ]; }) (sources."rimraf-2.6.2" // { @@ -5640,7 +5634,7 @@ in }) ]; }) - sources."semver-5.4.1" + sources."semver-5.5.0" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -5854,7 +5848,7 @@ in ]; }) sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" + sources."uuid-3.2.1" ]; }) (sources."rimraf-2.6.2" // { @@ -5887,7 +5881,7 @@ in }) ]; }) - sources."semver-5.4.1" + sources."semver-5.5.0" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -6087,7 +6081,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.3" // { + (sources."rc-1.2.4" // { dependencies = [ sources."deep-extend-0.4.2" sources."ini-1.3.5" @@ -6175,7 +6169,7 @@ in ]; }) sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" + sources."uuid-3.2.1" ]; }) (sources."rimraf-2.6.2" // { @@ -6209,7 +6203,7 @@ in }) ]; }) - sources."semver-5.4.1" + sources."semver-5.5.0" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index ae70c54f2c0f..49380392bab5 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -6,8 +6,10 @@ , "bower2nix" , "browserify" , "castnow" +, "clean-css" , "coffee-script" , "coinmon" +, "configurable-http-proxy" , "cordova" , "csslint" , "dat" @@ -48,6 +50,8 @@ , "karma" , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" } , "lerna" +, "less" +, "less-plugin-clean-css" , "lcov-result-merger" , "livedown" , "live-server" @@ -76,6 +80,7 @@ , "pulp" , "quassel-webserver" , "react-tools" +, "react-native-cli" , "s3http" , "semver" , "serve" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index a2327e03b525..f172c9baf0c5 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -22,13 +22,13 @@ let sha512 = "265kszf17mdz60zpfrj5i47lqwwgp6h1b7i8vymig1pnlqd3lnljibxvd2d1rfa3827ks435k9wws458z3dk7fyq8wfmzmv8fk9qjhh"; }; }; - "@ionic/cli-utils-1.19.0" = { + "@ionic/cli-utils-1.19.1" = { name = "_at_ionic_slash_cli-utils"; packageName = "@ionic/cli-utils"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.19.0.tgz"; - sha512 = "24v61p6kqm6l6b5p58y5f4qgf7svxqnwpygz7bw1b7102p6hv6hkcnfgh32vf0nypd8fgdhyyhci5sz342ksdg11q6nj8snnqgd1gss"; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.19.1.tgz"; + sha512 = "3anhsxw0zyzi9j4kfnqxg2h4fxqjyw6pabb75z5b17hmksmjcyy6psic9fziyrgllp5rqksadqdzbkbb6lrviclhiz26sj8f7gjfi8r"; }; }; "@ionic/discover-0.4.0" = { @@ -49,13 +49,13 @@ let sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "@types/node-8.5.8" = { + "@types/node-8.5.9" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.5.8"; + version = "8.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.5.8.tgz"; - sha512 = "117s9gdcdsgjry03hpzlll79ssp0fs4i3pv87jkzn540pmi78kqa7p63ildwgwa09d904xz3zc54pjcpixbfj3ia3irfa8v3i3sbagh"; + url = "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz"; + sha512 = "2j38fqqziiv6m51w16lz6lgivrkycvn4nwch7sdpg32hbl5kv5m2ngg4y4jrf0v1s7iryi5gyh9729b8l1p48cf9hf0gj567h13grxk"; }; }; "@types/node-9.3.0" = { @@ -67,13 +67,22 @@ let sha512 = "0mhmzddyv8rhkha7ibpbsa5dfygzaa90438aqzpg9w7d31n093a7spx2zg4zfki4qrab71xrfb381hmqajn826cnrw9kc7kv2y5zl60"; }; }; - "@types/request-2.0.9" = { + "@types/request-2.0.12" = { name = "_at_types_slash_request"; packageName = "@types/request"; - version = "2.0.9"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.0.9.tgz"; - sha512 = "2kdhxhp1x6x3bmggmcsf6zl71a5j4wr22gbxid1264gards2wxk9plfgr3q3vl7l2h7pp29c622dlmz91mnrpyr7mqjhxdv359bhsi1"; + url = "https://registry.npmjs.org/@types/request/-/request-2.0.12.tgz"; + sha512 = "35i00ixsjahfplsbhfvs82yi2kkv8yjyd8n60mkl2yyznkhnbxwvvyf81v586bz8hz4pc3djnmibcpq65vjgbmcwpk7pq30khi6bwsl"; + }; + }; + "@types/tough-cookie-2.3.2" = { + name = "_at_types_slash_tough-cookie"; + packageName = "@types/tough-cookie"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.2.tgz"; + sha512 = "1nbw2qb74417hfamhd2a4yxf6ls3rjy92lv847mnhj7dxfla54kiwwdi64bnvcn7ysn5spkfakq4ssknb78qgz5nhd926whpdm6drdw"; }; }; "@types/uuid-3.4.3" = { @@ -85,6 +94,15 @@ let sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; }; }; + "@zeit/check-updates-1.0.5" = { + name = "_at_zeit_slash_check-updates"; + packageName = "@zeit/check-updates"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@zeit/check-updates/-/check-updates-1.0.5.tgz"; + sha512 = "3a4h5bdrpjkv8rjvyafqf9b3wnyynzi3gisz92k37c35nvawlicsdv4svwnsxfqvhjhqn3lab6rjmkkivvdijr41vm3r048pp5dm1s0"; + }; + }; "CSSselect-0.4.1" = { name = "CSSselect"; packageName = "CSSselect"; @@ -445,13 +463,13 @@ let sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; }; }; - "agent-base-4.1.2" = { + "agent-base-4.2.0" = { name = "agent-base"; packageName = "agent-base"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.2.tgz"; - sha512 = "0vj8afdy0gk5q82i5zxx1ng4ylzipvyfnljbw948hvv1zr2653nr8jwiw73rp267a5c1rjl2xpxlc4rqvblc88sx0y0dfjs8yh90kjl"; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz"; + sha512 = "0i6q0c347f7z5c56gi1cggjiwvdhl3p9zfsysq66gqggk3prlqildnpva900rz8f8gfc8rav8jk7m51z9dhias0z7v3rnzyjm9pzr3k"; }; }; "aggregate-error-1.0.0" = { @@ -553,6 +571,15 @@ let sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; + "amqplib-0.5.2" = { + name = "amqplib"; + packageName = "amqplib"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/amqplib/-/amqplib-0.5.2.tgz"; + sha512 = "0h54i1d01av3cd2z1hv2nkc5r8za54nmmi2j0678ly7m4w9rr6619b915lgpqapqgakscwpmrav3ni94h34gqhrm53xpjfvlarq5ncp"; + }; + }; "anchor-markdown-header-0.5.7" = { name = "anchor-markdown-header"; packageName = "anchor-markdown-header"; @@ -733,6 +760,15 @@ let sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi"; }; }; + "anymatch-2.0.0" = { + name = "anymatch"; + packageName = "anymatch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; + sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6"; + }; + }; "ap-0.1.0" = { name = "ap"; packageName = "ap"; @@ -778,13 +814,13 @@ let sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a"; }; }; - "append-tree-2.4.0" = { + "append-tree-2.4.1" = { name = "append-tree"; packageName = "append-tree"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.0.tgz"; - sha512 = "1ym9wsmz3fjv0wf675xclbnjp825cyvxp3a9x8af96yms45dbk8c79jrx5vgdii1zimcnr2pg305g9sw79k5yqah9267k71lsz5vv35"; + url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.1.tgz"; + sha512 = "2zb14nlfxs726ng8jhfpf6n9b9kw32smg2krcl0vj90dfrkcc20fm36j2zgdd49b2ln1z4jz2wvvy4qgss14zzfr3rps719h6vlyjg7"; }; }; "appendable-cli-menu-2.0.0" = { @@ -1462,13 +1498,13 @@ let sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4"; }; }; - "auto-bind-1.1.0" = { + "auto-bind-1.2.0" = { name = "auto-bind"; packageName = "auto-bind"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.1.0.tgz"; - sha1 = "93b864dc7ee01a326281775d5c75ca0a751e5961"; + url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.0.tgz"; + sha512 = "0wamaj1k757h28fyrvfam4fz8ymz84pvfcyvm3k88bs8vxq36jn9kbiqqa3s0axwi6pcmwgmpjqfsh2721a1bb5kp5dpkpdkrkfj3k7"; }; }; "aws-sdk-1.18.0" = { @@ -1480,13 +1516,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.179.0" = { + "aws-sdk-2.185.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.179.0"; + version = "2.185.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.179.0.tgz"; - sha1 = "48e07843c6ae83d6752e58547b168299f140cc11"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.185.0.tgz"; + sha1 = "a570b8cb1a083d88ed90f5f629144b1dcf6e1434"; }; }; "aws-sign-0.2.0" = { @@ -2020,15 +2056,6 @@ let sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; }; }; - "babel-runtime-6.22.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz"; - sha1 = "1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"; - }; - }; "babel-runtime-6.26.0" = { name = "babel-runtime"; packageName = "babel-runtime"; @@ -2209,15 +2236,6 @@ let sha512 = "0dhi66vsajfcm04s11xqklh5lj3abs4ncnl8h3689964aqam3ps9spmc454hz94rz3x1x5l1ad03jrba67mq9zc9vq9a1gchma581bp"; }; }; - "base64-to-uint8array-1.0.0" = { - name = "base64-to-uint8array"; - packageName = "base64-to-uint8array"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-to-uint8array/-/base64-to-uint8array-1.0.0.tgz"; - sha512 = "01a4ip2ivflpjsx4flnww5fqvdcsy2sqnjgp2cii6b2gnkkccr02vbf2y8r2wlcab4pb8x47qb3jpahca61v584bmz9xcwyqx0xdf3n"; - }; - }; "base64-url-1.2.1" = { name = "base64-url"; packageName = "base64-url"; @@ -2515,6 +2533,15 @@ let sha1 = "ae29e9382a7ba4898de9f48bb23fd338c4fbdcf8"; }; }; + "bitsyntax-0.0.4" = { + name = "bitsyntax"; + packageName = "bitsyntax"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.0.4.tgz"; + sha1 = "eb10cc6f82b8c490e3e85698f07e83d46e0cba82"; + }; + }; "bittorrent-dht-6.4.2" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; @@ -2524,13 +2551,13 @@ let sha1 = "8b40f8cee6bea87f2b34fd2ae0bd367a8b1247a6"; }; }; - "bittorrent-dht-7.8.2" = { + "bittorrent-dht-7.10.0" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "7.8.2"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.8.2.tgz"; - sha512 = "33jcwf8rh9r7m810lw75s1ij9k0bv1kjmnc24488i6nd1ri9a1p2gmci5z1xdfriyb8j7x8h1ch3aj5a1chdglwn6pbsll7cx4j6wd4"; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.10.0.tgz"; + sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; "bittorrent-tracker-7.7.0" = { @@ -2587,13 +2614,13 @@ let sha1 = "6880eddca35cfede92c4fb2724221334f989145a"; }; }; - "blake2b-wasm-1.1.4" = { + "blake2b-wasm-1.1.5" = { name = "blake2b-wasm"; packageName = "blake2b-wasm"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.4.tgz"; - sha512 = "3hgcz1c3h2hxgavmlf5r4dwk0wy2sg9y4lfs5ifj4spdlwyy3ki9i1i4hjaw0029c896d6yw424mw2j1nf4qyibkz2lbh1ws6z6rdlg"; + url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.5.tgz"; + sha512 = "2a8y5gcrrzkv35qa7s8x34m4mmb2nbincn2amxsjwfgqijnqd57hsh7id6p5y21sxfqf1ffjcfb5p8k04n3h7g81mrfvn4207my65s7"; }; }; "blob-0.0.2" = { @@ -2938,15 +2965,6 @@ let sha512 = "2ngfivxj9g7knac123y1lk3arpmmzdhfn2g4qf1n4kzpvka4vafp48zcsh2qq7c97fxw2la5q2h6m2xcq5b1cr8b45j66jx0i8vr0rz"; }; }; - "brfs-1.4.3" = { - name = "brfs"; - packageName = "brfs"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/brfs/-/brfs-1.4.3.tgz"; - sha1 = "db675d6f5e923e6df087fca5859c9090aaed3216"; - }; - }; "broadway-0.3.6" = { name = "broadway"; packageName = "broadway"; @@ -2974,13 +2992,13 @@ let sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; }; }; - "browser-pack-6.0.2" = { + "browser-pack-6.0.3" = { name = "browser-pack"; packageName = "browser-pack"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz"; - sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.3.tgz"; + sha512 = "3rbr2j80zl8099hjgsqkizp276cg4q60zjkd481fvnj66k8gmm5w0wbvvqdzpsipgaa3xxsypcr3ryjw1sk2vgzr2hw6pzwr5i933r6"; }; }; "browser-resolve-1.11.2" = { @@ -3226,6 +3244,15 @@ let sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; }; }; + "buffer-more-ints-0.0.2" = { + name = "buffer-more-ints"; + packageName = "buffer-more-ints"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz"; + sha1 = "26b3885d10fa13db7fc01aae3aab870199e0124c"; + }; + }; "buffer-xor-1.0.3" = { name = "buffer-xor"; packageName = "buffer-xor"; @@ -3631,6 +3658,15 @@ let sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; + "camelo-1.1.11" = { + name = "camelo"; + packageName = "camelo"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/camelo/-/camelo-1.1.11.tgz"; + sha512 = "39qf2hdriyb5zn5bc62wgj59whx06nmzij9yylv0mrjnivgpqg2z3ksxl035nn35lnavi1b20qi062l41xah3b3nnbw42dh6b4qk34i"; + }; + }; "capture-stack-trace-1.0.0" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; @@ -3703,15 +3739,6 @@ let sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; }; }; - "cfonts-1.1.3" = { - name = "cfonts"; - packageName = "cfonts"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cfonts/-/cfonts-1.1.3.tgz"; - sha1 = "5d9a7a6bf1a023fc2d535da7264ea90ecd9dbf48"; - }; - }; "chai-4.1.2" = { name = "chai"; packageName = "chai"; @@ -3793,15 +3820,6 @@ let sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; }; }; - "change-case-3.0.0" = { - name = "change-case"; - packageName = "change-case"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/change-case/-/change-case-3.0.0.tgz"; - sha1 = "6c9c8e35f8790870a82b6b0745be8c3cbef9b081"; - }; - }; "character-entities-1.2.1" = { name = "character-entities"; packageName = "character-entities"; @@ -3928,6 +3946,15 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; + "chokidar-2.0.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.0.tgz"; + sha512 = "01y5j8xkkzlzc4yzh4f8gbshbs6i3hb4wlz5nd48xcmm3vmawah9jj052km463v3d2vqx9kbrnxvjw2fkcbdxw0sg33ksclzlvc419s"; + }; + }; "chownr-0.0.2" = { name = "chownr"; packageName = "chownr"; @@ -4009,13 +4036,13 @@ let sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji"; }; }; - "circular-json-0.4.0" = { + "circular-json-0.5.1" = { name = "circular-json"; packageName = "circular-json"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.4.0.tgz"; - sha512 = "2iz1fwlb43dgp5bjapmlbqzanpss2r3z2db7y26drfw4nxfzbay2yjc13pxf6y3r2i5s2kbja6a05x21ra0ffmvvxcnz0h3c39pk9dl"; + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.1.tgz"; + sha512 = "1myzlq58v42dc2b1i17rcmvj7529spwcqgzc7j2q663a7xkk4nhzqk6hpw20lvp99iaq0k0zg5p0jzf19n7p0vrg45hk160ai31qf2j"; }; }; "clarinet-0.11.0" = { @@ -4027,13 +4054,13 @@ let sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719"; }; }; - "class-utils-0.3.5" = { + "class-utils-0.3.6" = { name = "class-utils"; packageName = "class-utils"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz"; - sha1 = "17e793103750f9627b2176ea34cfd1b565903c80"; + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; }; }; "clean-css-3.4.28" = { @@ -4567,6 +4594,15 @@ let sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e"; }; }; + "combine-source-map-0.8.0" = { + name = "combine-source-map"; + packageName = "combine-source-map"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz"; + sha1 = "a58d0df042c186fcf822a8e8015f5450d2d79a8b"; + }; + }; "combined-stream-0.0.7" = { name = "combined-stream"; packageName = "combined-stream"; @@ -4675,6 +4711,15 @@ let sha512 = "007wb3baahjcrv17kgxryqjlsyr3c3kl2y07p85m4ia78pba9xyjr3cgi95jjrwq8qq550s78hj06f7z0ab8ssrxk6w06afjsmxln84"; }; }; + "commander-2.13.0" = { + name = "commander"; + packageName = "commander"; + version = "2.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz"; + sha512 = "1h27ar13gbld2jk6wk84irqmyz6ya6b4dzmxb6nq8azyi48iq8pqqyq90jwzxqb3i7j167y5fpiys6v7vvjzhm8bbd8rya1kzgr4nri"; + }; + }; "commander-2.6.0" = { name = "commander"; packageName = "commander"; @@ -5062,15 +5107,6 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "constant-case-2.0.0" = { - name = "constant-case"; - packageName = "constant-case"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz"; - sha1 = "4175764d389d3fa9c8ecd29186ed6005243b6a46"; - }; - }; "constantinople-3.0.2" = { name = "constantinople"; packageName = "constantinople"; @@ -5441,6 +5477,15 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; + "cookie-signature-1.1.0" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.1.0.tgz"; + sha512 = "3h44zl7m31c7zzyyc3lxzckqyz6rmg5xydp2clpnf2vm3928garan768x7pmh1n52xnpgwdlkz78cfsy9spg93wpbg4xav0spbyqnq2"; + }; + }; "cookiejar-2.0.1" = { name = "cookiejar"; packageName = "cookiejar"; @@ -5891,6 +5936,15 @@ let sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; }; }; + "css-tree-1.0.0-alpha.27" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha.27"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.27.tgz"; + sha512 = "08x63k8gxl9wgq7lljw7q5mlhwbcifkg7f6yakqcj8wfwv3xq5vj2glhrq826pbxi4az53akc76a6c4vhqablgvipbk5qldbks2j1h4"; + }; + }; "css-tree-1.0.0-alpha25" = { name = "css-tree"; packageName = "css-tree"; @@ -5927,13 +5981,13 @@ let sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; }; }; - "csso-3.4.0" = { + "csso-3.5.0" = { name = "csso"; packageName = "csso"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-3.4.0.tgz"; - sha1 = "57b27ef553cccbf5aa964c641748641e9af113f3"; + url = "https://registry.npmjs.org/csso/-/csso-3.5.0.tgz"; + sha512 = "0rxlhy2ha4xjnw27ha5q8crvpqwydnhb4xnnsj2ba8i1r09n864ygl76lcjgnpnqp1qj5930qz8gnq76pwy6sr6hrb2gcfrzla67ljs"; }; }; "csurf-1.8.3" = { @@ -6161,15 +6215,6 @@ let sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq"; }; }; - "dat-link-resolve-1.1.1" = { - name = "dat-link-resolve"; - packageName = "dat-link-resolve"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-1.1.1.tgz"; - sha512 = "3a3rmwv687r07qnzdp4k15ng7xbbgibssjiqjvhhhrxq5mc22m34g7hi1h15rqjs3zzlajn291j3xv9af22j3fynpygky13zzvxj367"; - }; - }; "dat-link-resolve-2.1.0" = { name = "dat-link-resolve"; packageName = "dat-link-resolve"; @@ -6710,6 +6755,15 @@ let sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; }; }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; "dependency-ls-1.1.1" = { name = "dependency-ls"; packageName = "dependency-ls"; @@ -6926,13 +6980,13 @@ let sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338"; }; }; - "discovery-channel-5.4.6" = { + "discovery-channel-5.4.7" = { name = "discovery-channel"; packageName = "discovery-channel"; - version = "5.4.6"; + version = "5.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.6.tgz"; - sha1 = "1b0f25e58124507e861b6dc3ecb744366bb53cad"; + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.7.tgz"; + sha512 = "3c8npbdr7r6725kkj76h5zy72l3gd8ndb3dy4dwbapxapfzccl9f6iy0zdy3wxywcfb6cc64w4mf089v00rcr1aqcjdlvn483pnzs78"; }; }; "discovery-swarm-4.4.2" = { @@ -6989,22 +7043,22 @@ let sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673"; }; }; - "dns-packet-1.3.0" = { + "dns-packet-1.3.1" = { name = "dns-packet"; packageName = "dns-packet"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.0.tgz"; - sha512 = "0qcs9idjrq4z4gmc95kaarjl2xahwl72136h2frf1hbj1kgfcs8yjv9crfsr6iw8jyyvvvbn4hj1yfqwnvz3amrcx1mb56yklaqa8xv"; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; + sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; }; }; - "dns-socket-1.6.2" = { + "dns-socket-1.6.3" = { name = "dns-socket"; packageName = "dns-socket"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.2.tgz"; - sha512 = "0ibd2ndmlqbk96vdcimsl4w1njplh9gplvqa5f7653km79f9kqpd6d7f0f3lq1sz548lqcbjfcgcr7fc9159b4gzzk1g86kjxzxmmk6"; + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz"; + sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy"; }; }; "dns-txt-2.0.2" = { @@ -7196,15 +7250,6 @@ let sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; }; }; - "dot-case-2.1.1" = { - name = "dot-case"; - packageName = "dot-case"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz"; - sha1 = "34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"; - }; - }; "dot-prop-3.0.0" = { name = "dot-prop"; packageName = "dot-prop"; @@ -7250,13 +7295,13 @@ let sha1 = "0b078d5517937d873101452d9146737557b75e51"; }; }; - "dtrace-provider-0.8.5" = { + "dtrace-provider-0.8.6" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz"; - sha1 = "98ebba221afac46e1c39fd36858d8f9367524b92"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.6.tgz"; + sha1 = "428a223afe03425d2cd6d6347fdf40c66903563d"; }; }; "duplexer-0.1.1" = { @@ -7485,6 +7530,24 @@ let sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932"; }; }; + "emojic-1.1.14" = { + name = "emojic"; + packageName = "emojic"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/emojic/-/emojic-1.1.14.tgz"; + sha512 = "0j0wbbcyvx0qklz7xvqbv2w2n2vqzq5vhyv3jrnsvb775c0zr2bh7m3k7mh0aw6i4rbmgf8x6rw7bfvgzsh5hvlgj01w61xfml89b4z"; + }; + }; + "emojilib-2.2.12" = { + name = "emojilib"; + packageName = "emojilib"; + version = "2.2.12"; + src = fetchurl { + url = "https://registry.npmjs.org/emojilib/-/emojilib-2.2.12.tgz"; + sha512 = "2z6nk0nin1cmj81c54pxjyxgpa61d0g61sdn3swykk4j8n8mnba95m1s1cpjcr4wr96jhgyal1z4swd8pcazzp3a50msqir0vj4vcwq"; + }; + }; "emojis-list-2.1.0" = { name = "emojis-list"; packageName = "emojis-list"; @@ -7773,13 +7836,13 @@ let sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; }; }; - "es5-ext-0.10.37" = { + "es5-ext-0.10.38" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.37"; + version = "0.10.38"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz"; - sha1 = "0ee741d148b80069ba27d020393756af257defc3"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.38.tgz"; + sha512 = "0m7d1yd67hb93gsxv7790h9ayxg3pwf3vgih9v2kxqvsg073wim7jgwf3z57lksdczxnqv2d8gm4mfk4b29f6rc27a7c09vz9w348wc"; }; }; "es5class-2.3.1" = { @@ -7944,24 +8007,6 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "escodegen-0.0.28" = { - name = "escodegen"; - packageName = "escodegen"; - version = "0.0.28"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz"; - sha1 = "0e4ff1715f328775d6cab51ac44a406cd7abffd3"; - }; - }; - "escodegen-1.3.3" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; - sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; - }; - }; "escodegen-1.8.1" = { name = "escodegen"; packageName = "escodegen"; @@ -8007,6 +8052,15 @@ let sha512 = "3l1j4qy0gqa8rkwpdsmkkbqcmbx23ym8h64d1bbj5i5ds5ks0g91myldzp0y25r6b3ba9646hy4i2jiad2jmm8h68z89i2larkvyhyc"; }; }; + "eslint-4.16.0" = { + name = "eslint"; + packageName = "eslint"; + version = "4.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-4.16.0.tgz"; + sha512 = "330nda1zwh0sqsxsfmlmhbg903gz6n9n4zy870gc2k95wrg1bc7jysfyn98nk2bd8p821xszpygp1vs1i7csapxfb3q2dp1n3hxamb1"; + }; + }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { name = "eslint-plugin-no-unsafe-innerhtml"; packageName = "eslint-plugin-no-unsafe-innerhtml"; @@ -8052,15 +8106,6 @@ let sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; }; }; - "esprima-1.1.1" = { - name = "esprima"; - packageName = "esprima"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; - sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; - }; - }; "esprima-2.7.3" = { name = "esprima"; packageName = "esprima"; @@ -8115,24 +8160,6 @@ let sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163"; }; }; - "estraverse-1.3.2" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz"; - sha1 = "37c2b893ef13d723f276d878d60d8535152a6c42"; - }; - }; - "estraverse-1.5.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; - sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; - }; - }; "estraverse-1.9.3" = { name = "estraverse"; packageName = "estraverse"; @@ -8151,15 +8178,6 @@ let sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; }; }; - "esutils-1.0.0" = { - name = "esutils"; - packageName = "esutils"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; - sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; - }; - }; "esutils-2.0.2" = { name = "esutils"; packageName = "esutils"; @@ -8691,13 +8709,13 @@ let sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; }; }; - "extglob-2.0.3" = { + "extglob-2.0.4" = { name = "extglob"; packageName = "extglob"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-2.0.3.tgz"; - sha512 = "31zb5fc59ps76hnxlnrcmm3lkv4pjd3cw55h5h7r9pn1q259bs15hw0bn4gp8kn91qwabgbj0cwkx9pxp8fgsj3ljlvmfv0xijnsah3"; + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; }; }; "extract-opts-3.3.1" = { @@ -8853,13 +8871,13 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "fast-safe-stringify-1.2.2" = { + "fast-safe-stringify-1.2.3" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.2.tgz"; - sha1 = "eab31cd4dd0dbaa09f64ac6b77e7e7eb9b4a142b"; + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.3.tgz"; + sha512 = "2bhxs6r2hxpjfxj7ycbs3blbwbmq9nmwar4swzvhbiwcbmn721l8wk0ndyw9n3i1508rlhhm70a8fn9bpy8mx8f0ncqhqhh5pz175j0"; }; }; "faye-websocket-0.10.0" = { @@ -10915,15 +10933,6 @@ let sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; }; }; - "header-case-1.0.1" = { - name = "header-case"; - packageName = "header-case"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz"; - sha1 = "9535973197c144b09613cd65d317ef19963bd02d"; - }; - }; "headless-0.1.7" = { name = "headless"; packageName = "headless"; @@ -11338,31 +11347,31 @@ let sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; }; }; - "hypercore-6.11.0" = { + "hypercore-6.12.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.11.0"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.11.0.tgz"; - sha512 = "0q0972kpj73qndhwb3msk3xkfpx1zldfw1ld815kncb0lbr7mdhawjz701y230zji0lamnznrv61cmcnx2zlqjhvcyrf9fyyr93r6ds"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.0.tgz"; + sha512 = "00xsmbx8jcjzsibwwgknlpjvndb7zv6jdxik5skqnbizbdssvcwa2r5a7gd1cf7mpr2827067sxqqca9fmmknjnin2vvm16yb1pn5g8"; }; }; - "hypercore-protocol-6.5.0" = { + "hypercore-protocol-6.5.1" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.5.0.tgz"; - sha512 = "0yny0rl9fgh2hyv0clfzp6z6zb7pmmw1494h76n37gqb37awz73zclfcmad75dj60r04rlfxr9syvgim7zlpnb0qvcqlcpyfwnv65l0"; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.5.1.tgz"; + sha512 = "2xy5g8l7wws0bxrvj3pv90qsyb0g12zs8ahhcmd732jdq5y9f1j5jvywp2bvdcwfd0x4kh7hwqz7ma1hir8sh30nhbi5w6w4ig0qqyl"; }; }; - "hyperdrive-9.12.0" = { + "hyperdrive-9.12.1" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "9.12.0"; + version = "9.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.0.tgz"; - sha512 = "285nxd3xfdr51r8av9d7dal8hqa3lfrac1m46gn9b73ljwivlhhsxpbrqyhdf80v7bnmw8vpy61x77gm8cfmwv5z8pffmmnla2p8l5y"; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.1.tgz"; + sha512 = "12z4ajhk7h587vm8vdm766xy59fwv9whbnmhc4a8ns51gx3zavgspk48fywffk3p8kk16pnam3lk8zx17daxb281lll1qwa1mw73061"; }; }; "hyperdrive-http-4.2.2" = { @@ -12220,6 +12229,15 @@ let sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; }; }; + "is-glob-4.0.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz"; + sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; + }; + }; "is-hexadecimal-1.0.1" = { name = "is-hexadecimal"; packageName = "is-hexadecimal"; @@ -12238,15 +12256,6 @@ let sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; }; }; - "is-lower-case-1.1.3" = { - name = "is-lower-case"; - packageName = "is-lower-case"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz"; - sha1 = "7e147be4768dc466db3bfb21cc60b31e6ad69393"; - }; - }; "is-my-json-valid-2.17.1" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; @@ -12589,15 +12598,6 @@ let sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; }; }; - "is-upper-case-1.1.2" = { - name = "is-upper-case"; - packageName = "is-upper-case"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz"; - sha1 = "8d0b1fa7e7933a1e58483600ec7d9661cbaf756f"; - }; - }; "is-url-1.2.2" = { name = "is-url"; packageName = "is-url"; @@ -12769,6 +12769,15 @@ let sha1 = "a969a80a1fbff6b78f28776594d7bc2bdfab6aad"; }; }; + "iterate-object-1.3.2" = { + name = "iterate-object"; + packageName = "iterate-object"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iterate-object/-/iterate-object-1.3.2.tgz"; + sha1 = "24ec15affa5d0039e8839695a21c2cae1f45b66b"; + }; + }; "iterators-0.1.0" = { name = "iterators"; packageName = "iterators"; @@ -13922,13 +13931,13 @@ let sha1 = "03ca7ba2d150d4267773f74e57558d1053d2bee3"; }; }; - "livereload-js-2.2.2" = { + "livereload-js-2.3.0" = { name = "livereload-js"; packageName = "livereload-js"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/livereload-js/-/livereload-js-2.2.2.tgz"; - sha1 = "6c87257e648ab475bc24ea257457edcc1f8d0bc2"; + url = "https://registry.npmjs.org/livereload-js/-/livereload-js-2.3.0.tgz"; + sha512 = "0r82qh90jnyg6hlqn2yni36q942y4qn6rc0rydmbsy7x1lr00a0pddw2lg8xixcjh6wnrsfb5q76m51fac7vanrz0cawsw6azy78m4g"; }; }; "load-json-file-1.1.0" = { @@ -13949,13 +13958,13 @@ let sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; }; }; - "load-json-file-3.0.0" = { + "load-json-file-4.0.0" = { name = "load-json-file"; packageName = "load-json-file"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-3.0.0.tgz"; - sha1 = "7eb3735d983a7ed2262ade4ff769af5369c5c440"; + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; }; }; "loader-runner-2.3.0" = { @@ -14633,13 +14642,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-2.4.1" = { + "log4js-2.5.2" = { name = "log4js"; packageName = "log4js"; - version = "2.4.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-2.4.1.tgz"; - sha512 = "3xd40iy8j9s89j8hy5jr11v377rfcv0293p986r9i4rq0syypl1vv7rk8al99pqkhi3wdf2hs5ik9xg7fgh53cdzazcmz0lqm7lb20s"; + url = "https://registry.npmjs.org/log4js/-/log4js-2.5.2.tgz"; + sha512 = "3cr4zy75cf74ajn55xnidbz0m4848yyjyc2zrhlyksjdi0hsp0skwkq8ipgpahwfz1b7zlr9zg1blapz0nsn3h8kmz5w2cz036n2rij"; }; }; "loggly-1.1.1" = { @@ -14750,15 +14759,6 @@ let sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; }; }; - "lower-case-first-1.0.2" = { - name = "lower-case-first"; - packageName = "lower-case-first"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz"; - sha1 = "e5da7c26f29a7073be02d52bac9980e5922adfa1"; - }; - }; "lowercase-keys-1.0.0" = { name = "lowercase-keys"; packageName = "lowercase-keys"; @@ -14885,6 +14885,15 @@ let sha1 = "79a30e932e216cba163541ee37a3607c12cd7281"; }; }; + "lynx-0.2.0" = { + name = "lynx"; + packageName = "lynx"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lynx/-/lynx-0.2.0.tgz"; + sha1 = "79e6674530da4183e87953bd686171e070da50b9"; + }; + }; "macos-release-1.1.0" = { name = "macos-release"; packageName = "macos-release"; @@ -15299,6 +15308,15 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; + "mersenne-0.0.4" = { + name = "mersenne"; + packageName = "mersenne"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mersenne/-/mersenne-0.0.4.tgz"; + sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; + }; + }; "method-override-2.3.10" = { name = "method-override"; packageName = "method-override"; @@ -15344,13 +15362,13 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "micro-9.0.2" = { + "micro-9.1.0" = { name = "micro"; packageName = "micro"; - version = "9.0.2"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/micro/-/micro-9.0.2.tgz"; - sha512 = "1d0ybv5avz4np56a916wv9zwc42gn3y68hibiwg8ps0n23hp3x9zkb631mny9jn2i7imybhzh6fpic1hr6q08lwawf4wy03c4nl680n"; + url = "https://registry.npmjs.org/micro/-/micro-9.1.0.tgz"; + sha512 = "232sjz2wv3xlfz5wf20jihj8avic507avydzwcf4d8zgy07ha9x3pqc6xkw0y8bjk8f8w30fmih38gsdvz7ph92c4kj4cxxfinph2nh"; }; }; "micro-compress-1.0.0" = { @@ -16019,6 +16037,15 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; + }; + }; "ms-rest-1.15.7" = { name = "ms-rest"; packageName = "ms-rest"; @@ -16100,13 +16127,13 @@ let sha1 = "abf022fc866727055a9e0c2bc98097f5ebad97a2"; }; }; - "multicast-dns-6.2.1" = { + "multicast-dns-6.2.2" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz"; - sha512 = "3gm760icxiv0bkil78dgsjkss4vwg3ya76jl3v8a5fa86wdv0ksvi1n7lnzisk4x4sa8chxnfxasyfpgay45ilaykqz2zbc8xrgypdr"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.2.tgz"; + sha512 = "06b9ps5a1ymag21szz55z4xzs2ncp0frcqsaldnggmz0m5ijhjv8f553cpkp9zkm37av1pm2y8pn70jbfzk888n1hap6i321babhcy5"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -17483,24 +17510,6 @@ let sha512 = "19310wpjhfybr8gslg93qybbsrf3fjlmdgsgvn7d9yim1nmpcgjn5az280w4p8spvhq1djly7naa9434166gcmbavv0xirg75gmcr5j"; }; }; - "object-inspect-0.4.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"; - sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec"; - }; - }; - "object-keys-0.4.0" = { - name = "object-keys"; - packageName = "object-keys"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"; - sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336"; - }; - }; "object-keys-1.0.11" = { name = "object-keys"; packageName = "object-keys"; @@ -17789,6 +17798,15 @@ let sha512 = "2k8g3x11xbm64r7bbyad08cjv27vaparkigq11w2v8kg8h73k2rzdr3q6f5i2klidgpaq9rbhfv45rf9dkqqv3d8vsbvw4c5knnbww8"; }; }; + "opn-5.2.0" = { + name = "opn"; + packageName = "opn"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.2.0.tgz"; + sha512 = "12iyalgghs3dj0pfb7rxa013x946169yfsjfd15fsfrx5kv80z2qh082x7v7d91hh7bf9vxcm4wqmyyj9ckk3gnvc7mw77j6fkwdpr5"; + }; + }; "optimist-0.2.8" = { name = "optimist"; packageName = "optimist"; @@ -18257,15 +18275,6 @@ let sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; }; }; - "parse-json-3.0.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz"; - sha1 = "fa6f47b18e23826ead32f263e744d0e1e847fb13"; - }; - }; "parse-json-4.0.0" = { name = "parse-json"; packageName = "parse-json"; @@ -18410,15 +18419,6 @@ let sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; }; }; - "pascal-case-2.0.1" = { - name = "pascal-case"; - packageName = "pascal-case"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz"; - sha1 = "2d578d3455f660da65eca18ef95b4e0de912761e"; - }; - }; "pascalcase-0.1.1" = { name = "pascalcase"; packageName = "pascalcase"; @@ -18545,15 +18545,6 @@ let sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; }; }; - "path-case-2.1.1" = { - name = "path-case"; - packageName = "path-case"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz"; - sha1 = "94b8037c372d3fe2906e465bb45e25d226e8eea5"; - }; - }; "path-dirname-1.0.2" = { name = "path-dirname"; packageName = "path-dirname"; @@ -19410,22 +19401,13 @@ let sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; }; }; - "protocol-buffers-3.2.1" = { - name = "protocol-buffers"; - packageName = "protocol-buffers"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers/-/protocol-buffers-3.2.1.tgz"; - sha1 = "37258e17e24a082f06ebb17731e92851d1c76889"; - }; - }; - "protocol-buffers-schema-3.3.2" = { - name = "protocol-buffers-schema"; - packageName = "protocol-buffers-schema"; - version = "3.3.2"; + "protocol-buffers-encodings-1.1.0" = { + name = "protocol-buffers-encodings"; + packageName = "protocol-buffers-encodings"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz"; - sha512 = "3rvq2xsb9y9vfy8vgf6ja08362bjcg132kxcwcfdik1j6j17dvlk535agpwiqzj47g1d7shcwq5h6zk5jy1ny25n4z6bzh1rfkv5mjx"; + url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.0.tgz"; + sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a"; }; }; "proxy-addr-1.0.10" = { @@ -19680,13 +19662,13 @@ let sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5"; }; }; - "pull-pushable-2.1.1" = { + "pull-pushable-2.1.2" = { name = "pull-pushable"; packageName = "pull-pushable"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.1.1.tgz"; - sha1 = "86666abbe3f5402f1f7ead03eefd69b785eca5b8"; + url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.1.2.tgz"; + sha1 = "3fe15b8f7eec89f3972d238bc04890c9405a6dbb"; }; }; "pull-stream-3.6.1" = { @@ -19734,13 +19716,13 @@ let sha512 = "21jb2lq6ajsmcqs5j3yq4gpfzkpn9zfy514dmwd0rlh6r8c6iknng19c3kmpb607rk2xap7cw467qz5di30zki40phjbdmg6fk35ip8"; }; }; - "pumpify-1.3.6" = { + "pumpify-1.4.0" = { name = "pumpify"; packageName = "pumpify"; - version = "1.3.6"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/pumpify/-/pumpify-1.3.6.tgz"; - sha512 = "3yz34ap8m1c1whb10b5n6855yb51w96rnanvixfm8kr1iszwi3xqywzx0dbf0pizylw1s66v8ndqw8qf0zza4lm5w6w5knyrc0wdsh6"; + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz"; + sha512 = "1h37biy199n445y10vpyiswwcxv8zigfqp0b1xwgbyjq51f2dhjn1pcggjc4j5ccbd64l1ivfi0bqinx4m5clcawvwggy7jv93qsjfs"; }; }; "punycode-1.3.2" = { @@ -19995,31 +19977,22 @@ let sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "quick-format-unescaped-1.1.1" = { + "quick-format-unescaped-1.1.2" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.1.tgz"; - sha1 = "e77555ef3e66e105d4039e13ef79201284fee916"; - }; - }; - "quote-stream-0.0.0" = { - name = "quote-stream"; - packageName = "quote-stream"; - version = "0.0.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/quote-stream/-/quote-stream-0.0.0.tgz"; - sha1 = "cde29e94c409b16e19dc7098b89b6658f9721d3b"; + url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.2.tgz"; + sha1 = "0ca581de3174becef25ac3c2e8956342381db698"; }; }; - "quote-stream-1.0.2" = { - name = "quote-stream"; - packageName = "quote-stream"; - version = "1.0.2"; + "r-json-1.2.8" = { + name = "r-json"; + packageName = "r-json"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz"; - sha1 = "84963f8c9c26b942e153feeb53aae74652b7e0b2"; + url = "https://registry.npmjs.org/r-json/-/r-json-1.2.8.tgz"; + sha1 = "7440560cc1edf00b9d8d94fa30bcad7dde94eae2"; }; }; "rai-0.1.12" = { @@ -20184,13 +20157,13 @@ let sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; }; }; - "raw-socket-1.5.1" = { + "raw-socket-1.5.2" = { name = "raw-socket"; packageName = "raw-socket"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz"; - sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528"; + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.2.tgz"; + sha512 = "0afwhc6rx359xqdsjiyxdlj46kb8mq4lkwy9fhmgszkp8cai9pk8927vxvg4gpg522clwx3dv1xsbnx745pip7crbjdb7kn2i8p2iqy"; }; }; "rc-0.4.0" = { @@ -20202,13 +20175,13 @@ let sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; - "rc-1.2.3" = { + "rc-1.2.4" = { name = "rc"; packageName = "rc"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.3.tgz"; - sha1 = "51575a900f8dd68381c710b4712c2154c3e2035b"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; + sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; }; }; "rc-config-loader-2.0.1" = { @@ -20243,7 +20216,7 @@ let packageName = "read-all-stream"; version = "3.1.0"; src = fetchurl { - url = "http://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; + url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; @@ -20292,6 +20265,15 @@ let sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; }; }; + "read-pkg-3.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + }; "read-pkg-up-1.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -20526,6 +20508,15 @@ let sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; }; }; + "regex-escape-3.4.8" = { + name = "regex-escape"; + packageName = "regex-escape"; + version = "3.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-escape/-/regex-escape-3.4.8.tgz"; + sha512 = "15ylzlxx4y88jldg7cgwv0dmw3ljpq27f9qf17d3g76dqh6ir1ig7dzvqv9nqpr3da1yd2r5ay8jqa6yk7ni5fbbrzgkhf3yha1av8c"; + }; + }; "regex-not-1.0.0" = { name = "regex-not"; packageName = "regex-not"; @@ -20769,13 +20760,13 @@ let sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; }; }; - "requestretry-1.12.2" = { + "requestretry-1.13.0" = { name = "requestretry"; packageName = "requestretry"; - version = "1.12.2"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/requestretry/-/requestretry-1.12.2.tgz"; - sha512 = "1gibp5f4n62642gyanvvyyskhzw5snx22d5wgy1ldcydbb605m83j863fb85jjyji2simmp9dy8b8rxm1axyvpawvnb5fm6i0gjfdn0"; + url = "https://registry.npmjs.org/requestretry/-/requestretry-1.13.0.tgz"; + sha512 = "2d6rk1gry4jlbd4i3ghm6vn9vjcjwsyb02w9f4jc5ximih9niq4javazp9hbm658zp2fz2zm8xy1dp2rxqv2c84301p0hg7rfl7ss1f"; }; }; "require-directory-2.1.1" = { @@ -21138,13 +21129,13 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "rusha-0.8.11" = { + "rusha-0.8.12" = { name = "rusha"; packageName = "rusha"; - version = "0.8.11"; + version = "0.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.11.tgz"; - sha1 = "caa8963b1dbfd229d90626dd3f2a784430d6058d"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.12.tgz"; + sha1 = "5d838ce1fce8b145674ee771eaad5bcb2575e64b"; }; }; "rx-2.5.3" = { @@ -21237,13 +21228,13 @@ let sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; }; }; - "sanitize-html-1.16.3" = { + "sanitize-html-1.17.0" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.16.3"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.16.3.tgz"; - sha512 = "35k1grf7gik1bf6rrxjzsmfdqd5if41gw40hrn44awhzshd3izirkxg734gfrrliwwd7qa4z83l3fg5nq6lgjrm0cxx6z0cg4d0k42y"; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.17.0.tgz"; + sha512 = "1gnj506vfw53kv0d0y0v2cg4694lyq7fbcbpjllzmls3z3b8pdrh40nw3pp70bfs851c8sklh3f4zifaznd02jkbn62z089x7kbmgg6"; }; }; "sax-0.3.5" = { @@ -21399,6 +21390,15 @@ let sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; }; }; + "semver-5.5.0" = { + name = "semver"; + packageName = "semver"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; + }; + }; "semver-diff-2.1.0" = { name = "semver-diff"; packageName = "semver-diff"; @@ -21516,15 +21516,6 @@ let sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j"; }; }; - "sentence-case-2.1.1" = { - name = "sentence-case"; - packageName = "sentence-case"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz"; - sha1 = "1f6e2dda39c168bf92d13f86d4a918933f667ed4"; - }; - }; "sentiment-2.1.0" = { name = "sentiment"; packageName = "sentiment"; @@ -21741,15 +21732,6 @@ let sha1 = "5909e874ba77106d73ac414cfec1ffca87d97060"; }; }; - "shallow-copy-0.0.1" = { - name = "shallow-copy"; - packageName = "shallow-copy"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"; - sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; - }; - }; "shasum-1.0.2" = { name = "shasum"; packageName = "shasum"; @@ -22164,15 +22146,6 @@ let sha1 = "d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"; }; }; - "snake-case-2.1.0" = { - name = "snake-case"; - packageName = "snake-case"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz"; - sha1 = "41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"; - }; - }; "snapdragon-0.8.1" = { name = "snapdragon"; packageName = "snapdragon"; @@ -22236,13 +22209,13 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "snyk-1.67.0" = { + "snyk-1.69.1" = { name = "snyk"; packageName = "snyk"; - version = "1.67.0"; + version = "1.69.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.67.0.tgz"; - sha1 = "e81f8ab29c80862fb317f196069924a65d1527b0"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.69.1.tgz"; + sha1 = "48f65d6b679c566c92fcfd2278cd16746909660e"; }; }; "snyk-config-1.0.1" = { @@ -22317,13 +22290,13 @@ let sha1 = "b1a26c8aef529c61604aca382111e535d511b763"; }; }; - "snyk-python-plugin-1.4.1" = { + "snyk-python-plugin-1.5.3" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.4.1"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.4.1.tgz"; - sha512 = "0j8raq38cjnapa9dbfdmndkl9jm1wh4wdf8h6ahx53p233fiyhlp9sf5zdc2k7sakixsqaic4241ql6r9j33ql0nfgnx67869kjfwzs"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.3.tgz"; + sha512 = "1yln7fd9x5zayvnq5hrvh44k9f37vnpirvw6gk87aq560kslsq4p2hknq02iq6az58wbc6r69g5rrszmv689c0ky3wjbmb2hmc9q7c1"; }; }; "snyk-recursive-readdir-2.0.0" = { @@ -23019,15 +22992,6 @@ let sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; }; }; - "static-eval-0.2.4" = { - name = "static-eval"; - packageName = "static-eval"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/static-eval/-/static-eval-0.2.4.tgz"; - sha1 = "b7d34d838937b969f9641ca07d48f8ede263ea7b"; - }; - }; "static-extend-0.1.2" = { name = "static-extend"; packageName = "static-extend"; @@ -23037,13 +23001,13 @@ let sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; }; }; - "static-module-1.5.0" = { - name = "static-module"; - packageName = "static-module"; - version = "1.5.0"; + "statsd-parser-0.0.4" = { + name = "statsd-parser"; + packageName = "statsd-parser"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/static-module/-/static-module-1.5.0.tgz"; - sha1 = "27da9883c41a8cd09236f842f0c1ebc6edf63d86"; + url = "https://registry.npmjs.org/statsd-parser/-/statsd-parser-0.0.4.tgz"; + sha1 = "cbd243953cc42effd548b5d22388ed689ec639bd"; }; }; "status-logger-3.1.1" = { @@ -23163,13 +23127,13 @@ let sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; }; }; - "stream-http-2.7.2" = { + "stream-http-2.8.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.7.2"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz"; - sha512 = "09n1hj53jy075fnbsaaiknry7in0l4yarh912abwgvk4hwl33lvn8wrfw891zg5bkfa7sxlmd5yz3xxd4dmcln19bnkahyvd87r6k3k"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz"; + sha512 = "2ghzil78wsr29z8p1883i0vwx9gpsspha4wvdbpvqzbknrfiavwis010i5a7vy0xx8n486f6kwmjxsk3mg1w4bjy4whvizriz28b4xi"; }; }; "stream-parser-0.3.1" = { @@ -23289,6 +23253,15 @@ let sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }; }; + "strftime-0.10.0" = { + name = "strftime"; + packageName = "strftime"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strftime/-/strftime-0.10.0.tgz"; + sha1 = "b3f0fa419295202a5a289f6d6be9f4909a617193"; + }; + }; "string-1.6.1" = { name = "string"; packageName = "string"; @@ -23730,15 +23703,6 @@ let sha512 = "04q31rfgx0r6jgs2r1k6kmzab1vw3qrikiv8wsl86rxll77vdalrag7r4ypww3qp6v8k3avsjc0jxd3ga45fb5f51akm30a9b100ba7"; }; }; - "swap-case-1.1.2" = { - name = "swap-case"; - packageName = "swap-case"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz"; - sha1 = "c39203a4587385fad3c850a0bd1bcafa081974e3"; - }; - }; "symbol-observable-1.0.1" = { name = "symbol-observable"; packageName = "symbol-observable"; @@ -23866,13 +23830,13 @@ let sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5"; }; }; - "tar-4.2.0" = { + "tar-4.3.0" = { name = "tar"; packageName = "tar"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.2.0.tgz"; - sha512 = "2gxmbyhp1fl504kj9lkj0p7fx6z7ixvnjkvww945i6dbhc76lci537p5jpw1g64w5yj2npcyfspbg2dfzpcvbmn0a55z16yi670pkpi"; + url = "https://registry.npmjs.org/tar/-/tar-4.3.0.tgz"; + sha512 = "1844acixnz54bqf6q85avzdgq39i30d6gridz084iff0f3fh670wag8gs72k8dhbvmhxs2czlax99bfwypyfxbhrq3w80xb2kl5gbjd"; }; }; "tar-fs-1.16.0" = { @@ -24082,15 +24046,6 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; - "through2-0.4.2" = { - name = "through2"; - packageName = "through2"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz"; - sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b"; - }; - }; "through2-0.6.5" = { name = "through2"; packageName = "through2"; @@ -24244,15 +24199,6 @@ let sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }; }; - "title-case-2.1.1" = { - name = "title-case"; - packageName = "title-case"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz"; - sha1 = "3e127216da58d2bc5becf137ab91dae3a7cd8faa"; - }; - }; "titleize-1.0.0" = { name = "titleize"; packageName = "titleize"; @@ -24631,13 +24577,13 @@ let sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28"; }; }; - "tslib-1.8.1" = { + "tslib-1.9.0" = { name = "tslib"; packageName = "tslib"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.8.1.tgz"; - sha1 = "6946af2d1d651a7b1863b531d6e5afa41aa44eac"; + url = "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz"; + sha512 = "2nlmx4clxs0pqc810crp8j98gpvlvbbc5bw8mx4sjx9ywh89s5kq87n5zhc5xc1scgk49p9x7dw37d158qi46al0q9b54jldcdqdykz"; }; }; "tsscmp-1.0.5" = { @@ -24748,13 +24694,13 @@ let sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; }; }; - "type-detect-4.0.5" = { + "type-detect-4.0.7" = { name = "type-detect"; packageName = "type-detect"; - version = "4.0.5"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.5.tgz"; - sha512 = "08z0fl5f7kx0fhjbj75cvshf4j5j3zzk04766g04rlwcjqr2i3z84qla0ci1h2iv014qkmsh9z7vbvd6ncr04bf1c36cl151f8jzlip"; + url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz"; + sha512 = "06b3944s70gv2pdbdkqpxp88izg727825j0lpdl0pdgs6p6nvpkzb034lycqin3a3nydd0jaafd86a991c78pabrqbd6m8cj3p7a671"; }; }; "type-is-1.5.7" = { @@ -24856,6 +24802,15 @@ let sha512 = "39ac4xrr9v9ya7rbn5cz8dss5j3s36yhpj9qrhfxxqzgy1vljns0qfyv7d76lqgdgdbfbrd91kb5x7jlg0fw2r4f3kml0v8xmv545xr"; }; }; + "uc-first-array-1.1.8" = { + name = "uc-first-array"; + packageName = "uc-first-array"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/uc-first-array/-/uc-first-array-1.1.8.tgz"; + sha512 = "3gmz15f5f5yn43v5gv1039pkhd3wwwjfd9jd4f501qz01bdlxj5f2vkg4ddy0lv4h7902n2hgw2vdlmc4a578hsr2bij1xzq5pjfc1d"; + }; + }; "uc.micro-1.0.3" = { name = "uc.micro"; packageName = "uc.micro"; @@ -24865,6 +24820,15 @@ let sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; }; }; + "ucfirst-1.0.0" = { + name = "ucfirst"; + packageName = "ucfirst"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ucfirst/-/ucfirst-1.0.0.tgz"; + sha1 = "4e105b6448d05e264ecec435e0b919363c5f2f2f"; + }; + }; "uglify-js-1.2.5" = { name = "uglify-js"; packageName = "uglify-js"; @@ -24919,13 +24883,13 @@ let sha512 = "3apvpzjbs9vds18x8pxb8ysn94658xnajl5zfagr23xpbfhgbmlmajm0lnmz9h4jk99snzf51vcc1r0l0g4gmbdzcn574vvvzy3dxrv"; }; }; - "uglify-js-3.3.5" = { + "uglify-js-3.3.8" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.5"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.5.tgz"; - sha512 = "2p95asc8ny3p8js91asggdsb396x2hkllc76gpvf3nqrw2al85p67f4v1grlnckhjwiqj7vzcy197fq2axh37mjyq4gabq193dcrrk5"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.8.tgz"; + sha512 = "1vxvyq08n6jidg18kiph7m0bjzr4v1dh188b7zgj60mkv4x1qkqrgc8756drldaj3awmn71mwsxja0zhvdm8nqqw5finrajv8dc0j2z"; }; }; "uglify-to-browserify-1.0.2" = { @@ -25063,6 +25027,15 @@ let sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f"; }; }; + "undefsafe-2.0.1" = { + name = "undefsafe"; + packageName = "undefsafe"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.1.tgz"; + sha1 = "03b2f2a16c94556e14b2edef326cd66aaf82707a"; + }; + }; "underscore-1.2.1" = { name = "underscore"; packageName = "underscore"; @@ -25423,15 +25396,6 @@ let sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; }; }; - "upper-case-first-1.1.2" = { - name = "upper-case-first"; - packageName = "upper-case-first"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz"; - sha1 = "5d79bedcff14419518fd2edb0a0507c9b6859115"; - }; - }; "uri-js-3.0.2" = { name = "uri-js"; packageName = "uri-js"; @@ -25684,6 +25648,15 @@ let sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; }; }; + "uuid-3.2.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; + sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; + }; + }; "uws-0.14.5" = { name = "uws"; packageName = "uws"; @@ -26314,15 +26287,6 @@ let sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; }; }; - "window-size-0.3.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.3.0.tgz"; - sha1 = "b8f0b66e325d22160751e496337e44b45b727546"; - }; - }; "windows-no-runnable-0.0.6" = { name = "windows-no-runnable"; packageName = "windows-no-runnable"; @@ -26846,13 +26810,13 @@ let sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; }; }; - "xmlhttprequest-ssl-1.5.4" = { + "xmlhttprequest-ssl-1.5.5" = { name = "xmlhttprequest-ssl"; packageName = "xmlhttprequest-ssl"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz"; - sha1 = "04f560915724b389088715cc0ed7813e9677bf57"; + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz"; + sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e"; }; }; "xoauth2-0.1.8" = { @@ -26918,15 +26882,6 @@ let sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; }; }; - "xtend-2.1.2" = { - name = "xtend"; - packageName = "xtend"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"; - sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"; - }; - }; "xtend-3.0.0" = { name = "xtend"; packageName = "xtend"; @@ -26990,13 +26945,13 @@ let sha512 = "1vn6jsqrhybxddyhmvkh0d43n2lk1z8081glfq80zpjfs4xgwpk0mmgdiry9zgsihmv9a2qidmp5hhyqqq8mzzkr037wla0qd1nk80f"; }; }; - "yargs-10.1.1" = { + "yargs-10.1.2" = { name = "yargs"; packageName = "yargs"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-10.1.1.tgz"; - sha512 = "25hbaxlg6lk0q1aj9ssggl2wni5jadnl657nv85vmkm9j8bk3mfvx1d040fxqq3m3d79zc2h84yxqw4kv4mzzik84svf2axfva4pr7f"; + url = "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz"; + sha512 = "25gvc8vjalpbv69v0frmh10x203dsnl0jrnx8c2mww3qrxl69kms5ppzry3lp51lgaby524hc6qa80kgrz0zcdvas8flq26l33aix4a"; }; }; "yargs-3.10.0" = { @@ -27275,7 +27230,7 @@ in sources."chalk-1.1.3" sources."chmodr-1.0.2" sources."colors-1.1.2" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-js-2.5.3" @@ -27391,7 +27346,7 @@ in sources."chromium-pickle-js-0.2.0" sources."co-4.6.0" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { @@ -27470,7 +27425,7 @@ in sources."traverse-0.3.9" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."verror-1.10.0" sources."wrappy-1.0.2" ]; @@ -27493,8 +27448,9 @@ in }; dependencies = [ sources."@types/form-data-2.2.1" - sources."@types/node-8.5.8" - sources."@types/request-2.0.9" + sources."@types/node-8.5.9" + sources."@types/request-2.0.12" + sources."@types/tough-cookie-2.3.2" sources."@types/uuid-3.4.3" sources."JSV-4.0.2" sources."adal-node-0.1.21" @@ -27835,7 +27791,7 @@ in sources."boom-2.10.1" sources."caseless-0.11.0" sources."chalk-1.1.3" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."cryptiles-2.0.5" sources."extend-3.0.1" sources."form-data-1.0.1" @@ -27889,7 +27845,7 @@ in sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."utile-0.2.1" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."validator-5.2.0" sources."verror-1.10.0" sources."wcwidth-1.0.1" @@ -28024,7 +27980,7 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."rimraf-2.6.2" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" @@ -28055,10 +28011,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "15.0.0"; + version = "15.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-15.0.0.tgz"; - sha512 = "17abx33xjyyd4ilaf2lsbq250gkc53622hqh4r65acmjhdp8i5g8jr5rm7s9shq8r5spby33h0lfl8caxamsy50rlaagjbq767p2i3l"; + url = "https://registry.npmjs.org/browserify/-/browserify-15.2.0.tgz"; + sha512 = "353sai3zpq5rmqrw5xqkmvxpm866zpv2kiqmp90qp506vij6zvdjrk1zhlpvwmdvsyfjm07q3z2gk5z8ndx2mg55x134pmnz4a34xi0"; }; dependencies = [ sources."@browserify/acorn5-object-spread-5.0.1" @@ -28075,7 +28031,7 @@ in sources."bn.js-4.11.8" sources."brace-expansion-1.1.8" sources."brorand-1.1.0" - sources."browser-pack-6.0.2" + sources."browser-pack-6.0.3" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -28092,7 +28048,7 @@ in sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.1" sources."cipher-base-1.0.4" - sources."combine-source-map-0.7.2" + sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -28137,7 +28093,11 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" - sources."insert-module-globals-7.0.1" + (sources."insert-module-globals-7.0.1" // { + dependencies = [ + sources."combine-source-map-0.7.2" + ]; + }) sources."is-buffer-1.1.6" sources."isarray-1.0.0" sources."json-stable-stringify-0.0.1" @@ -28155,7 +28115,8 @@ in sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" - sources."minimist-1.2.0" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" (sources."module-deps-5.0.1" // { dependencies = [ sources."acorn-5.3.0" @@ -28191,10 +28152,14 @@ in sources."source-map-0.5.7" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.7.2" + sources."stream-http-2.8.0" sources."stream-splicer-2.0.0" sources."string_decoder-1.0.3" - sources."subarg-1.0.0" + (sources."subarg-1.0.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."syntax-error-1.3.0" sources."through-2.3.8" sources."through2-2.0.3" @@ -28278,7 +28243,7 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-0.0.7" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."compact2string-1.4.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" @@ -28473,11 +28438,11 @@ in sources."router-0.6.2" sources."run-parallel-1.1.6" sources."run-series-1.1.4" - sources."rusha-0.8.11" + sources."rusha-0.8.12" sources."rx-2.5.3" sources."safe-buffer-5.1.1" sources."sax-1.2.4" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" sources."simple-get-2.7.0" @@ -28564,6 +28529,26 @@ in production = true; bypassCache = false; }; + clean-css = nodeEnv.buildNodePackage { + name = "clean-css"; + packageName = "clean-css"; + version = "4.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz"; + sha1 = "35cee8ae7687a49b98034f70de00c4edd3826301"; + }; + dependencies = [ + sources."source-map-0.5.7" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A well-tested CSS minifier"; + homepage = https://github.com/jakubpawlowicz/clean-css; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; @@ -28584,84 +28569,49 @@ in coinmon = nodeEnv.buildNodePackage { name = "coinmon"; packageName = "coinmon"; - version = "0.0.9"; + version = "0.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.9.tgz"; - sha512 = "3hzlrghgwyf65qhz9hm1w3np5djhjjl8f1v9bpa7bmqi3593q3i0589c6lbd493i802ai74pvdkx3zp6qb6r224nyz2jx80kqi5bvp6"; + url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.13.tgz"; + sha512 = "2q865h8b8fks806q7qhdm728xhcw684xv37fmlphqv0rdy5y7zfj9nffcnzjmlg5b2qgfrybdpp25q27pm26c4mnxl6lq7jdk7hr6f5"; }; dependencies = [ - sources."ansi-regex-1.1.1" + sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."axios-0.17.1" - sources."babel-runtime-6.22.0" - sources."camel-case-3.0.0" - (sources."cfonts-1.1.3" // { - dependencies = [ - sources."commander-2.9.0" - ]; - }) - sources."chalk-1.0.0" - sources."change-case-3.0.0" + sources."camelo-1.1.11" + sources."chalk-1.1.3" sources."cli-cursor-2.1.0" sources."cli-spinners-1.1.0" - (sources."cli-table2-0.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) + sources."cli-table2-0.2.0" sources."code-point-at-1.1.0" sources."colors-1.1.2" - sources."commander-2.12.2" - sources."constant-case-2.0.0" - sources."core-js-2.5.3" + sources."commander-2.13.0" sources."debug-3.1.0" - sources."dot-case-2.1.1" + sources."emojic-1.1.14" + sources."emojilib-2.2.12" sources."escape-string-regexp-1.0.5" sources."follow-redirects-1.3.0" - sources."get-stdin-4.0.1" - sources."graceful-readlink-1.0.1" - sources."has-ansi-1.0.3" - sources."header-case-1.0.1" + sources."has-ansi-2.0.0" sources."humanize-plus-1.8.2" sources."is-buffer-1.1.6" sources."is-fullwidth-code-point-1.0.0" - sources."is-lower-case-1.1.3" - sources."is-upper-case-1.1.2" + sources."iterate-object-1.3.2" sources."lodash-3.10.1" sources."log-symbols-1.0.2" - sources."lower-case-1.1.4" - sources."lower-case-first-1.0.2" sources."mimic-fn-1.1.0" sources."ms-2.0.0" - sources."no-case-2.3.2" sources."number-is-nan-1.0.1" sources."onetime-2.0.1" - (sources."ora-1.3.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."chalk-1.1.3" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - sources."param-case-2.1.1" - sources."pascal-case-2.0.1" - sources."path-case-2.1.1" - sources."regenerator-runtime-0.10.5" + sources."ora-1.3.0" + sources."r-json-1.2.8" + sources."regex-escape-3.4.8" sources."restore-cursor-2.0.0" - sources."sentence-case-2.1.1" sources."signal-exit-3.0.2" - sources."snake-case-2.1.0" sources."string-width-1.0.2" - sources."strip-ansi-2.0.1" - sources."supports-color-1.3.1" - sources."swap-case-1.1.2" - sources."title-case-2.1.1" - sources."upper-case-1.1.3" - sources."upper-case-first-1.1.2" - sources."window-size-0.3.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."uc-first-array-1.1.8" + sources."ucfirst-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -28672,6 +28622,40 @@ in production = true; bypassCache = false; }; + configurable-http-proxy = nodeEnv.buildNodePackage { + name = "configurable-http-proxy"; + packageName = "configurable-http-proxy"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-3.1.1.tgz"; + sha512 = "13wdwd1dgc2laqsv0mjz91pz1mmfy0c0ihbgvmd4lqi6v5gas17cp85885nkdz2y5w87yizqlb2w4l04bbxwvcw6spaq2aw5q3z3rvv"; + }; + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + sources."commander-2.13.0" + sources."cycle-1.0.3" + sources."eventemitter3-1.2.0" + sources."eyes-0.1.8" + sources."http-proxy-1.16.2" + sources."isstream-0.1.2" + sources."lynx-0.2.0" + sources."mersenne-0.0.4" + sources."requires-port-1.0.0" + sources."stack-trace-0.0.10" + sources."statsd-parser-0.0.4" + sources."strftime-0.10.0" + sources."winston-2.4.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A configurable-on-the-fly HTTP Proxy"; + homepage = "https://github.com/jupyterhub/configurable-http-proxy#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; + }; cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; @@ -28719,7 +28703,7 @@ in sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.8" sources."brorand-1.1.0" - sources."browser-pack-6.0.2" + sources."browser-pack-6.0.3" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -28751,9 +28735,9 @@ in sources."cli-cursor-1.0.2" sources."cli-width-1.1.1" sources."code-point-at-1.1.0" - sources."combine-source-map-0.7.2" + sources."combine-source-map-0.8.0" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."compressible-2.0.12" sources."compression-1.7.1" sources."concat-map-0.0.1" @@ -28790,6 +28774,7 @@ in dependencies = [ sources."acorn-4.0.13" sources."base64-js-1.2.1" + sources."combine-source-map-0.7.2" sources."glob-7.1.1" sources."hash-base-2.0.2" sources."isarray-1.0.0" @@ -28803,7 +28788,7 @@ in sources."q-1.0.1" sources."qs-6.3.2" sources."shelljs-0.3.0" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."xmlbuilder-8.2.2" ]; }) @@ -28830,7 +28815,7 @@ in sources."underscore-1.2.1" ]; }) - sources."depd-1.1.1" + sources."depd-1.1.2" (sources."dependency-ls-1.1.1" // { dependencies = [ sources."q-1.4.1" @@ -28889,7 +28874,11 @@ in sources."hoek-2.16.3" sources."hosted-git-info-2.5.0" sources."htmlescape-1.1.1" - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-signature-1.1.1" sources."https-browserify-1.0.0" sources."iconv-lite-0.4.19" @@ -28913,7 +28902,7 @@ in }) sources."minimist-1.2.0" sources."mute-stream-0.0.5" - sources."uuid-3.1.0" + sources."uuid-3.2.1" ]; }) sources."interpret-1.1.0" @@ -29021,7 +29010,7 @@ in sources."randomfill-1.0.3" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.3" + sources."rc-1.2.4" sources."read-1.0.7" sources."read-all-stream-3.1.0" sources."read-only-stream-2.0.0" @@ -29040,7 +29029,7 @@ in sources."rx-lite-3.1.2" sources."safe-buffer-5.1.1" sources."sax-0.3.5" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."send-0.16.1" sources."serve-static-1.13.1" @@ -29066,7 +29055,7 @@ in sources."stream-browserify-2.0.1" sources."stream-buffers-2.2.0" sources."stream-combiner2-1.1.1" - sources."stream-http-2.7.2" + sources."stream-http-2.8.0" sources."stream-shift-1.0.0" sources."stream-splicer-2.0.0" sources."string-length-1.0.1" @@ -29166,26 +29155,20 @@ in dat = nodeEnv.buildNodePackage { name = "dat"; packageName = "dat"; - version = "13.9.2"; + version = "13.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat/-/dat-13.9.2.tgz"; - sha512 = "05x3ij83al1f0r7fiaq788q4k81vlbmydsa1g829pq0q6795p57b12mmmx8nvc8khbbv1iphr065c7h3d7kc9ylps39xn1qdg64jz90"; + url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz"; + sha512 = "05s22v6dv8mgh50m49cadbiw6ykzjl9q81j3zd4zw5zvpj9zl8xbpazw7kbyvzh58rhr6ydl44llghkl24vpn564gqbig3gnxxgmh8z"; }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."acorn-5.3.0" sources."ajv-5.5.2" - sources."amdefine-1.0.1" sources."ansi-diff-stream-1.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.0" sources."anymatch-1.3.2" sources."ap-0.1.0" - (sources."append-tree-2.4.0" // { - dependencies = [ - sources."xtend-4.0.1" - ]; - }) + sources."append-tree-2.4.1" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-lru-1.1.1" @@ -29198,17 +29181,16 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."balanced-match-1.0.0" - sources."base64-to-uint8array-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."bencode-1.0.0" sources."bitfield-rle-2.1.0" - (sources."bittorrent-dht-7.8.2" // { + (sources."bittorrent-dht-7.10.0" // { dependencies = [ sources."debug-3.1.0" ]; }) sources."blake2b-2.1.2" - sources."blake2b-wasm-1.1.4" + sources."blake2b-wasm-1.1.5" sources."body-0.1.0" sources."boom-4.3.1" sources."brace-expansion-1.1.8" @@ -29217,9 +29199,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."brfs-1.4.3" sources."buffer-alloc-unsafe-1.0.0" - sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.3" @@ -29253,16 +29233,18 @@ in dependencies = [ sources."debug-2.6.9" sources."lru-2.0.1" + sources."pump-1.0.3" ]; }) - sources."dat-encoding-4.0.2" + sources."dat-encoding-5.0.1" sources."dat-ignore-2.0.0" (sources."dat-json-1.0.1" // { dependencies = [ + sources."dat-encoding-4.0.2" sources."debug-2.6.9" ]; }) - (sources."dat-link-resolve-1.1.1" // { + (sources."dat-link-resolve-2.1.0" // { dependencies = [ sources."debug-2.6.9" ]; @@ -29270,40 +29252,22 @@ in sources."dat-log-1.1.1" (sources."dat-node-3.5.6" // { dependencies = [ - sources."dat-encoding-5.0.1" - (sources."dat-link-resolve-2.1.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."esprima-1.0.4" - sources."estraverse-1.3.2" - sources."isarray-0.0.1" sources."minimist-0.0.8" - sources."object-keys-0.4.0" - sources."readable-stream-1.0.34" - sources."string_decoder-0.10.31" + sources."pump-1.0.3" sources."unordered-set-2.0.0" sources."varint-5.0.0" ]; }) sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.0" - (sources."dat-storage-1.0.3" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.3" - sources."string_decoder-1.0.3" - sources."xtend-2.1.2" - ]; - }) + sources."dat-storage-1.0.3" sources."dat-swarm-defaults-1.0.0" sources."datland-swarm-defaults-1.0.2" sources."debug-3.1.0" sources."deep-equal-0.2.2" sources."delayed-stream-1.0.0" sources."directory-index-html-2.1.0" - sources."discovery-channel-5.4.6" + sources."discovery-channel-5.4.7" (sources."discovery-swarm-4.4.2" // { dependencies = [ sources."thunky-0.1.0" @@ -29314,30 +29278,20 @@ in sources."thunky-0.1.0" ]; }) - sources."dns-packet-1.3.0" - sources."dns-socket-1.6.2" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" - (sources."duplexer2-0.0.2" // { - dependencies = [ - sources."readable-stream-1.1.14" - ]; - }) sources."duplexify-3.5.3" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.3.3" - sources."esprima-1.1.1" - sources."estraverse-1.5.1" - sources."esutils-1.0.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" sources."extend-3.0.1" sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."falafel-2.1.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-read-stream-1.1.0" @@ -29347,14 +29301,10 @@ in sources."for-each-0.3.2" sources."for-in-1.0.2" sources."for-own-0.1.5" - sources."foreach-2.0.5" sources."forever-agent-0.6.1" sources."form-data-2.3.1" sources."from2-2.3.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" sources."getpass-0.1.7" sources."glob-7.1.2" sources."glob-base-0.3.0" @@ -29362,23 +29312,19 @@ in sources."global-4.3.2" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-1.0.1" sources."has-flag-2.0.0" sources."hawk-6.0.2" sources."hoek-4.2.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.11.0" // { + (sources."hypercore-6.12.0" // { dependencies = [ sources."varint-5.0.0" ]; }) - sources."hypercore-protocol-6.5.0" - (sources."hyperdrive-9.12.0" // { + sources."hypercore-protocol-6.5.1" + (sources."hyperdrive-9.12.1" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.3" - sources."string_decoder-1.0.3" sources."varint-4.0.1" ]; }) @@ -29404,7 +29350,6 @@ in sources."is-number-2.1.0" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-property-1.0.2" sources."is-string-1.0.4" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -29434,17 +29379,11 @@ in sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mirror-folder-2.1.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.3" - sources."string_decoder-1.0.3" - ]; - }) + sources."mirror-folder-2.1.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" - sources."multicast-dns-6.2.1" + sources."multicast-dns-6.2.2" sources."multicb-1.2.2" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" @@ -29463,15 +29402,12 @@ in sources."node-gyp-build-3.2.2" sources."normalize-path-2.1.1" sources."oauth-sign-0.8.2" - sources."object-inspect-0.4.0" - sources."object-keys-1.0.11" sources."object.omit-2.0.1" sources."once-1.4.0" sources."os-homedir-1.0.2" sources."parse-glob-3.0.4" sources."parse-headers-2.0.1" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" sources."performance-now-2.1.0" sources."pkginfo-0.4.1" sources."preserve-0.2.0" @@ -29485,12 +29421,10 @@ in sources."async-1.0.0" ]; }) - sources."protocol-buffers-3.2.1" - sources."protocol-buffers-schema-3.3.2" - sources."pump-1.0.3" + sources."protocol-buffers-encodings-1.1.0" + sources."pump-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."quote-stream-1.0.2" (sources."random-access-file-1.8.1" // { dependencies = [ sources."debug-2.6.9" @@ -29516,12 +29450,10 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."request-2.83.0" - sources."resolve-1.5.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" - sources."rusha-0.8.11" + sources."rusha-0.8.12" sources."safe-buffer-5.1.1" - sources."shallow-copy-0.0.1" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.0" sources."siphash24-1.1.0" @@ -29532,22 +29464,10 @@ in sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.1.0" sources."sorted-indexof-1.0.0" - sources."source-map-0.1.43" sources."sparse-bitfield-3.0.3" sources."speedometer-1.0.0" sources."sshpk-1.13.1" sources."stack-trace-0.0.10" - (sources."static-eval-0.2.4" // { - dependencies = [ - sources."escodegen-0.0.28" - ]; - }) - (sources."static-module-1.5.0" // { - dependencies = [ - sources."quote-stream-0.0.0" - sources."through2-0.4.2" - ]; - }) sources."status-logger-3.1.1" sources."stream-collector-1.0.1" sources."stream-each-1.2.2" @@ -29587,7 +29507,7 @@ in sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.6.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."varint-3.0.1" sources."verror-1.10.0" (sources."winston-2.1.1" // { @@ -29789,7 +29709,7 @@ in sources."bl-0.8.2" sources."bytewise-1.1.0" sources."bytewise-core-1.2.3" - sources."cookie-signature-1.0.6" + sources."cookie-signature-1.1.0" sources."core-util-is-1.0.2" sources."cors-2.8.4" sources."deferred-leveldown-0.2.0" @@ -29871,11 +29791,11 @@ in sources."pull-cat-1.1.11" sources."pull-level-2.0.3" sources."pull-live-1.0.1" - sources."pull-pushable-2.1.1" + sources."pull-pushable-2.1.2" sources."pull-stream-3.6.1" sources."pull-window-2.1.4" sources."pump-1.0.3" - (sources."pumpify-1.3.6" // { + (sources."pumpify-1.4.0" // { dependencies = [ sources."pump-2.0.0" ]; @@ -29938,7 +29858,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.0" sources."asynckit-0.4.0" - sources."aws-sdk-2.179.0" + sources."aws-sdk-2.185.0" sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."base64-js-1.2.1" @@ -29946,12 +29866,9 @@ in sources."boom-4.3.1" sources."buffer-4.9.1" sources."caseless-0.12.0" - sources."cipher-base-1.0.4" sources."co-4.6.0" sources."combined-stream-1.0.5" sources."core-util-is-1.0.2" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" (sources."cryptiles-3.1.2" // { dependencies = [ sources."boom-5.2.0" @@ -29970,12 +29887,10 @@ in sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."hash-base-2.0.2" sources."hawk-6.0.2" sources."hoek-4.2.0" sources."http-signature-1.2.0" sources."ieee754-1.1.8" - sources."inherits-2.0.3" sources."ini-1.3.5" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -30002,10 +29917,8 @@ in sources."punycode-1.4.1" ]; }) - sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" sources."sax-1.2.1" - sources."sha.js-2.4.9" sources."sntp-2.1.0" sources."sshpk-1.13.1" sources."stringstream-0.0.5" @@ -30078,7 +29991,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.0" @@ -30217,7 +30130,7 @@ in sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."verror-1.10.0" sources."which-1.3.0" sources."wrappy-1.0.2" @@ -30250,7 +30163,7 @@ in sources."array-find-index-1.0.2" sources."arrify-1.0.1" sources."asap-2.0.6" - sources."auto-bind-1.1.0" + sources."auto-bind-1.2.0" sources."babel-code-frame-6.26.0" sources."babel-core-6.26.0" sources."babel-generator-6.26.0" @@ -30414,7 +30327,7 @@ in sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -30459,10 +30372,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.15.0"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.15.0.tgz"; - sha512 = "3l1j4qy0gqa8rkwpdsmkkbqcmbx23ym8h64d1bbj5i5ds5ks0g91myldzp0y25r6b3ba9646hy4i2jiad2jmm8h68z89i2larkvyhyc"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.16.0.tgz"; + sha512 = "330nda1zwh0sqsxsfmlmhbg903gz6n9n4zy870gc2k95wrg1bc7jysfyn98nk2bd8p821xszpygp1vs1i7csapxfb3q2dp1n3hxamb1"; }; dependencies = [ sources."acorn-5.3.0" @@ -30587,7 +30500,7 @@ in sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -30679,7 +30592,7 @@ in sources."del-2.2.2" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-4.15.0" // { + (sources."eslint-4.16.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.0" @@ -30769,7 +30682,7 @@ in sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -30963,7 +30876,7 @@ in sources."request-progress-2.0.1" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."sntp-2.1.0" sources."spdx-correct-1.0.2" @@ -30984,7 +30897,7 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."util-deprecate-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."validate-npm-package-license-3.0.1" sources."verror-1.10.0" sources."which-1.3.0" @@ -31410,7 +31323,7 @@ in }) sources."cache-base-1.0.1" sources."chalk-1.1.3" - (sources."class-utils-0.3.5" // { + (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" ]; @@ -31441,7 +31354,7 @@ in sources."expand-tilde-2.0.2" sources."extend-3.0.1" sources."extend-shallow-2.0.1" - (sources."extglob-2.0.3" // { + (sources."extglob-2.0.4" // { dependencies = [ sources."kind-of-5.1.0" ]; @@ -31825,8 +31738,9 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.3.5" // { + (sources."uglify-js-3.3.8" // { dependencies = [ + sources."commander-2.13.0" sources."source-map-0.6.1" ]; }) @@ -31845,14 +31759,14 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "3.19.0"; + version = "3.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-3.19.0.tgz"; - sha512 = "34pv92cpzkfq8r6q0k2r47n2pj7v5n0hnldrjgh443cacc1ifbbh5n0xfgrd93l88w3pwk7gc64xnipw37d6cbk5zv9kawy88b1j6bs"; + url = "https://registry.npmjs.org/ionic/-/ionic-3.19.1.tgz"; + sha512 = "11hpd51qzi8fms87q1xqwc347dp9mxhvzci2jlw94ayvs1v2n3iaqwdic1g1213k91xwzp52z6y17a08via45l936bgda3pi6zfbmsk"; }; dependencies = [ sources."@ionic/cli-framework-0.1.2" - (sources."@ionic/cli-utils-1.19.0" // { + (sources."@ionic/cli-utils-1.19.1" // { dependencies = [ sources."bytes-1.0.0" sources."debug-2.6.9" @@ -31922,7 +31836,7 @@ in sources."dargs-5.1.0" sources."debug-3.1.0" sources."delayed-stream-1.0.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-3.4.0" sources."ee-first-1.1.1" @@ -31959,7 +31873,11 @@ in sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" sources."has-flag-2.0.0" - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-parser-js-0.4.9" sources."http-proxy-1.16.2" sources."http-proxy-middleware-0.17.4" @@ -31987,7 +31905,7 @@ in sources."kind-of-3.2.2" sources."lazystream-1.0.0" sources."leek-0.0.24" - sources."livereload-js-2.2.2" + sources."livereload-js-2.3.0" sources."lodash-4.17.4" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" @@ -32027,7 +31945,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.1.0" + sources."opn-5.2.0" sources."os-name-2.0.1" sources."os-tmpdir-1.0.2" sources."parse-glob-3.0.4" @@ -32066,7 +31984,7 @@ in sources."safe-buffer-5.1.1" sources."safe-json-parse-1.0.1" sources."sax-1.1.4" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."send-0.16.1" sources."serve-static-1.13.1" sources."set-immediate-shim-1.0.1" @@ -32083,7 +32001,7 @@ in sources."strip-ansi-4.0.0" sources."superagent-3.8.2" sources."supports-color-4.5.0" - (sources."tar-4.2.0" // { + (sources."tar-4.3.0" // { dependencies = [ sources."minimist-0.0.8" ]; @@ -32092,13 +32010,14 @@ in sources."through-2.3.8" sources."tiny-lr-1.0.5" sources."tmp-0.0.33" - sources."tslib-1.8.1" + sources."tslib-1.9.0" sources."type-is-1.6.15" sources."ultron-1.1.1" sources."unpipe-1.0.0" + sources."untildify-3.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."vary-1.1.2" sources."websocket-driver-0.7.0" sources."websocket-extensions-0.1.3" @@ -32249,7 +32168,7 @@ in sources."check-error-1.0.2" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."concat-map-0.0.1" sources."deep-eql-3.0.1" sources."deep-equal-1.0.1" @@ -32288,7 +32207,7 @@ in sources."thenify-3.3.0" sources."thenify-all-1.6.0" sources."thriftrw-3.11.1" - sources."type-detect-4.0.5" + sources."type-detect-4.0.7" sources."typescript-2.4.2" sources."vscode-jsonrpc-3.5.0" sources."vscode-languageserver-3.5.0" @@ -32453,7 +32372,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."bluebird-3.5.1" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."config-chain-1.1.11" sources."editorconfig-0.13.3" sources."ini-1.3.5" @@ -32463,7 +32382,7 @@ in sources."nopt-3.0.6" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."sigmund-1.0.1" ]; buildInputs = globalBuildInputs; @@ -32631,7 +32550,7 @@ in sources."decamelize-1.2.0" sources."deep-extend-0.4.2" sources."delayed-stream-1.0.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" @@ -32675,7 +32594,11 @@ in sources."has-flag-2.0.0" sources."hawk-6.0.2" sources."hoek-4.2.0" - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."import-lazy-2.1.0" @@ -32755,14 +32678,14 @@ in sources."qs-6.5.1" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.3" + sources."rc-1.2.4" sources."registry-auth-token-3.3.1" sources."registry-url-3.1.0" sources."request-2.83.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."send-0.16.1" sources."serve-static-1.13.1" @@ -32794,7 +32717,7 @@ in sources."update-notifier-2.3.0" sources."url-parse-lax-1.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.0" @@ -32810,7 +32733,7 @@ in sources."xdg-basedir-3.0.0" sources."y18n-3.2.1" sources."yallist-2.1.2" - (sources."yargs-10.1.1" // { + (sources."yargs-10.1.2" // { dependencies = [ sources."ansi-regex-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -32865,6 +32788,11 @@ in sources."after-0.8.2" sources."agent-base-2.1.1" sources."ajv-5.5.2" + (sources."amqplib-0.5.2" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."anymatch-1.3.2" @@ -32902,6 +32830,7 @@ in sources."bcrypt-pbkdf-1.0.1" sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" + sources."bitsyntax-0.0.4" sources."bl-1.1.2" sources."blob-0.0.4" sources."bluebird-3.5.1" @@ -32915,7 +32844,7 @@ in ]; }) sources."brorand-1.1.0" - sources."browser-pack-6.0.2" + sources."browser-pack-6.0.3" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -32924,6 +32853,7 @@ in (sources."browserify-14.5.0" // { dependencies = [ sources."acorn-5.3.0" + sources."combine-source-map-0.7.2" sources."hash-base-2.0.2" sources."isarray-0.0.1" sources."source-map-0.5.7" @@ -32936,6 +32866,7 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."buffer-5.0.8" + sources."buffer-more-ints-0.0.2" sources."buffer-xor-1.0.3" sources."buildmail-4.0.1" sources."builtin-status-codes-3.0.0" @@ -32946,13 +32877,13 @@ in sources."chalk-1.1.3" sources."chokidar-1.7.0" sources."cipher-base-1.0.4" - sources."circular-json-0.4.0" + sources."circular-json-0.5.1" sources."co-4.6.0" sources."colors-1.1.2" sources."combine-lists-1.0.1" - sources."combine-source-map-0.7.2" + sources."combine-source-map-0.8.0" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -32994,7 +32925,7 @@ in sources."defined-1.0.0" sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."deps-sort-2.0.0" sources."des.js-1.0.0" sources."detective-4.7.1" @@ -33075,7 +33006,11 @@ in sources."hmac-drbg-1.0.1" sources."hoek-4.2.0" sources."htmlescape-1.1.1" - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-proxy-1.16.2" sources."http-proxy-agent-1.0.0" sources."http-signature-1.2.0" @@ -33128,7 +33063,7 @@ in sources."libqp-1.1.0" sources."lodash-4.17.4" sources."lodash.memoize-3.0.4" - (sources."log4js-2.4.1" // { + (sources."log4js-2.5.2" // { dependencies = [ sources."assert-plus-0.2.0" sources."aws-sign2-0.6.0" @@ -33269,13 +33204,13 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."request-2.83.0" - sources."requestretry-1.12.2" + sources."requestretry-1.13.0" sources."requires-port-1.0.0" sources."resolve-1.5.0" sources."rimraf-2.6.2" sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."set-immediate-shim-1.0.1" sources."setprototypeof-1.0.3" sources."sha.js-2.4.9" @@ -33300,7 +33235,7 @@ in sources."statuses-1.4.0" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.7.2" + sources."stream-http-2.8.0" sources."stream-splicer-2.0.0" sources."streamroller-0.7.0" sources."string_decoder-1.0.3" @@ -33350,7 +33285,7 @@ in }) sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."uws-0.14.5" sources."verror-1.10.0" sources."vm-browserify-0.0.4" @@ -33359,7 +33294,7 @@ in sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."ws-3.3.3" - sources."xmlhttprequest-ssl-1.5.4" + sources."xmlhttprequest-ssl-1.5.5" sources."xregexp-2.0.0" sources."xtend-4.0.1" sources."yeast-0.1.2" @@ -33494,7 +33429,7 @@ in sources."readable-stream-1.1.14" (sources."response-time-2.3.2" // { dependencies = [ - sources."depd-1.1.1" + sources."depd-1.1.2" ]; }) sources."rndm-1.2.0" @@ -33508,7 +33443,7 @@ in sources."serve-index-1.7.3" (sources."serve-static-1.10.3" // { dependencies = [ - sources."depd-1.1.1" + sources."depd-1.1.2" sources."ms-0.7.1" ]; }) @@ -33537,10 +33472,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "2.6.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.6.0.tgz"; - sha512 = "2l5xsq07gg1gh9h5hkwsxcchj28xj5crm2hifyvzwx2pb9csbyg8hk75d6ab40wd5r7syyyzzbigr0crlvigc41wb7i44zvxv4zg1qj"; + url = "https://registry.npmjs.org/lerna/-/lerna-2.8.0.tgz"; + sha512 = "2admd5d0lmnck38apsqbblrk0pffnq52s25bb591q8sazykcfz68kz9pn534sgazjl26p57y23758n8n7xvw0ilb9hd5ri6j34i7kxn"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -33683,15 +33618,17 @@ in sources."is-utf8-0.2.1" sources."isarray-1.0.0" sources."isexe-2.0.0" + sources."json-parse-better-errors-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonparse-1.3.1" sources."kind-of-3.2.2" sources."lazy-cache-1.0.4" sources."lcid-1.0.0" - (sources."load-json-file-3.0.0" // { + (sources."load-json-file-4.0.0" // { dependencies = [ - sources."parse-json-3.0.0" + sources."parse-json-4.0.0" + sources."pify-3.0.0" sources."strip-bom-3.0.0" ]; }) @@ -33753,13 +33690,12 @@ in sources."process-nextick-args-1.0.7" sources."pseudomap-1.0.2" sources."q-1.5.1" - sources."rc-1.2.3" + sources."rc-1.2.4" sources."read-cmd-shim-1.0.1" - (sources."read-pkg-2.0.0" // { + (sources."read-pkg-3.0.0" // { dependencies = [ - sources."load-json-file-2.0.0" - sources."path-type-2.0.0" - sources."strip-bom-3.0.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" ]; }) sources."read-pkg-up-1.0.1" @@ -33778,7 +33714,7 @@ in sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -33808,7 +33744,7 @@ in (sources."temp-write-3.4.0" // { dependencies = [ sources."pify-3.0.0" - sources."uuid-3.1.0" + sources."uuid-3.2.1" ]; }) sources."tempfile-1.1.1" @@ -33860,7 +33796,11 @@ in }) sources."execa-0.7.0" sources."is-fullwidth-code-point-1.0.0" + sources."load-json-file-2.0.0" + sources."path-type-2.0.0" + sources."read-pkg-2.0.0" sources."read-pkg-up-2.0.0" + sources."strip-bom-3.0.0" ]; }) sources."yargs-parser-7.0.0" @@ -33874,6 +33814,116 @@ in production = true; bypassCache = false; }; + less = nodeEnv.buildNodePackage { + name = "less"; + packageName = "less"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz"; + sha512 = "04jbm6adzhknlcwjjdd94n8dhqwgsg0fyampis9854jf23z9g9lxs8593908ymwldl88bjipf9b9rw6xfibb29vv7s0c44wllj4ixr8"; + }; + dependencies = [ + sources."ajv-4.11.8" + sources."asap-2.0.6" + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.6.0" + sources."bcrypt-pbkdf-1.0.1" + sources."boom-2.10.1" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."combined-stream-1.0.5" + sources."core-util-is-1.0.2" + sources."cryptiles-2.0.5" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."errno-0.1.6" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."getpass-0.1.7" + sources."graceful-fs-4.1.11" + sources."har-schema-1.0.5" + sources."har-validator-4.2.1" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" + sources."image-size-0.5.5" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-stable-stringify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonify-0.0.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."mime-1.6.0" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."promise-7.3.1" + sources."prr-1.0.1" + sources."punycode-1.4.1" + sources."qs-6.4.0" + sources."request-2.81.0" + sources."safe-buffer-5.1.1" + sources."sntp-1.0.9" + sources."source-map-0.5.7" + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uuid-3.2.1" + sources."verror-1.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Leaner CSS"; + homepage = http://lesscss.org/; + license = "Apache-2.0"; + }; + production = true; + bypassCache = false; + }; + less-plugin-clean-css = nodeEnv.buildNodePackage { + name = "less-plugin-clean-css"; + packageName = "less-plugin-clean-css"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/less-plugin-clean-css/-/less-plugin-clean-css-1.5.1.tgz"; + sha1 = "cc57af7aa3398957e56decebe63cb60c23429703"; + }; + dependencies = [ + sources."amdefine-1.0.1" + sources."clean-css-3.4.28" + sources."commander-2.8.1" + sources."graceful-readlink-1.0.1" + sources."source-map-0.4.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "clean-css plugin for less.js"; + homepage = http://lesscss.org/; + }; + production = true; + bypassCache = false; + }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; @@ -34073,7 +34123,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" @@ -34120,7 +34170,11 @@ in sources."hawk-6.0.2" sources."hoek-4.2.0" sources."html-entities-1.2.1" - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."indexof-0.0.1" @@ -34171,7 +34225,7 @@ in sources."object-component-0.0.3" sources."object.omit-2.0.1" sources."on-finished-2.3.0" - sources."opn-5.1.0" + sources."opn-5.2.0" sources."parse-glob-3.0.4" sources."parseqs-0.0.5" sources."parseuri-0.0.5" @@ -34232,12 +34286,12 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."uws-0.14.5" sources."vary-1.1.2" sources."verror-1.10.0" sources."ws-3.3.3" - sources."xmlhttprequest-ssl-1.5.4" + sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -34284,7 +34338,7 @@ in sources."core-util-is-1.0.2" sources."cors-2.8.4" sources."debug-2.2.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."duplexer-0.1.1" sources."ee-first-1.1.1" @@ -34308,7 +34362,11 @@ in sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" sources."http-auth-3.1.3" - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-parser-js-0.4.9" sources."inherits-2.0.3" sources."is-binary-path-1.0.1" @@ -34345,7 +34403,7 @@ in sources."object.omit-2.0.1" sources."on-finished-2.3.0" sources."on-headers-1.0.1" - sources."opn-5.1.0" + sources."opn-5.2.0" sources."parse-glob-3.0.4" sources."parseurl-1.3.2" sources."path-is-absolute-1.0.1" @@ -34393,7 +34451,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.0" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."vary-1.1.2" sources."websocket-driver-0.7.0" sources."websocket-extensions-0.1.3" @@ -34446,10 +34504,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz"; - sha512 = "0s6517vczlh2vm9syq4kpwkwrr7panih1cip6aq8qjn9cw2gvbl14lql0y81dh10ims8p1f2qm4vkbifcrs2hw1v7cca9j71n76f5fi"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.0.tgz"; + sha512 = "3rxvm15qz9qdiyihc9pq4kc008iz89cqdqjlca43swmk3fc7bydlaqk1qyhaj19r5m8cxxrpiwxz5cwrp9im26fin4sgqdfbxs7ch5s"; }; dependencies = [ sources."balanced-match-1.0.0" @@ -34497,7 +34555,7 @@ in sources."argparse-1.0.9" sources."asynckit-0.4.0" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."core-util-is-1.0.2" @@ -34699,7 +34757,7 @@ in sources."typedarray-0.0.6" sources."uid-number-0.0.5" sources."util-deprecate-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."validate-npm-package-license-3.0.1" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -34824,7 +34882,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."verror-1.10.0" sources."which-1.3.0" sources."wide-align-1.1.2" @@ -34928,7 +34986,7 @@ in sources."default-browser-id-1.0.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."detect-libc-1.0.3" sources."ecc-jsbn-0.1.1" @@ -34961,7 +35019,11 @@ in sources."headless-0.1.7" sources."hoek-2.16.3" sources."hosted-git-info-2.5.0" - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-signature-1.1.1" sources."iconv-lite-0.4.19" sources."indent-string-2.1.0" @@ -35042,7 +35104,7 @@ in sources."qs-6.5.1" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.3" + sources."rc-1.2.4" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.3" @@ -35091,13 +35153,13 @@ in sources."untildify-2.1.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.1.0" + sources."uuid-3.2.1" (sources."v8-debug-1.0.1" // { dependencies = [ sources."glob-7.1.2" sources."qs-6.4.0" sources."rimraf-2.6.2" - sources."semver-5.4.1" + sources."semver-5.5.0" ]; }) sources."v8-profiler-5.7.0" @@ -35219,7 +35281,7 @@ in sources."process-nextick-args-1.0.7" sources."punycode-1.4.1" sources."qs-6.4.0" - (sources."rc-1.2.3" // { + (sources."rc-1.2.4" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -35228,7 +35290,7 @@ in sources."request-2.81.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."sntp-1.0.9" @@ -35249,7 +35311,7 @@ in sources."tweetnacl-0.14.5" sources."uid-number-0.0.6" sources."util-deprecate-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."verror-1.10.0" sources."wide-align-1.1.2" sources."wrappy-1.0.2" @@ -35266,148 +35328,252 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.14.10"; + version = "1.14.11"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.14.10.tgz"; - sha512 = "02jb9bm9vxlzipgnh193ayzhynymmvl9m593ajjqclg7jlrdlzmkhn445ywqmicfxnc8hfdablnx2hkgw441hjva4fp6iwz4fj3fwwm"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.14.11.tgz"; + sha512 = "11wlzxf5xjrdybvf0lr1acr7bqhdy7s66m1w5cm02g8pzbd567xziphv1pjx6i27s34qh18rjhp6prc1rapp68x1lr8gkaxi8zfwvfz"; }; dependencies = [ sources."abbrev-1.1.1" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.0" - sources."anymatch-1.3.2" - sources."arr-diff-2.0.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" - sources."array-unique-0.2.1" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" sources."async-each-1.0.1" + sources."atob-2.0.3" sources."balanced-match-1.0.0" - sources."binary-extensions-1.11.0" - sources."boxen-1.3.0" - sources."brace-expansion-1.1.8" - (sources."braces-1.8.5" // { + (sources."base-0.11.2" // { dependencies = [ - sources."kind-of-4.0.0" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" ]; }) + sources."binary-extensions-1.11.0" + sources."boxen-1.3.0" + sources."brace-expansion-1.1.8" + sources."braces-2.3.0" + sources."cache-base-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."chalk-2.3.0" - sources."chokidar-1.7.0" + (sources."chokidar-2.0.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + sources."kind-of-3.2.2" + ]; + }) + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) sources."cli-boxes-1.0.0" + sources."collection-visit-1.0.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."configstore-3.1.1" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" - sources."debug-2.6.9" + sources."debug-3.1.0" + sources."decode-uri-component-0.2.0" sources."deep-extend-0.4.2" + sources."define-property-1.0.0" sources."dot-prop-4.2.0" sources."duplexer-0.1.1" sources."duplexer3-0.1.4" sources."escape-string-regexp-1.0.5" sources."event-stream-3.3.4" sources."execa-0.7.0" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - sources."extglob-0.3.2" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.3" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-shallow-2.0.1" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."fill-range-4.0.0" sources."for-in-1.0.2" - sources."for-own-0.1.5" + sources."fragment-cache-0.2.1" sources."from-0.1.7" sources."fsevents-1.1.3" sources."get-stream-3.0.0" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" + sources."get-value-2.0.6" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.1.11" sources."has-flag-2.0.0" + sources."has-value-1.0.0" + sources."has-values-1.0.0" sources."ignore-by-default-1.0.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inherits-2.0.3" sources."ini-1.3.5" + sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-2.0.1" + sources."is-glob-4.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" - sources."is-number-2.1.0" + sources."is-number-3.0.0" sources."is-obj-1.0.1" + (sources."is-odd-1.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."is-path-inside-1.0.1" - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" + sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" - sources."kind-of-3.2.2" + sources."isobject-3.0.1" + sources."kind-of-6.0.2" sources."latest-version-3.1.0" + sources."lazy-cache-2.0.2" sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" sources."make-dir-1.1.0" + sources."map-cache-0.2.2" sources."map-stream-0.1.0" - sources."micromatch-2.3.11" + sources."map-visit-1.0.0" + (sources."micromatch-3.1.5" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + ]; + }) sources."minimatch-3.0.4" sources."minimist-1.2.0" + sources."mixin-deep-1.3.0" sources."ms-2.0.0" sources."nan-2.8.0" + (sources."nanomatch-1.2.7" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) sources."nopt-1.0.10" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" - sources."object.omit-2.0.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" sources."p-finally-1.0.0" sources."package-json-4.0.1" - sources."parse-glob-3.0.4" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."pause-stream-0.0.11" sources."pify-3.0.0" + sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."preserve-0.2.0" sources."process-nextick-args-1.0.7" sources."ps-tree-1.1.0" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.0" - (sources."randomatic-1.1.7" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - ]; - }) - sources."rc-1.2.3" + sources."rc-1.2.4" sources."readable-stream-2.3.3" sources."readdirp-2.1.0" - sources."regex-cache-0.4.4" + sources."regex-not-1.0.0" sources."registry-auth-token-3.3.1" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."semver-diff-2.1.0" + sources."set-getter-0.1.0" sources."set-immediate-shim-1.0.1" + sources."set-value-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" + (sources."snapdragon-0.8.1" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."snapdragon-node-2.1.1" + sources."snapdragon-util-3.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + sources."source-map-url-0.4.0" sources."split-0.3.3" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."static-extend-0.1.2" sources."stream-combiner-0.0.4" sources."string-width-2.1.1" sources."string_decoder-1.0.3" @@ -35418,12 +35584,39 @@ in sources."term-size-1.2.0" sources."through-2.3.8" sources."timed-out-4.0.1" + sources."to-object-path-0.3.0" + (sources."to-regex-3.0.1" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."to-regex-range-2.1.1" sources."touch-3.1.0" - sources."undefsafe-0.0.3" + (sources."undefsafe-2.0.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) sources."unique-string-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) sources."unzip-response-2.0.1" sources."update-notifier-2.3.0" + sources."urix-0.1.0" sources."url-parse-lax-1.0.0" + sources."use-2.0.2" sources."util-deprecate-1.0.2" sources."which-1.3.0" sources."widest-line-2.0.0" @@ -35539,7 +35732,7 @@ in sources."deep-extend-0.4.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."dicer-0.2.5" sources."dom-serializer-0.1.0" @@ -35614,7 +35807,11 @@ in sources."domelementtype-1.3.0" ]; }) - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-signature-1.1.1" sources."i18next-1.10.6" sources."i18next-client-1.10.3" @@ -35798,13 +35995,13 @@ in sources."process-nextick-args-1.0.7" sources."proxy-addr-1.1.5" sources."pump-1.0.3" - sources."pumpify-1.3.6" + sources."pumpify-1.4.0" sources."punycode-1.4.1" sources."qs-6.4.0" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" sources."raw-body-2.2.0" - sources."rc-1.2.3" + sources."rc-1.2.4" sources."readable-stream-2.3.3" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" @@ -35867,7 +36064,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.0" sources."uue-3.1.0" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."vary-1.1.2" sources."verror-1.10.0" sources."websocket-stream-5.1.1" @@ -35987,7 +36184,7 @@ in sources."qs-0.5.1" sources."rai-0.1.12" sources."range-parser-0.0.4" - sources."raw-socket-1.5.1" + sources."raw-socket-1.5.2" sources."redis-0.7.3" sources."semver-1.1.0" sources."send-0.1.0" @@ -36200,7 +36397,7 @@ in sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."util-deprecate-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."verror-1.10.0" sources."walk-2.3.9" sources."wide-align-1.1.2" @@ -36257,7 +36454,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.0.3" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."concat-map-0.0.1" (sources."configstore-1.4.0" // { dependencies = [ @@ -36395,7 +36592,7 @@ in sources."pseudomap-1.0.2" sources."punycode-1.3.2" sources."querystring-0.2.0" - sources."rc-1.2.3" + sources."rc-1.2.4" sources."rc-config-loader-2.0.1" sources."read-all-stream-3.1.0" sources."read-pkg-1.1.0" @@ -36414,7 +36611,7 @@ in sources."rx-4.1.0" sources."safe-buffer-5.1.1" sources."sax-1.2.4" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."semver-utils-1.1.1" sources."set-blocking-2.0.0" @@ -36427,7 +36624,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - (sources."snyk-1.67.0" // { + (sources."snyk-1.69.1" // { dependencies = [ sources."async-0.9.2" sources."camelcase-3.0.0" @@ -36463,7 +36660,7 @@ in ]; }) sources."snyk-policy-1.10.1" - sources."snyk-python-plugin-1.4.1" + sources."snyk-python-plugin-1.5.3" sources."snyk-recursive-readdir-2.0.0" sources."snyk-resolve-1.0.0" (sources."snyk-resolve-deps-1.7.0" // { @@ -36531,7 +36728,7 @@ in sources."url-0.11.0" sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."validate-npm-package-license-3.0.1" sources."which-1.3.0" sources."which-module-1.0.0" @@ -36569,7 +36766,7 @@ in sha512 = "0hbwm017cl5ybzw14l44mbinhnv38jrnbpg1ngkdibhc5hiimm8hqr2pi5dzh6flvxr0x6nym93029i7j41clr6rlvn1ab6r5cgdl4f"; }; dependencies = [ - sources."agent-base-4.1.2" + sources."agent-base-4.2.0" sources."ansi-escapes-3.0.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.0" @@ -36660,7 +36857,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -36810,14 +37007,14 @@ in sources."decamelize-1.2.0" sources."define-properties-1.1.2" sources."delayed-stream-1.0.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."dicer-0.2.5" sources."diff-1.4.0" sources."dnscache-1.0.1" sources."dom-storage-2.0.2" sources."domino-1.0.30" - sources."dtrace-provider-0.8.5" + sources."dtrace-provider-0.8.6" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" sources."encodeurl-1.0.1" @@ -36871,7 +37068,11 @@ in sources."hoek-4.2.0" sources."hosted-git-info-2.5.0" sources."hot-shots-4.8.0" - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."inflight-1.0.6" @@ -36964,7 +37165,7 @@ in sources."rimraf-2.4.5" sources."safe-buffer-5.1.1" sources."safe-json-stringify-1.0.4" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."send-0.16.1" sources."serve-favicon-2.4.5" sources."serve-static-1.13.1" @@ -37007,7 +37208,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."validate-npm-package-license-3.0.1" sources."vary-1.1.2" sources."verror-1.10.0" @@ -37092,7 +37293,7 @@ in sources."deep-equal-1.0.1" sources."deep-extend-0.4.2" sources."dns-equal-1.0.0" - sources."dns-packet-1.3.0" + sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" sources."end-of-stream-1.4.1" sources."error-ex-1.3.1" @@ -37161,7 +37362,7 @@ in sources."minimist-1.2.0" sources."mkdirp-0.3.5" sources."ms-2.0.0" - sources."multicast-dns-6.2.1" + sources."multicast-dns-6.2.2" sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.6" sources."network-address-1.1.2" @@ -37207,7 +37408,7 @@ in sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - sources."rc-1.2.3" + sources."rc-1.2.4" sources."re-emitter-1.1.3" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" @@ -37220,10 +37421,10 @@ in sources."run-async-2.3.0" sources."run-parallel-1.1.6" sources."run-series-1.1.4" - sources."rusha-0.8.11" + sources."rusha-0.8.12" sources."rx-4.1.0" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."server-destroy-1.0.1" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" @@ -37531,14 +37732,14 @@ in sources."request-2.16.6" (sources."response-time-2.3.2" // { dependencies = [ - sources."depd-1.1.1" + sources."depd-1.1.2" ]; }) sources."rimraf-2.6.2" sources."rndm-1.2.0" sources."run-parallel-1.1.6" sources."run-series-1.1.4" - sources."rusha-0.8.11" + sources."rusha-0.8.12" sources."safe-buffer-5.1.1" (sources."send-0.13.0" // { dependencies = [ @@ -37549,7 +37750,7 @@ in sources."serve-index-1.7.3" (sources."serve-static-1.10.3" // { dependencies = [ - sources."depd-1.1.1" + sources."depd-1.1.2" sources."ms-0.7.1" ]; }) @@ -37659,7 +37860,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" @@ -37763,10 +37964,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.10.1.tgz"; - sha512 = "1qrig7kh73z8801vicnvjfj3y3kiwp0zsxwfdk9700dda4bwdi7wk6kayvxd9fkw1bbbbxb28jc4ddxcl9hamzjqgyrndrg3ghg3x4l"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.10.2.tgz"; + sha512 = "1k0h7nzg4lg3lf86xy0z7adx2z7nhj8r1y7c5s0gwhfb7qn4qp0845w5agq9zy48ll7sldv7ak2haypkm7akspajvdq25hn0ahlvisd"; }; buildInputs = globalBuildInputs; meta = { @@ -37811,7 +38012,7 @@ in ]; }) sources."brorand-1.1.0" - sources."browser-pack-6.0.2" + sources."browser-pack-6.0.3" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -37820,6 +38021,7 @@ in (sources."browserify-13.3.0" // { dependencies = [ sources."acorn-5.3.0" + sources."combine-source-map-0.7.2" (sources."concat-stream-1.5.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -37849,7 +38051,7 @@ in sources."chokidar-1.7.0" sources."cipher-base-1.0.4" sources."colors-1.1.2" - sources."combine-source-map-0.7.2" + sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.0" sources."console-browserify-1.1.0" @@ -37992,7 +38194,7 @@ in sources."source-map-0.5.7" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.7.2" + sources."stream-http-2.8.0" sources."stream-splicer-2.0.0" sources."string-stream-0.0.7" sources."string_decoder-0.10.31" @@ -38089,7 +38291,7 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."console-control-strings-1.1.0" sources."constantinople-3.1.0" sources."content-disposition-0.5.2" @@ -38105,7 +38307,7 @@ in sources."deep-extend-0.4.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."doctypes-1.1.0" sources."ecc-jsbn-0.1.1" @@ -38142,7 +38344,11 @@ in sources."has-unicode-2.0.1" sources."hawk-3.1.3" sources."hoek-2.16.3" - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-signature-1.1.1" sources."httpolyglot-0.1.2" sources."iconv-lite-0.4.19" @@ -38250,14 +38456,14 @@ in sources."qtdatastream-0.7.1" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.3" + sources."rc-1.2.4" sources."readable-stream-2.3.3" sources."repeat-string-1.6.1" sources."request-2.81.0" sources."resolve-1.5.0" sources."right-align-0.1.3" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."send-0.16.1" (sources."serve-favicon-2.3.2" // { dependencies = [ @@ -38298,7 +38504,7 @@ in sources."unzip-response-1.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."vary-1.1.2" sources."verror-1.10.0" sources."void-elements-2.0.1" @@ -38335,7 +38541,7 @@ in sources."balanced-match-1.0.0" sources."base62-0.1.1" sources."brace-expansion-1.1.8" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -38372,6 +38578,71 @@ in production = true; bypassCache = false; }; + react-native-cli = nodeEnv.buildNodePackage { + name = "react-native-cli"; + packageName = "react-native-cli"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/react-native-cli/-/react-native-cli-2.0.1.tgz"; + sha1 = "f2cd3c7aa1b83828cdfba630e2dfd817df766d54"; + }; + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."async-0.2.10" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" + sources."chalk-1.1.3" + sources."colors-0.6.2" + sources."concat-map-0.0.1" + sources."cycle-1.0.3" + sources."deep-equal-1.0.1" + sources."escape-string-regexp-1.0.5" + sources."eyes-0.1.8" + sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."has-ansi-2.0.0" + sources."i-0.3.6" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."isstream-0.1.2" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."mute-stream-0.0.7" + sources."ncp-0.4.2" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."pkginfo-0.4.1" + (sources."prompt-0.2.14" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."read-1.0.7" + sources."revalidator-0.1.8" + sources."rimraf-2.6.2" + sources."semver-5.5.0" + sources."stack-trace-0.0.10" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."utile-0.2.1" + (sources."winston-0.8.3" // { + dependencies = [ + sources."pkginfo-0.3.1" + ]; + }) + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The React Native CLI tools"; + homepage = "https://github.com/facebook/react-native#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; + }; s3http = nodeEnv.buildNodePackage { name = "s3http"; packageName = "s3http"; @@ -38500,7 +38771,7 @@ in sources."tweetnacl-0.14.5" sources."uid2-0.0.3" sources."util-0.4.9" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."verror-1.10.0" sources."xml2js-0.2.4" sources."xmlbuilder-0.4.2" @@ -38514,10 +38785,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; buildInputs = globalBuildInputs; meta = { @@ -38531,12 +38802,13 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.4.4"; + version = "6.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.4.4.tgz"; - sha512 = "0h7ih1cyaks25qy2v86n3frrgdysv7gpdi1bvjzaqhjl2nm6g334srjd1qv9ivhj4kinld2hwsd40xqd6vv374qh04kd4cn30rl7zc0"; + url = "https://registry.npmjs.org/serve/-/serve-6.4.8.tgz"; + sha512 = "0aj9v58ddjz3i5kw19jxc80y84jm22cdyzxfmfszql6p38w2hs1da4bwfx0f5gq32xrb5a8lqfb1ps8da8l9chwcbvac0m9bl2hl926"; }; dependencies = [ + sources."@zeit/check-updates-1.0.5" sources."accepts-1.3.4" sources."address-1.0.3" sources."align-text-0.1.4" @@ -38581,7 +38853,11 @@ in sources."deep-extend-0.4.2" sources."depd-1.1.1" sources."destroy-1.0.4" - sources."detect-port-1.2.2" + (sources."detect-port-1.2.2" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -38600,6 +38876,7 @@ in (sources."handlebars-4.0.11" // { dependencies = [ sources."camelcase-1.2.1" + sources."minimist-0.0.10" sources."wordwrap-0.0.2" ]; }) @@ -38631,7 +38908,7 @@ in sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.1" sources."make-dir-1.1.0" - sources."micro-9.0.2" + sources."micro-9.1.0" sources."micro-compress-1.0.0" sources."mime-1.4.1" sources."mime-db-1.32.0" @@ -38640,9 +38917,9 @@ in sources."mime-db-1.30.0" ]; }) - sources."minimist-0.0.10" + sources."minimist-1.2.0" sources."mri-1.1.0" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."negotiator-0.6.1" sources."node-version-1.1.0" sources."npm-run-path-2.0.2" @@ -38662,16 +38939,17 @@ in sources."pseudomap-1.0.2" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.3" + sources."rc-1.2.4" sources."registry-auth-token-3.3.1" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" sources."right-align-0.1.3" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."semver-diff-2.1.0" (sources."send-0.16.1" // { dependencies = [ + sources."ms-2.0.0" sources."statuses-1.3.1" ]; }) @@ -38699,11 +38977,7 @@ in sources."universalify-0.1.1" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" - (sources."update-notifier-2.3.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) + sources."update-notifier-2.3.0" sources."url-parse-lax-1.0.0" sources."vary-1.1.2" sources."which-1.3.0" @@ -38768,7 +39042,7 @@ in }) sources."co-4.6.0" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -38785,7 +39059,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."dom-serializer-0.0.1" sources."domelementtype-1.3.0" @@ -38831,7 +39105,11 @@ in sources."entities-1.0.0" ]; }) - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."indexof-0.0.1" @@ -38923,7 +39201,7 @@ in sources."unpipe-1.0.0" sources."utf8-2.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."vary-1.1.2" sources."verror-1.10.0" sources."ws-0.4.31" @@ -38980,16 +39258,12 @@ in }) sources."bytes-1.0.0" sources."caseless-0.12.0" - (sources."chalk-2.3.0" // { - dependencies = [ - sources."supports-color-4.5.0" - ]; - }) + sources."chalk-2.3.0" sources."co-4.6.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."compressible-2.0.12" (sources."compression-1.7.1" // { dependencies = [ @@ -39012,7 +39286,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."destroy-1.0.4" (sources."dom-serializer-0.1.0" // { dependencies = [ @@ -39022,7 +39296,7 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.4.1" sources."domutils-1.6.2" - sources."dtrace-provider-0.8.5" + sources."dtrace-provider-0.8.6" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" sources."encodeurl-1.0.1" @@ -39058,7 +39332,11 @@ in sources."highlight.js-8.9.1" sources."hoek-4.2.0" sources."htmlparser2-3.9.2" - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-signature-1.2.0" sources."iconv-lite-0.4.8" sources."inflight-1.0.6" @@ -39126,6 +39404,7 @@ in dependencies = [ sources."readable-stream-2.3.3" sources."source-map-0.6.1" + sources."supports-color-5.1.0" ]; }) (sources."request-2.83.0" // { @@ -39142,7 +39421,7 @@ in }) sources."safe-buffer-5.1.1" sources."safe-json-stringify-1.0.4" - sources."sanitize-html-1.16.3" + sources."sanitize-html-1.17.0" sources."semver-4.3.6" sources."send-0.15.6" sources."serve-static-1.12.6" @@ -39157,7 +39436,7 @@ in sources."statuses-1.3.1" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" - sources."supports-color-5.1.0" + sources."supports-color-4.5.0" sources."through-2.3.8" sources."tough-cookie-2.3.3" sources."tunnel-agent-0.6.0" @@ -39168,7 +39447,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.0" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."vary-1.1.2" sources."verror-1.10.0" sources."wordwrap-0.0.3" @@ -39409,7 +39688,7 @@ in sources."ultron-1.1.1" sources."uws-0.14.5" sources."ws-3.3.3" - sources."xmlhttprequest-ssl-1.5.4" + sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -39560,7 +39839,11 @@ in sources."css-tree-1.0.0-alpha25" sources."css-url-regex-1.1.0" sources."css-what-2.1.0" - sources."csso-3.4.0" + (sources."csso-3.5.0" // { + dependencies = [ + sources."css-tree-1.0.0-alpha.27" + ]; + }) sources."define-properties-1.1.2" (sources."dom-serializer-0.1.0" // { dependencies = [ @@ -39680,7 +39963,7 @@ in sources."cliui-2.1.0" sources."colors-1.1.2" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."cycle-1.0.3" @@ -39780,7 +40063,7 @@ in ]; }) sources."uglify-to-browserify-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."verror-1.10.0" sources."window-size-0.1.0" (sources."winston-1.1.2" // { @@ -39957,7 +40240,7 @@ in sources."promise-finally-3.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" - (sources."rc-1.2.3" // { + (sources."rc-1.2.4" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -40003,7 +40286,7 @@ in dependencies = [ sources."ansi-styles-3.2.0" sources."chalk-2.3.0" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."supports-color-4.5.0" ]; }) @@ -40032,13 +40315,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.5"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.5.tgz"; - sha512 = "2p95asc8ny3p8js91asggdsb396x2hkllc76gpvf3nqrw2al85p67f4v1grlnckhjwiqj7vzcy197fq2axh37mjyq4gabq193dcrrk5"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.8.tgz"; + sha512 = "1vxvyq08n6jidg18kiph7m0bjzr4v1dh188b7zgj60mkv4x1qkqrgc8756drldaj3awmn71mwsxja0zhvdm8nqqw5finrajv8dc0j2z"; }; dependencies = [ - sources."commander-2.12.2" + sources."commander-2.13.0" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -40053,10 +40336,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.3"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.3.tgz"; - sha512 = "07wnk6qj95z58lfj51gwl26sfzx1jmb369sn5ff20gjikndvbglsyhrxlvsbdcplnwqvhajw8208xh3v4rnjlahwkzcq20sz5c81dcn"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.5.tgz"; + sha512 = "30mf9zybvwgw46nnl5cgwl8chkz32hxj5adyqwkp1gscw6k4jcv70ricjlgaj64k5j9mqjqrs00rjjddmbk33rmh73a1nr06v34fsff"; }; dependencies = [ sources."abbrev-1.1.1" @@ -40135,7 +40418,7 @@ in sources."deep-extend-0.4.2" sources."delayed-stream-0.0.5" sources."delegates-1.0.0" - sources."depd-1.1.1" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-3.4.0" (sources."diff2html-2.3.3" // { @@ -40193,7 +40476,11 @@ in sources."hoek-4.2.0" sources."hogan.js-3.0.2" sources."hosted-git-info-2.5.0" - sources."http-errors-1.6.2" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."ignore-3.3.7" @@ -40312,7 +40599,7 @@ in ]; }) sources."raw-body-2.3.2" - (sources."rc-1.2.3" // { + (sources."rc-1.2.4" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -40394,7 +40681,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."uws-0.14.5" sources."validate-npm-package-license-3.0.1" sources."validate-npm-package-name-3.0.0" @@ -40417,10 +40704,10 @@ in }) sources."wrappy-1.0.2" sources."ws-3.3.3" - sources."xmlhttprequest-ssl-1.5.4" + sources."xmlhttprequest-ssl-1.5.5" sources."y18n-3.2.1" sources."yallist-2.1.2" - (sources."yargs-10.1.1" // { + (sources."yargs-10.1.2" // { dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -40465,7 +40752,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" (sources."config-chain-1.1.11" // { @@ -40663,7 +40950,7 @@ in sources."enhanced-resolve-3.4.1" sources."errno-0.1.6" sources."error-ex-1.3.1" - sources."es5-ext-0.10.37" + sources."es5-ext-0.10.38" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-set-0.1.5" @@ -40807,7 +41094,7 @@ in sources."right-align-0.1.3" sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" sources."setimmediate-1.0.5" @@ -40821,7 +41108,7 @@ in sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" sources."stream-browserify-2.0.1" - sources."stream-http-2.7.2" + sources."stream-http-2.8.0" sources."string-width-2.1.1" sources."string_decoder-1.0.3" sources."strip-ansi-3.0.1" @@ -41066,7 +41353,7 @@ in sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.5" - sources."commander-2.12.2" + sources."commander-2.13.0" sources."common-tags-1.6.0" sources."compress-commons-1.2.2" sources."concat-map-0.0.1" @@ -41113,7 +41400,7 @@ in sources."domhandler-2.4.1" sources."domutils-1.5.1" sources."dot-prop-4.2.0" - sources."dtrace-provider-0.8.5" + sources."dtrace-provider-0.8.6" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.1" sources."ecdsa-sig-formatter-1.0.9" @@ -41121,7 +41408,7 @@ in sources."end-of-stream-1.4.1" sources."entities-1.1.1" sources."error-ex-1.3.1" - sources."es5-ext-0.10.37" + sources."es5-ext-0.10.38" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -41179,7 +41466,7 @@ in sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-1.2.2" + sources."fast-safe-stringify-1.2.3" sources."fd-slicer-1.0.1" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" @@ -41424,7 +41711,7 @@ in sources."pump-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."quick-format-unescaped-1.1.1" + sources."quick-format-unescaped-1.1.2" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -41434,7 +41721,7 @@ in }) ]; }) - sources."rc-1.2.3" + sources."rc-1.2.4" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.3" @@ -41590,7 +41877,7 @@ in sources."url-parse-lax-1.0.0" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."validate-npm-package-license-3.0.1" sources."verror-1.10.0" sources."vfile-1.4.0" @@ -41981,7 +42268,7 @@ in sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."rc-1.2.3" + sources."rc-1.2.4" sources."read-all-stream-3.1.0" sources."read-pkg-1.1.0" (sources."read-pkg-up-2.0.0" // { @@ -42011,12 +42298,12 @@ in sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" sources."scoped-regex-1.0.0" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."semver-regex-1.0.0" (sources."semver-truncate-1.1.2" // { dependencies = [ - sources."semver-5.4.1" + sources."semver-5.5.0" ]; }) sources."set-immediate-shim-1.0.1" @@ -42088,7 +42375,7 @@ in sources."url-parse-lax-1.0.0" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."validate-npm-package-license-3.0.1" sources."verror-1.10.0" sources."vinyl-1.2.0" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 7c257fdd3e5b..76362fecc82d 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -22,15 +22,6 @@ let sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; }; }; - "acorn-5.3.0" = { - name = "acorn"; - packageName = "acorn"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz"; - sha512 = "197zp88clmmxjyvhahqv32kv07q825hf87facxaq8qmvb1swfqnpyy4398dl56sr2fa44f7gjpzzlwy1szqzwww6746y3kmwb6gxs31"; - }; - }; "ajv-4.11.8" = { name = "ajv"; packageName = "ajv"; @@ -49,15 +40,6 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; - }; - }; "ansi-diff-stream-1.2.0" = { name = "ansi-diff-stream"; packageName = "ansi-diff-stream"; @@ -112,13 +94,13 @@ let sha1 = "d8a3f26615379398a1b53ca6cc1a666a0fbfe150"; }; }; - "append-tree-2.4.0" = { + "append-tree-2.4.1" = { name = "append-tree"; packageName = "append-tree"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.0.tgz"; - sha512 = "1ym9wsmz3fjv0wf675xclbnjp825cyvxp3a9x8af96yms45dbk8c79jrx5vgdii1zimcnr2pg305g9sw79k5yqah9267k71lsz5vv35"; + url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.1.tgz"; + sha512 = "2zb14nlfxs726ng8jhfpf6n9b9kw32smg2krcl0vj90dfrkcc20fm36j2zgdd49b2ln1z4jz2wvvy4qgss14zzfr3rps719h6vlyjg7"; }; }; "aproba-1.2.0" = { @@ -283,15 +265,6 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "base64-to-uint8array-1.0.0" = { - name = "base64-to-uint8array"; - packageName = "base64-to-uint8array"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-to-uint8array/-/base64-to-uint8array-1.0.0.tgz"; - sha512 = "01a4ip2ivflpjsx4flnww5fqvdcsy2sqnjgp2cii6b2gnkkccr02vbf2y8r2wlcab4pb8x47qb3jpahca61v584bmz9xcwyqx0xdf3n"; - }; - }; "bcrypt-pbkdf-1.0.1" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; @@ -319,13 +292,13 @@ let sha1 = "ae29e9382a7ba4898de9f48bb23fd338c4fbdcf8"; }; }; - "bittorrent-dht-7.8.2" = { + "bittorrent-dht-7.10.0" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "7.8.2"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.8.2.tgz"; - sha512 = "33jcwf8rh9r7m810lw75s1ij9k0bv1kjmnc24488i6nd1ri9a1p2gmci5z1xdfriyb8j7x8h1ch3aj5a1chdglwn6pbsll7cx4j6wd4"; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.10.0.tgz"; + sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; "blake2b-2.1.2" = { @@ -337,13 +310,13 @@ let sha1 = "6880eddca35cfede92c4fb2724221334f989145a"; }; }; - "blake2b-wasm-1.1.4" = { + "blake2b-wasm-1.1.5" = { name = "blake2b-wasm"; packageName = "blake2b-wasm"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.4.tgz"; - sha512 = "3hgcz1c3h2hxgavmlf5r4dwk0wy2sg9y4lfs5ifj4spdlwyy3ki9i1i4hjaw0029c896d6yw424mw2j1nf4qyibkz2lbh1ws6z6rdlg"; + url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.5.tgz"; + sha512 = "2a8y5gcrrzkv35qa7s8x34m4mmb2nbincn2amxsjwfgqijnqd57hsh7id6p5y21sxfqf1ffjcfb5p8k04n3h7g81mrfvn4207my65s7"; }; }; "block-stream-0.0.9" = { @@ -409,15 +382,6 @@ let sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; }; }; - "brfs-1.4.3" = { - name = "brfs"; - packageName = "brfs"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/brfs/-/brfs-1.4.3.tgz"; - sha1 = "db675d6f5e923e6df087fca5859c9090aaed3216"; - }; - }; "browser-stdout-1.3.0" = { name = "browser-stdout"; packageName = "browser-stdout"; @@ -436,15 +400,6 @@ let sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; }; }; - "buffer-equal-0.0.1" = { - name = "buffer-equal"; - packageName = "buffer-equal"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; - sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; - }; - }; "buffer-equals-1.0.4" = { name = "buffer-equals"; packageName = "buffer-equals"; @@ -778,15 +733,6 @@ let sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq"; }; }; - "dat-link-resolve-1.1.1" = { - name = "dat-link-resolve"; - packageName = "dat-link-resolve"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-1.1.1.tgz"; - sha512 = "3a3rmwv687r07qnzdp4k15ng7xbbgibssjiqjvhhhrxq5mc22m34g7hi1h15rqjs3zzlajn291j3xv9af22j3fynpygky13zzvxj367"; - }; - }; "dat-link-resolve-2.1.0" = { name = "dat-link-resolve"; packageName = "dat-link-resolve"; @@ -940,13 +886,13 @@ let sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338"; }; }; - "discovery-channel-5.4.6" = { + "discovery-channel-5.4.7" = { name = "discovery-channel"; packageName = "discovery-channel"; - version = "5.4.6"; + version = "5.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.6.tgz"; - sha1 = "1b0f25e58124507e861b6dc3ecb744366bb53cad"; + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.7.tgz"; + sha512 = "3c8npbdr7r6725kkj76h5zy72l3gd8ndb3dy4dwbapxapfzccl9f6iy0zdy3wxywcfb6cc64w4mf089v00rcr1aqcjdlvn483pnzs78"; }; }; "discovery-swarm-4.4.2" = { @@ -967,22 +913,22 @@ let sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg"; }; }; - "dns-packet-1.3.0" = { + "dns-packet-1.3.1" = { name = "dns-packet"; packageName = "dns-packet"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.0.tgz"; - sha512 = "0qcs9idjrq4z4gmc95kaarjl2xahwl72136h2frf1hbj1kgfcs8yjv9crfsr6iw8jyyvvvbn4hj1yfqwnvz3amrcx1mb56yklaqa8xv"; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; + sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; }; }; - "dns-socket-1.6.2" = { + "dns-socket-1.6.3" = { name = "dns-socket"; packageName = "dns-socket"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.2.tgz"; - sha512 = "0ibd2ndmlqbk96vdcimsl4w1njplh9gplvqa5f7653km79f9kqpd6d7f0f3lq1sz548lqcbjfcgcr7fc9159b4gzzk1g86kjxzxmmk6"; + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz"; + sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy"; }; }; "dns-txt-2.0.2" = { @@ -1003,15 +949,6 @@ let sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; }; - "duplexer2-0.0.2" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; - sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; - }; - }; "duplexify-3.5.3" = { name = "duplexify"; packageName = "duplexify"; @@ -1048,69 +985,6 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "escodegen-0.0.28" = { - name = "escodegen"; - packageName = "escodegen"; - version = "0.0.28"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz"; - sha1 = "0e4ff1715f328775d6cab51ac44a406cd7abffd3"; - }; - }; - "escodegen-1.3.3" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; - sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; - }; - }; - "esprima-1.0.4" = { - name = "esprima"; - packageName = "esprima"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; - sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; - }; - }; - "esprima-1.1.1" = { - name = "esprima"; - packageName = "esprima"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; - sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; - }; - }; - "estraverse-1.3.2" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz"; - sha1 = "37c2b893ef13d723f276d878d60d8535152a6c42"; - }; - }; - "estraverse-1.5.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; - sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; - }; - }; - "esutils-1.0.0" = { - name = "esutils"; - packageName = "esutils"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; - sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; - }; - }; "expand-brackets-0.1.5" = { name = "expand-brackets"; packageName = "expand-brackets"; @@ -1165,15 +1039,6 @@ let sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; }; - "falafel-2.1.0" = { - name = "falafel"; - packageName = "falafel"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz"; - sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; - }; - }; "fast-deep-equal-1.0.0" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; @@ -1264,15 +1129,6 @@ let sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; }; }; - "foreach-2.0.5" = { - name = "foreach"; - packageName = "foreach"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; - sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; - }; - }; "forever-agent-0.6.1" = { name = "forever-agent"; packageName = "forever-agent"; @@ -1336,15 +1192,6 @@ let sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; }; }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; - }; - }; "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; @@ -1354,24 +1201,6 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; - "generate-function-2.0.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -1498,15 +1327,6 @@ let sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; - "has-1.0.1" = { - name = "has"; - packageName = "has"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; - sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; - }; - }; "has-flag-2.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -1597,31 +1417,31 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "hypercore-6.11.0" = { + "hypercore-6.12.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.11.0"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.11.0.tgz"; - sha512 = "0q0972kpj73qndhwb3msk3xkfpx1zldfw1ld815kncb0lbr7mdhawjz701y230zji0lamnznrv61cmcnx2zlqjhvcyrf9fyyr93r6ds"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.0.tgz"; + sha512 = "00xsmbx8jcjzsibwwgknlpjvndb7zv6jdxik5skqnbizbdssvcwa2r5a7gd1cf7mpr2827067sxqqca9fmmknjnin2vvm16yb1pn5g8"; }; }; - "hypercore-protocol-6.5.0" = { + "hypercore-protocol-6.5.1" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.5.0.tgz"; - sha512 = "0yny0rl9fgh2hyv0clfzp6z6zb7pmmw1494h76n37gqb37awz73zclfcmad75dj60r04rlfxr9syvgim7zlpnb0qvcqlcpyfwnv65l0"; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.5.1.tgz"; + sha512 = "2xy5g8l7wws0bxrvj3pv90qsyb0g12zs8ahhcmd732jdq5y9f1j5jvywp2bvdcwfd0x4kh7hwqz7ma1hir8sh30nhbi5w6w4ig0qqyl"; }; }; - "hyperdrive-9.12.0" = { + "hyperdrive-9.12.1" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "9.12.0"; + version = "9.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.0.tgz"; - sha512 = "285nxd3xfdr51r8av9d7dal8hqa3lfrac1m46gn9b73ljwivlhhsxpbrqyhdf80v7bnmw8vpy61x77gm8cfmwv5z8pffmmnla2p8l5y"; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.1.tgz"; + sha512 = "12z4ajhk7h587vm8vdm766xy59fwv9whbnmhc4a8ns51gx3zavgspk48fywffk3p8kk16pnam3lk8zx17daxb281lll1qwa1mw73061"; }; }; "hyperdrive-http-4.2.2" = { @@ -1804,15 +1624,6 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - }; "is-string-1.0.4" = { name = "is-string"; packageName = "is-string"; @@ -1831,15 +1642,6 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -2182,13 +1984,13 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; - "multicast-dns-6.2.1" = { + "multicast-dns-6.2.2" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz"; - sha512 = "3gm760icxiv0bkil78dgsjkss4vwg3ya76jl3v8a5fa86wdv0ksvi1n7lnzisk4x4sa8chxnfxasyfpgay45ilaykqz2zbc8xrgypdr"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.2.tgz"; + sha512 = "06b9ps5a1ymag21szz55z4xzs2ncp0frcqsaldnggmz0m5ijhjv8f553cpkp9zkm37av1pm2y8pn70jbfzk888n1hap6i321babhcy5"; }; }; "multicb-1.2.2" = { @@ -2362,33 +2164,6 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "object-inspect-0.4.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"; - sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec"; - }; - }; - "object-keys-0.4.0" = { - name = "object-keys"; - packageName = "object-keys"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"; - sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336"; - }; - }; - "object-keys-1.0.11" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; - sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; - }; - }; "object.omit-2.0.1" = { name = "object.omit"; packageName = "object.omit"; @@ -2470,15 +2245,6 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "path-parse-1.0.5" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; - }; - }; "performance-now-0.2.0" = { name = "performance-now"; packageName = "performance-now"; @@ -2578,22 +2344,13 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "protocol-buffers-3.2.1" = { - name = "protocol-buffers"; - packageName = "protocol-buffers"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers/-/protocol-buffers-3.2.1.tgz"; - sha1 = "37258e17e24a082f06ebb17731e92851d1c76889"; - }; - }; - "protocol-buffers-schema-3.3.2" = { - name = "protocol-buffers-schema"; - packageName = "protocol-buffers-schema"; - version = "3.3.2"; + "protocol-buffers-encodings-1.1.0" = { + name = "protocol-buffers-encodings"; + packageName = "protocol-buffers-encodings"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz"; - sha512 = "3rvq2xsb9y9vfy8vgf6ja08362bjcg132kxcwcfdik1j6j17dvlk535agpwiqzj47g1d7shcwq5h6zk5jy1ny25n4z6bzh1rfkv5mjx"; + url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.0.tgz"; + sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a"; }; }; "pump-1.0.3" = { @@ -2605,6 +2362,15 @@ let sha512 = "2mj8bx34brvh97wd2xcn5phgyd2wh3l1ma2xfd0m53yf68w1izp46pmz0s9az5f36mhlvl0mvfd6hp5abhi75fhyrz9wyx6jnx0jkgj"; }; }; + "pump-2.0.0" = { + name = "pump"; + packageName = "pump"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-2.0.0.tgz"; + sha512 = "21jb2lq6ajsmcqs5j3yq4gpfzkpn9zfy514dmwd0rlh6r8c6iknng19c3kmpb607rk2xap7cw467qz5di30zki40phjbdmg6fk35ip8"; + }; + }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -2632,24 +2398,6 @@ let sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; - "quote-stream-0.0.0" = { - name = "quote-stream"; - packageName = "quote-stream"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/quote-stream/-/quote-stream-0.0.0.tgz"; - sha1 = "cde29e94c409b16e19dc7098b89b6658f9721d3b"; - }; - }; - "quote-stream-1.0.2" = { - name = "quote-stream"; - packageName = "quote-stream"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz"; - sha1 = "84963f8c9c26b942e153feeb53aae74652b7e0b2"; - }; - }; "random-access-file-1.8.1" = { name = "random-access-file"; packageName = "random-access-file"; @@ -2695,13 +2443,13 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "rc-1.2.3" = { + "rc-1.2.4" = { name = "rc"; packageName = "rc"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.3.tgz"; - sha1 = "51575a900f8dd68381c710b4712c2154c3e2035b"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; + sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; }; }; "read-1.0.7" = { @@ -2713,24 +2461,6 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; - "readable-stream-1.0.34" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.0.34"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; - sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; "readable-stream-2.3.3" = { name = "readable-stream"; packageName = "readable-stream"; @@ -2821,15 +2551,6 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.5.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; - sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; - }; - }; "revalidator-0.1.8" = { name = "revalidator"; packageName = "revalidator"; @@ -2848,13 +2569,13 @@ let sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; - "rusha-0.8.11" = { + "rusha-0.8.12" = { name = "rusha"; packageName = "rusha"; - version = "0.8.11"; + version = "0.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.11.tgz"; - sha1 = "caa8963b1dbfd229d90626dd3f2a784430d6058d"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.12.tgz"; + sha1 = "5d838ce1fce8b145674ee771eaad5bcb2575e64b"; }; }; "safe-buffer-5.1.1" = { @@ -2875,13 +2596,13 @@ let sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; }; - "semver-5.4.1" = { + "semver-5.5.0" = { name = "semver"; packageName = "semver"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; }; "set-blocking-2.0.0" = { @@ -2902,15 +2623,6 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; - "shallow-copy-0.0.1" = { - name = "shallow-copy"; - packageName = "shallow-copy"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"; - sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; - }; - }; "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; @@ -3028,15 +2740,6 @@ let sha1 = "17c742ff7cf187e2f59a15df9b81f17a62ce0899"; }; }; - "source-map-0.1.43" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.43"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; - sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; - }; - }; "sparse-bitfield-3.0.3" = { name = "sparse-bitfield"; packageName = "sparse-bitfield"; @@ -3073,24 +2776,6 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; - "static-eval-0.2.4" = { - name = "static-eval"; - packageName = "static-eval"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/static-eval/-/static-eval-0.2.4.tgz"; - sha1 = "b7d34d838937b969f9641ca07d48f8ede263ea7b"; - }; - }; - "static-module-1.5.0" = { - name = "static-module"; - packageName = "static-module"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/static-module/-/static-module-1.5.0.tgz"; - sha1 = "27da9883c41a8cd09236f842f0c1ebc6edf63d86"; - }; - }; "status-logger-3.1.1" = { name = "status-logger"; packageName = "status-logger"; @@ -3154,15 +2839,6 @@ let sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; }; }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; "string_decoder-1.0.3" = { name = "string_decoder"; packageName = "string_decoder"; @@ -3262,15 +2938,6 @@ let sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7"; }; }; - "through2-0.4.2" = { - name = "through2"; - packageName = "through2"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz"; - sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b"; - }; - }; "through2-2.0.3" = { name = "through2"; packageName = "through2"; @@ -3469,13 +3136,13 @@ let sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; }; }; - "uuid-3.1.0" = { + "uuid-3.2.1" = { name = "uuid"; packageName = "uuid"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; - sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; + sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; }; }; "varint-3.0.1" = { @@ -3577,15 +3244,6 @@ let sha512 = "35rg34yxk4ag0qclk7bqxirgr3dgypcvkisqqj2g3y0ma16pkfy81iv79pcwff5p4spygwjh2m9v37llq7367fypqrx89s9kscwal43"; }; }; - "xtend-2.1.2" = { - name = "xtend"; - packageName = "xtend"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"; - sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"; - }; - }; "xtend-4.0.1" = { name = "xtend"; packageName = "xtend"; @@ -3635,26 +3293,20 @@ in dat = nodeEnv.buildNodePackage { name = "dat"; packageName = "dat"; - version = "13.9.2"; + version = "13.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat/-/dat-13.9.2.tgz"; - sha512 = "05x3ij83al1f0r7fiaq788q4k81vlbmydsa1g829pq0q6795p57b12mmmx8nvc8khbbv1iphr065c7h3d7kc9ylps39xn1qdg64jz90"; + url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz"; + sha512 = "05s22v6dv8mgh50m49cadbiw6ykzjl9q81j3zd4zw5zvpj9zl8xbpazw7kbyvzh58rhr6ydl44llghkl24vpn564gqbig3gnxxgmh8z"; }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."acorn-5.3.0" sources."ajv-5.5.2" - sources."amdefine-1.0.1" sources."ansi-diff-stream-1.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.0" sources."anymatch-1.3.2" sources."ap-0.1.0" - (sources."append-tree-2.4.0" // { - dependencies = [ - sources."xtend-4.0.1" - ]; - }) + sources."append-tree-2.4.1" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-lru-1.1.1" @@ -3667,17 +3319,16 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."balanced-match-1.0.0" - sources."base64-to-uint8array-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."bencode-1.0.0" sources."bitfield-rle-2.1.0" - (sources."bittorrent-dht-7.8.2" // { + (sources."bittorrent-dht-7.10.0" // { dependencies = [ sources."debug-3.1.0" ]; }) sources."blake2b-2.1.2" - sources."blake2b-wasm-1.1.4" + sources."blake2b-wasm-1.1.5" sources."body-0.1.0" sources."boom-4.3.1" sources."brace-expansion-1.1.8" @@ -3686,9 +3337,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."brfs-1.4.3" sources."buffer-alloc-unsafe-1.0.0" - sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.3" @@ -3722,16 +3371,18 @@ in dependencies = [ sources."debug-2.6.9" sources."lru-2.0.1" + sources."pump-1.0.3" ]; }) - sources."dat-encoding-4.0.2" + sources."dat-encoding-5.0.1" sources."dat-ignore-2.0.0" (sources."dat-json-1.0.1" // { dependencies = [ + sources."dat-encoding-4.0.2" sources."debug-2.6.9" ]; }) - (sources."dat-link-resolve-1.1.1" // { + (sources."dat-link-resolve-2.1.0" // { dependencies = [ sources."debug-2.6.9" ]; @@ -3739,40 +3390,22 @@ in sources."dat-log-1.1.1" (sources."dat-node-3.5.6" // { dependencies = [ - sources."dat-encoding-5.0.1" - (sources."dat-link-resolve-2.1.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."esprima-1.0.4" - sources."estraverse-1.3.2" - sources."isarray-0.0.1" sources."minimist-0.0.8" - sources."object-keys-0.4.0" - sources."readable-stream-1.0.34" - sources."string_decoder-0.10.31" + sources."pump-1.0.3" sources."unordered-set-2.0.0" sources."varint-5.0.0" ]; }) sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.0" - (sources."dat-storage-1.0.3" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.3" - sources."string_decoder-1.0.3" - sources."xtend-2.1.2" - ]; - }) + sources."dat-storage-1.0.3" sources."dat-swarm-defaults-1.0.0" sources."datland-swarm-defaults-1.0.2" sources."debug-3.1.0" sources."deep-equal-0.2.2" sources."delayed-stream-1.0.0" sources."directory-index-html-2.1.0" - sources."discovery-channel-5.4.6" + sources."discovery-channel-5.4.7" (sources."discovery-swarm-4.4.2" // { dependencies = [ sources."thunky-0.1.0" @@ -3783,30 +3416,20 @@ in sources."thunky-0.1.0" ]; }) - sources."dns-packet-1.3.0" - sources."dns-socket-1.6.2" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" - (sources."duplexer2-0.0.2" // { - dependencies = [ - sources."readable-stream-1.1.14" - ]; - }) sources."duplexify-3.5.3" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.3.3" - sources."esprima-1.1.1" - sources."estraverse-1.5.1" - sources."esutils-1.0.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" sources."extend-3.0.1" sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."falafel-2.1.0" sources."fast-deep-equal-1.0.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-read-stream-1.1.0" @@ -3816,14 +3439,10 @@ in sources."for-each-0.3.2" sources."for-in-1.0.2" sources."for-own-0.1.5" - sources."foreach-2.0.5" sources."forever-agent-0.6.1" sources."form-data-2.3.1" sources."from2-2.3.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" sources."getpass-0.1.7" sources."glob-7.1.2" sources."glob-base-0.3.0" @@ -3831,23 +3450,19 @@ in sources."global-4.3.2" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-1.0.1" sources."has-flag-2.0.0" sources."hawk-6.0.2" sources."hoek-4.2.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.11.0" // { + (sources."hypercore-6.12.0" // { dependencies = [ sources."varint-5.0.0" ]; }) - sources."hypercore-protocol-6.5.0" - (sources."hyperdrive-9.12.0" // { + sources."hypercore-protocol-6.5.1" + (sources."hyperdrive-9.12.1" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.3" - sources."string_decoder-1.0.3" sources."varint-4.0.1" ]; }) @@ -3873,7 +3488,6 @@ in sources."is-number-2.1.0" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-property-1.0.2" sources."is-string-1.0.4" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -3903,17 +3517,11 @@ in sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mirror-folder-2.1.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.3" - sources."string_decoder-1.0.3" - ]; - }) + sources."mirror-folder-2.1.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" - sources."multicast-dns-6.2.1" + sources."multicast-dns-6.2.2" sources."multicb-1.2.2" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" @@ -3932,15 +3540,12 @@ in sources."node-gyp-build-3.2.2" sources."normalize-path-2.1.1" sources."oauth-sign-0.8.2" - sources."object-inspect-0.4.0" - sources."object-keys-1.0.11" sources."object.omit-2.0.1" sources."once-1.4.0" sources."os-homedir-1.0.2" sources."parse-glob-3.0.4" sources."parse-headers-2.0.1" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" sources."performance-now-2.1.0" sources."pkginfo-0.4.1" sources."preserve-0.2.0" @@ -3954,12 +3559,10 @@ in sources."async-1.0.0" ]; }) - sources."protocol-buffers-3.2.1" - sources."protocol-buffers-schema-3.3.2" - sources."pump-1.0.3" + sources."protocol-buffers-encodings-1.1.0" + sources."pump-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."quote-stream-1.0.2" (sources."random-access-file-1.8.1" // { dependencies = [ sources."debug-2.6.9" @@ -3985,12 +3588,10 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."request-2.83.0" - sources."resolve-1.5.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" - sources."rusha-0.8.11" + sources."rusha-0.8.12" sources."safe-buffer-5.1.1" - sources."shallow-copy-0.0.1" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.0" sources."siphash24-1.1.0" @@ -4001,22 +3602,10 @@ in sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.1.0" sources."sorted-indexof-1.0.0" - sources."source-map-0.1.43" sources."sparse-bitfield-3.0.3" sources."speedometer-1.0.0" sources."sshpk-1.13.1" sources."stack-trace-0.0.10" - (sources."static-eval-0.2.4" // { - dependencies = [ - sources."escodegen-0.0.28" - ]; - }) - (sources."static-module-1.5.0" // { - dependencies = [ - sources."quote-stream-0.0.0" - sources."through2-0.4.2" - ]; - }) sources."status-logger-3.1.1" sources."stream-collector-1.0.1" sources."stream-each-1.2.2" @@ -4056,7 +3645,7 @@ in sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.6.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."varint-3.0.1" sources."verror-1.10.0" (sources."winston-2.1.1" // { @@ -4117,10 +3706,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz"; - sha512 = "0s6517vczlh2vm9syq4kpwkwrr7panih1cip6aq8qjn9cw2gvbl14lql0y81dh10ims8p1f2qm4vkbifcrs2hw1v7cca9j71n76f5fi"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.0.tgz"; + sha512 = "3rxvm15qz9qdiyihc9pq4kc008iz89cqdqjlca43swmk3fc7bydlaqk1qyhaj19r5m8cxxrpiwxz5cwrp9im26fin4sgqdfbxs7ch5s"; }; dependencies = [ sources."balanced-match-1.0.0" @@ -4284,7 +3873,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."verror-1.10.0" sources."which-1.3.0" sources."wide-align-1.1.2" @@ -4409,7 +3998,7 @@ in sources."process-nextick-args-1.0.7" sources."punycode-1.4.1" sources."qs-6.4.0" - (sources."rc-1.2.3" // { + (sources."rc-1.2.4" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -4418,7 +4007,7 @@ in sources."request-2.81.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."sntp-1.0.9" @@ -4439,7 +4028,7 @@ in sources."tweetnacl-0.14.5" sources."uid-number-0.0.6" sources."util-deprecate-1.0.2" - sources."uuid-3.1.0" + sources."uuid-3.2.1" sources."verror-1.10.0" sources."wide-align-1.1.2" sources."wrappy-1.0.2" @@ -4456,10 +4045,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix new file mode 100644 index 000000000000..dbd2e36b7b84 --- /dev/null +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -0,0 +1,122 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, fetchzip +, alembic +, ipython +, jinja2 +, python-oauth2 +, pamela +, sqlalchemy +, tornado +, traitlets +, requests +, pythonOlder +, nodejs-8_x +, nodePackages +}: + +let + # js/css assets that setup.py tries to fetch via `npm install` when building + # from source. + bootstrap = + fetchzip { + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz"; + sha256 = "0r7s54bbf68ri1na9bbabyf12mcpb6zk5ja2q6z82aw1fa4xi3yd"; + }; + font-awesome = + fetchzip { + url = "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz"; + sha256 = "1xnxbdlfdd60z5ix152m8r2kk9dkwlqwpypky1mm3dv64ajnzdbk"; + }; + jquery = + fetchzip { + url = "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz"; + sha256 = "1j6y18miwzafdj8kfpwbmbn9qvgnbnpc7l4arqrhqj33m04xrlgi"; + }; + moment = + fetchzip { + url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; + sha256 = "1b4vyvs24v6y92pf2iqjm5aa7jg7khcpspn00girc7lpi917f9vw"; + }; + requirejs = + fetchzip { + url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.4.tgz"; + sha256 = "0q6mkj0iv341kks06dya6lfs2kdw0n6vc7n4a7aa3ia530fk9vja"; + }; + +in + +buildPythonPackage rec { + pname = "jupyterhub"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "100cf18d539802807a45450d38fefbb376cf1c810f3b1b31be31638829a5c69c"; + }; + + # Most of this only applies when building from source (e.g. js/css assets are + # pre-built and bundled in the official release tarball on pypi). + # + # Stuff that's always needed: + # * At runtime, we need configurable-http-proxy, so we substitute the store + # path. + # + # Other stuff that's only needed when building from source: + # * js/css assets are fetched from npm. + # * substitute store path for `lessc` commmand. + # * set up NODE_PATH so `lessc` can find `less-plugin-clean-css`. + # * don't run `npm install`. + preBuild = '' + export NODE_PATH=${nodePackages.less-plugin-clean-css}/lib/node_modules + + substituteInPlace jupyterhub/proxy.py --replace \ + "'configurable-http-proxy'" \ + "'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'" + + substituteInPlace jupyterhub/tests/test_proxy.py --replace \ + "'configurable-http-proxy'" \ + "'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'" + + substituteInPlace setup.py --replace \ + "'npm', 'run', 'lessc', '--'" \ + "'${nodePackages.less}/bin/lessc'" + + substituteInPlace setup.py --replace \ + "'npm', 'install', '--progress=false'" \ + "'true'" + + declare -A deps + deps[bootstrap]=${bootstrap} + deps[font-awesome]=${font-awesome} + deps[jquery]=${jquery} + deps[moment]=${moment} + deps[requirejs]=${requirejs} + + mkdir -p share/jupyter/hub/static/components + for dep in "''${!deps[@]}"; do + if [ ! -e share/jupyter/hub/static/components/$dep ]; then + cp -r ''${deps[$dep]} share/jupyter/hub/static/components/$dep + fi + done + ''; + + propagatedBuildInputs = [ + alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado + traitlets + ]; + + # Disable tests because they take an excessive amount of time to complete. + doCheck = false; + + disabled = pythonOlder "3.4"; + + meta = with lib; { + description = "Serves multiple Jupyter notebook instances"; + homepage = http://jupyter.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie cstrahan ]; + }; +} diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix new file mode 100644 index 000000000000..38649ca19859 --- /dev/null +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -0,0 +1,24 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "python-oauth2"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a1d0qnlgm07wq9r9bbm5jqkqry73w34m87p0141bk76lg7bb0sm"; + }; + # attempts to run mysql + doCheck = false; + + meta = with lib; { + description = "Framework that aims at making it easy to provide authentication via OAuth 2.0 within an application stack"; + homepage = https://github.com/wndhydrnt/python-oauth2; + license = licenses.mit; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 66e2595f8d2f..6f1a8d9904ec 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "raven"; - version = "6.4.0"; + version = "6.5.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "00m985w9fja2jf8dpvdhygcr26rwabxkgvcc2v5j6v7d6lrvpvdq"; + sha256 = "0fsgdq1dcjh33rqg5fkzg9b86zhpsvzrdwl84ggin69r8w8pbnl4"; }; # way too many dependencies to run tests diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix new file mode 100644 index 000000000000..eb001410ce5f --- /dev/null +++ b/pkgs/development/python-modules/us/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jellyfish +}: + +buildPythonPackage rec { + pname = "us"; + version = "1.0.0"; + + propagatedBuildInputs = [ jellyfish ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1niglalkp7pinibzbxjdz9mxx9qmwkrh8884dag3kr72cfkrpp09"; + }; + + meta = { + description = "A package for easily working with US and state metadata"; + longDescription = '' + all US states and territories, postal abbreviations, Associated Press style + abbreviations, FIPS codes, capitals, years of statehood, time zones, phonetic + state name lookup, is contiguous or continental, URLs to shapefiles for state, + census, congressional districts, counties, and census tracts + ''; + homepage = https://github.com/unitedstates/python-us/; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index ddb1555dd832..6e3d77b3be25 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2155,6 +2155,18 @@ rec { }; + gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "gitv-2017-11-26"; + src = fetchgit { + url = "https://github.com/gregsexton/gitv"; + rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35"; + sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w"; + }; + dependencies = ["fugitive"]; + + }; + + matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "matchit-zip"; src = fetchurl { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4c5a79091c99..0f73bf145ee1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -67,6 +67,7 @@ "github:google/vim-codefmt" "github:google/vim-jsonnet" "github:google/vim-maktaba" +"github:gregsexton/gitv" "github:heavenshell/vim-jsdoc" "github:hecal3/vim-leader-guide" "github:idris-hackers/idris-vim" diff --git a/pkgs/os-specific/linux/kernel/perf-tools-fix-build-with-arch-x86_64.patch b/pkgs/os-specific/linux/kernel/perf-tools-fix-build-with-arch-x86_64.patch new file mode 100644 index 000000000000..6d1b6835856b --- /dev/null +++ b/pkgs/os-specific/linux/kernel/perf-tools-fix-build-with-arch-x86_64.patch @@ -0,0 +1,255 @@ +From bfb560d4184c5371f0628c2473eacfb9b4ee8519 Mon Sep 17 00:00:00 2001 +From: Jiada Wang <jiada_wang@mentor.com> +Date: Sun, 9 Apr 2017 20:02:37 -0700 +Subject: [PATCH] perf tools: Fix build with ARCH=x86_64 + +With commit: 0a943cb10ce78 (tools build: Add HOSTARCH Makefile variable) +when building for ARCH=x86_64, ARCH=x86_64 is passed to perf instead of +ARCH=x86, so the perf build process searchs header files from +tools/arch/x86_64/include, which doesn't exist. + +The following build failure is seen: + + In file included from util/event.c:2:0: + tools/include/uapi/linux/mman.h:4:27: fatal error: uapi/asm/mman.h: No such file or directory + compilation terminated. + +Fix this issue by using SRCARCH instead of ARCH in perf, just like the +main kernel Makefile and tools/objtool's. + +Signed-off-by: Jiada Wang <jiada_wang@mentor.com> +Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> +Acked-by: Jiri Olsa <jolsa@kernel.org> +Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> +Cc: Andi Kleen <ak@linux.intel.com> +Cc: Eugeniu Rosca <erosca@de.adit-jv.com> +Cc: Jan Stancek <jstancek@redhat.com> +Cc: Masami Hiramatsu <mhiramat@kernel.org> +Cc: Peter Zijlstra <peterz@infradead.org> +Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> +Cc: Rui Teng <rui.teng@linux.vnet.ibm.com> +Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> +Cc: Wang Nan <wangnan0@huawei.com> +Fixes: 0a943cb10ce7 ("tools build: Add HOSTARCH Makefile variable") +Link: http://lkml.kernel.org/r/1491793357-14977-2-git-send-email-jiada_wang@mentor.com +Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> +--- + tools/perf/Makefile.config | 38 +++++++++++++++++++------------------- + tools/perf/Makefile.perf | 2 +- + tools/perf/arch/Build | 2 +- + tools/perf/pmu-events/Build | 4 ++-- + tools/perf/tests/Build | 2 +- + tools/perf/util/header.c | 2 +- + 6 files changed, 25 insertions(+), 25 deletions(-) + +diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config +index cffdd9cf3ebf..ff375310efe4 100644 +--- a/tools/perf/Makefile.config ++++ b/tools/perf/Makefile.config +@@ -19,18 +19,18 @@ CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) + + include $(srctree)/tools/scripts/Makefile.arch + +-$(call detected_var,ARCH) ++$(call detected_var,SRCARCH) + + NO_PERF_REGS := 1 + + # Additional ARCH settings for ppc +-ifeq ($(ARCH),powerpc) ++ifeq ($(SRCARCH),powerpc) + NO_PERF_REGS := 0 + LIBUNWIND_LIBS := -lunwind -lunwind-ppc64 + endif + + # Additional ARCH settings for x86 +-ifeq ($(ARCH),x86) ++ifeq ($(SRCARCH),x86) + $(call detected,CONFIG_X86) + ifeq (${IS_64_BIT}, 1) + CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT -DHAVE_SYSCALL_TABLE -I$(OUTPUT)arch/x86/include/generated +@@ -43,12 +43,12 @@ ifeq ($(ARCH),x86) + NO_PERF_REGS := 0 + endif + +-ifeq ($(ARCH),arm) ++ifeq ($(SRCARCH),arm) + NO_PERF_REGS := 0 + LIBUNWIND_LIBS = -lunwind -lunwind-arm + endif + +-ifeq ($(ARCH),arm64) ++ifeq ($(SRCARCH),arm64) + NO_PERF_REGS := 0 + LIBUNWIND_LIBS = -lunwind -lunwind-aarch64 + endif +@@ -61,7 +61,7 @@ endif + # Disable it on all other architectures in case libdw unwind + # support is detected in system. Add supported architectures + # to the check. +-ifneq ($(ARCH),$(filter $(ARCH),x86 arm)) ++ifneq ($(SRCARCH),$(filter $(SRCARCH),x86 arm)) + NO_LIBDW_DWARF_UNWIND := 1 + endif + +@@ -115,9 +115,9 @@ endif + FEATURE_CHECK_CFLAGS-libbabeltrace := $(LIBBABELTRACE_CFLAGS) + FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf + +-FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi ++FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi + # include ARCH specific config +--include $(src-perf)/arch/$(ARCH)/Makefile ++-include $(src-perf)/arch/$(SRCARCH)/Makefile + + ifdef PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET + CFLAGS += -DHAVE_ARCH_REGS_QUERY_REGISTER_OFFSET +@@ -205,12 +205,12 @@ ifeq ($(DEBUG),0) + endif + + CFLAGS += -I$(src-perf)/util/include +-CFLAGS += -I$(src-perf)/arch/$(ARCH)/include ++CFLAGS += -I$(src-perf)/arch/$(SRCARCH)/include + CFLAGS += -I$(srctree)/tools/include/uapi + CFLAGS += -I$(srctree)/tools/include/ +-CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/uapi +-CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/ +-CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/ ++CFLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi ++CFLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/ ++CFLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/ + + # $(obj-perf) for generated common-cmds.h + # $(obj-perf)/util for generated bison/flex headers +@@ -321,7 +321,7 @@ ifndef NO_LIBELF + + ifndef NO_DWARF + ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) +- msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); ++ msg := $(warning DWARF register mappings have not been defined for architecture $(SRCARCH), DWARF support disabled); + NO_DWARF := 1 + else + CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS) +@@ -346,7 +346,7 @@ ifndef NO_LIBELF + CFLAGS += -DHAVE_BPF_PROLOGUE + $(call detected,CONFIG_BPF_PROLOGUE) + else +- msg := $(warning BPF prologue is not supported by architecture $(ARCH), missing regs_query_register_offset()); ++ msg := $(warning BPF prologue is not supported by architecture $(SRCARCH), missing regs_query_register_offset()); + endif + else + msg := $(warning DWARF support is off, BPF prologue is disabled); +@@ -372,7 +372,7 @@ ifdef PERF_HAVE_JITDUMP + endif + endif + +-ifeq ($(ARCH),powerpc) ++ifeq ($(SRCARCH),powerpc) + ifndef NO_DWARF + CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX + endif +@@ -453,7 +453,7 @@ else + endif + + ifndef NO_LOCAL_LIBUNWIND +- ifeq ($(ARCH),$(filter $(ARCH),arm arm64)) ++ ifeq ($(SRCARCH),$(filter $(SRCARCH),arm arm64)) + $(call feature_check,libunwind-debug-frame) + ifneq ($(feature-libunwind-debug-frame), 1) + msg := $(warning No debug_frame support found in libunwind); +@@ -717,7 +717,7 @@ ifeq (${IS_64_BIT}, 1) + NO_PERF_READ_VDSO32 := 1 + endif + endif +- ifneq ($(ARCH), x86) ++ ifneq ($(SRCARCH), x86) + NO_PERF_READ_VDSOX32 := 1 + endif + ifndef NO_PERF_READ_VDSOX32 +@@ -746,7 +746,7 @@ ifdef LIBBABELTRACE + endif + + ifndef NO_AUXTRACE +- ifeq ($(ARCH),x86) ++ ifeq ($(SRCARCH),x86) + ifeq ($(feature-get_cpuid), 0) + msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc); + NO_AUXTRACE := 1 +@@ -793,7 +793,7 @@ sysconfdir = $(prefix)/etc + ETC_PERFCONFIG = etc/perfconfig + endif + ifndef lib +-ifeq ($(ARCH)$(IS_64_BIT), x861) ++ifeq ($(SRCARCH)$(IS_64_BIT), x861) + lib = lib64 + else + lib = lib +diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf +index ef52d1e3d431..2b92ffef554b 100644 +--- a/tools/perf/Makefile.perf ++++ b/tools/perf/Makefile.perf +@@ -192,7 +192,7 @@ endif + + ifeq ($(config),0) + include $(srctree)/tools/scripts/Makefile.arch +--include arch/$(ARCH)/Makefile ++-include arch/$(SRCARCH)/Makefile + endif + + # The FEATURE_DUMP_EXPORT holds location of the actual +diff --git a/tools/perf/arch/Build b/tools/perf/arch/Build +index 109eb75cf7de..d9b6af837c7d 100644 +--- a/tools/perf/arch/Build ++++ b/tools/perf/arch/Build +@@ -1,2 +1,2 @@ + libperf-y += common.o +-libperf-y += $(ARCH)/ ++libperf-y += $(SRCARCH)/ +diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build +index 9213a1273697..999a4e878162 100644 +--- a/tools/perf/pmu-events/Build ++++ b/tools/perf/pmu-events/Build +@@ -2,7 +2,7 @@ hostprogs := jevents + + jevents-y += json.o jsmn.o jevents.o + pmu-events-y += pmu-events.o +-JDIR = pmu-events/arch/$(ARCH) ++JDIR = pmu-events/arch/$(SRCARCH) + JSON = $(shell [ -d $(JDIR) ] && \ + find $(JDIR) -name '*.json' -o -name 'mapfile.csv') + # +@@ -10,4 +10,4 @@ JSON = $(shell [ -d $(JDIR) ] && \ + # directory and create tables in pmu-events.c. + # + $(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JEVENTS) +- $(Q)$(call echo-cmd,gen)$(JEVENTS) $(ARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V) ++ $(Q)$(call echo-cmd,gen)$(JEVENTS) $(SRCARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V) +diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build +index 8a4ce492f7b2..546250a273e7 100644 +--- a/tools/perf/tests/Build ++++ b/tools/perf/tests/Build +@@ -71,7 +71,7 @@ $(OUTPUT)tests/llvm-src-relocation.c: tests/bpf-script-test-relocation.c tests/B + $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ + $(Q)echo ';' >> $@ + +-ifeq ($(ARCH),$(filter $(ARCH),x86 arm arm64 powerpc)) ++ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc)) + perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o + endif + +diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c +index 5337f49db361..28bdb48357f0 100644 +--- a/tools/perf/util/header.c ++++ b/tools/perf/util/header.c +@@ -826,7 +826,7 @@ static int write_group_desc(int fd, struct perf_header *h __maybe_unused, + + /* + * default get_cpuid(): nothing gets recorded +- * actual implementation must be in arch/$(ARCH)/util/header.c ++ * actual implementation must be in arch/$(SRCARCH)/util/header.c + */ + int __weak get_cpuid(char *buffer __maybe_unused, size_t sz __maybe_unused) + { +-- +2.15.1 + diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index e3dbba0e76e5..96927bf4be92 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -11,7 +11,7 @@ assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; - inherit (kernel) src; + inherit (kernel) src makeFlags; preConfigure = '' cd tools/perf @@ -39,10 +39,6 @@ stdenv.mkDerivation { "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" ]; - makeFlags = if stdenv.hostPlatform == stdenv.buildPlatform - then null - else "CROSS_COMPILE=${stdenv.cc.targetPrefix}"; - installFlags = "install install-man ASCIIDOC8=1"; preFixup = '' @@ -50,6 +46,9 @@ stdenv.mkDerivation { --prefix PATH : "${binutils}/bin" ''; + + patches = optional (hasPrefix "4.9" kernel.version) [ ./perf-tools-fix-build-with-arch-x86_64.patch ]; + meta = { homepage = https://perf.wiki.kernel.org/; description = "Linux tools to profile with performance counters"; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 310ce51936c6..d6c1504fdf44 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -2,7 +2,7 @@ , thin-provisioning-tools, enable_dmeventd ? false }: let - version = "2.02.176"; + version = "2.02.177"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "0wx4rvy4frdmb66znh2xms2j2n06sm361ki6l5ks4y1ciii87kny"; + sha256 = "1wl0isn0yz5wvglwylnlqkppafwmvhliq5bd92vjqp5ir4za49a0"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 919ddc1c3df0..5c7b2e69edf2 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "04bsb7g6mh6dwk023v1rbdcjwp898y6ixdvrd7nxzm186qpycpnn"; + sha256 = "0nbsfm2jh5gjy2wh79f35rqk3c3z15lymmcz3gviw0jaxdv6drzw"; }; buildInputs = [ diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 5b2335c73f6f..eb8275b94028 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "matterbridge-${version}"; - version = "1.4.1"; + version = "1.6.3"; goPackagePath = "github.com/42wim/matterbridge"; src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; - sha256 = "0m0phv8rngrp9gfn71gd2z184n60rng1fmvmv5nkmzsclr2y7x8b"; + sha256 = "1d2wrfq07kk5l19w2d6yyjcdvn9b39cji1k5vzsfq0xkdb6b8spb"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 10eca3d70024..1f52d83f1201 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -3,18 +3,19 @@ , gnupg ? null , goobook ? null , khard ? null +, mu ? null }: let - version = "0.45.3"; + version = "0.46"; in with stdenv.lib; with perlPackages; stdenv.mkDerivation { name = "lbdb-${version}"; src = fetchurl { - url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz"; - sha256 = "01lx1nb5nlhwz663v35gg7crd36c78hnipq4z0dqyb9wjigwwg9k"; + url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; + sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi"; }; buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ] @@ -22,12 +23,14 @@ stdenv.mkDerivation { ++ optional (abook != null) abook ++ optional (gnupg != null) gnupg ++ optional (goobook != null) goobook - ++ optional (khard != null) khard; + ++ optional (khard != null) khard + ++ optional (mu != null) mu; configureFlags = [ ] ++ optional (abook != null) "--with-abook" ++ optional (gnupg != null) "--with-gpg" ++ optional (goobook != null) "--with-goobook" - ++ optional (khard != null) "--with-khard"; + ++ optional (khard != null) "--with-khard" + ++ optional (mu != null) "--with-mu"; patches = [ ./add-methods-to-rc.patch ]; postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : " diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 66057e5c76e7..251268b6f304 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.15.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "02nyk76q2ag0495ph62i0jij27nxpy6qvryjp25wah8f69k7bgfs"; + sha256 = "1yl5h7mls50vkg7x5510mljmgsm02arqhcanwkrqw4ilwvcp1mgz"; }; buildInputs = [ boost zlib openssl ]; diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index e60c4eecbaf6..cfdef4dd5613 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation { cp ./nix-info $out/bin/nix-info ''; + preferLocalBuild = true; + meta = { platforms = lib.platforms.all; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a36547af80dd..25fb245eb9e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2764,7 +2764,9 @@ with pkgs; i2p = callPackage ../tools/networking/i2p {}; - i2pd = callPackage ../tools/networking/i2pd {}; + i2pd = callPackage ../tools/networking/i2pd { + boost = boost165; + }; i-score = libsForQt5.callPackage ../applications/audio/i-score { }; @@ -3523,6 +3525,8 @@ with pkgs; modsecurity_standalone = callPackage ../tools/security/modsecurity { }; + molden = callPackage ../applications/science/chemistry/molden { }; + molly-guard = callPackage ../os-specific/linux/molly-guard { }; moneyplex = callPackage ../applications/office/moneyplex { }; @@ -9867,6 +9871,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; }; + libsnark = callPackage ../development/libraries/libsnark { }; + libsodium = callPackage ../development/libraries/libsodium { }; libsoup = callPackage ../development/libraries/libsoup { }; @@ -10957,7 +10963,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { }; + SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { + inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; + }; SDL2_net = callPackage ../development/libraries/SDL2_net { }; @@ -15749,7 +15757,7 @@ with pkgs; inherit (kdeApplications) akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b - kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf keditbookmarks + kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle; @@ -15846,7 +15854,7 @@ with pkgs; lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; - lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; }; + lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; }; lbzip2 = callPackage ../tools/compression/lbzip2 { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index be25ad03dc93..8687730b94e1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8068,10 +8068,10 @@ let self = _self // overrides; _self = with self; { }; LogContextual = buildPerlPackage rec { - name = "Log-Contextual-0.008000"; + name = "Log-Contextual-0.008001"; src = fetchurl { url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; - sha256 = "acd804508740e35c208e0cff575f3dbca2e01b8e64ec00eec3f88c7c4e3d656c"; + sha256 = "b93cbcfbb8796d51c836e3b00243cda5630808c152c14eee5f20ca09c9451993"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 125d89fe800c..8cecd533146e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5971,6 +5971,12 @@ in { sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y"; }; + postUnpack = '' + substituteInPlace $sourceRoot/pamela.py --replace \ + 'find_library("pam")' \ + '"${getLib pkgs.pam}/lib/libpam.so"' + ''; + doCheck = false; meta = { @@ -9511,6 +9517,8 @@ in { jupyter_core = callPackage ../development/python-modules/jupyter_core { }; + jupyterhub = callPackage ../development/python-modules/jupyterhub { }; + jsonpath_rw = buildPythonPackage rec { name = "jsonpath-rw-${version}"; version = "1.4.0"; @@ -9767,6 +9775,8 @@ in { ]; }; + python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; + python-Levenshtein = buildPythonPackage rec { name = "python-Levenshtein-${version}"; version = "0.12.0"; @@ -13742,11 +13752,6 @@ in { export PYCURL_SSL_LIBRARY=openssl ''; - #TODO no idea why this is needed - postInstall = '' - ln -s ${pkgs.openssl.out}/lib/libcrypto* $out/lib/ - ''; - meta = { homepage = http://pycurl.sourceforge.net/; description = "Python wrapper for libcurl"; @@ -22595,6 +22600,8 @@ EOF voluptuous = callPackage ../development/python-modules/voluptuous { }; pysigset = callPackage ../development/python-modules/pysigset { }; + + us = callPackage ../development/python-modules/us { }; }); in fix' (extends overrides packages) |