diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 68441ea9393a..44a0e4601fc1 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1401,8 +1401,15 @@ These can be toggled using the stdenv.mkDerivation parameters hardeningDisable and hardeningEnable. -The following flags are enabled by default and might require disabling -if the program to package is incompatible. + +Both parameters take a list of flags as strings. The special +"all" flag can be passed to hardeningDisable +to turn off all hardening. These flags can also be used as environment variables +for testing or development purposes. + + +The following flags are enabled by default and might require disabling with +hardeningDisable if the program to package is incompatible. @@ -1563,7 +1570,8 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec The following flags are disabled by default and should be enabled -for packages that take untrusted input, like network services. +with hardeningEnable for packages that take untrusted +input like network services. diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d40722dacacd..1e9a6fe0f0d8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -27,6 +27,7 @@ akaWolf = "Artjom Vejsel "; akc = "Anders Claesson "; algorith = "Dries Van Daele "; + alibabzo = "Alistair Bill "; all = "Nix Committers "; ambrop72 = "Ambroz Bizjak "; amiddelk = "Arie Middelkoop "; @@ -102,6 +103,7 @@ corngood = "David McFarland "; coroa = "Jonas Hörsch "; couchemar = "Andrey Pavlov "; + cpages = "Carles Pagès "; cransom = "Casey Ransom "; cryptix = "Henry Bubert "; CrystalGamma = "Jona Stubbe "; @@ -350,7 +352,6 @@ osener = "Ozan Sener "; otwieracz = "Slawomir Gonet "; oxij = "Jan Malakhovski "; - page = "Carles Pagès "; paholg = "Paho Lurie-Gregg "; pakhfn = "Fedor Pakhomov "; palo = "Ingolf Wanger "; diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 9e7cfbd686cc..426aaa34885c 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -13,7 +13,7 @@ let resolvconfOptions = cfg.resolvconfOptions ++ optional cfg.dnsSingleRequest "single-request" - ++ optional cfg.dnsExtensionMechanism "ends0"; + ++ optional cfg.dnsExtensionMechanism "edns0"; in { diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index e23e28aa25ef..3eaf9e2ab370 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -10,6 +10,11 @@ let check = x: (lib.types.package.check x) && (attrByPath ["meta" "isIbusEngine"] false x); }; + impanel = + if cfg.panel != null + then "--panel=${cfg.panel}" + else ""; + ibusAutostart = pkgs.writeTextFile { name = "autostart-ibus-daemon"; destination = "/etc/xdg/autostart/ibus-daemon.desktop"; @@ -17,7 +22,7 @@ let [Desktop Entry] Name=IBus Type=Application - Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim + Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim ${impanel} ''; }; in @@ -36,6 +41,12 @@ in in "Enabled IBus engines. Available engines are: ${engines}."; }; + panel = mkOption { + type = with types; nullOr path; + default = null; + example = literalExample "${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"; + description = "Replace the IBus panel with another panel."; + }; }; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index de69ada5bfe7..5058d41bf753 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -283,6 +283,7 @@ keystone = 265; glance = 266; couchpotato = 267; + gogs = 268; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -536,6 +537,7 @@ keystone = 265; glance = 266; couchpotato = 267; + gogs = 268; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cd00ea10baa7..e99e344b932d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -258,6 +258,7 @@ #./services/misc/gitit.nix ./services/misc/gitlab.nix ./services/misc/gitolite.nix + ./services/misc/gogs.nix ./services/misc/gpsd.nix ./services/misc/ihaskell.nix ./services/misc/leaps.nix @@ -311,6 +312,7 @@ ./services/monitoring/monit.nix ./services/monitoring/munin.nix ./services/monitoring/nagios.nix + ./services/monitoring/netdata.nix ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/blackbox-exporter.nix diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix new file mode 100644 index 000000000000..09e5c4fe1ff1 --- /dev/null +++ b/nixos/modules/services/misc/gogs.nix @@ -0,0 +1,215 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.gogs; + configFile = pkgs.writeText "app.ini" '' + APP_NAME = ${cfg.appName} + RUN_USER = ${cfg.user} + RUN_MODE = prod + + [database] + DB_TYPE = ${cfg.database.type} + HOST = ${cfg.database.host}:${toString cfg.database.port} + NAME = ${cfg.database.name} + USER = ${cfg.database.user} + PASSWD = ${cfg.database.password} + PATH = ${cfg.database.path} + + [repository] + ROOT = ${cfg.repositoryRoot} + + [server] + DOMAIN = ${cfg.domain} + HTTP_ADDR = ${cfg.httpAddress} + HTTP_PORT = ${toString cfg.httpPort} + ROOT_URL = ${cfg.rootUrl} + + [security] + SECRET_KEY = #secretkey# + INSTALL_LOCK = true + + ${cfg.extraConfig} + ''; +in + +{ + options = { + services.gogs = { + enable = mkOption { + default = false; + type = types.bool; + description = "Enable Go Git Service."; + }; + + useWizard = mkOption { + default = false; + type = types.bool; + description = "Do not generate a configuration and use Gogs' installation wizard instead. The first registered user will be administrator."; + }; + + stateDir = mkOption { + default = "/var/lib/gogs"; + type = types.str; + description = "Gogs data directory."; + }; + + user = mkOption { + type = types.str; + default = "gogs"; + description = "User account under which Gogs runs."; + }; + + group = mkOption { + type = types.str; + default = "gogs"; + description = "Group account under which Gogs runs."; + }; + + database = { + type = mkOption { + type = types.enum [ "sqlite3" "mysql" "postgres" ]; + example = "mysql"; + default = "sqlite3"; + description = "Database engine to use."; + }; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Database host address."; + }; + + port = mkOption { + type = types.int; + default = 3306; + description = "Database host port."; + }; + + name = mkOption { + type = types.str; + default = "gogs"; + description = "Database name."; + }; + + user = mkOption { + type = types.str; + default = "gogs"; + description = "Database user."; + }; + + password = mkOption { + type = types.str; + default = ""; + description = "Database password."; + }; + + path = mkOption { + type = types.str; + default = "${cfg.stateDir}/data/gogs.db"; + description = "Path to the sqlite3 database file."; + }; + }; + + appName = mkOption { + type = types.str; + default = "Gogs: Go Git Service"; + description = "Application name."; + }; + + repositoryRoot = mkOption { + type = types.str; + default = "${cfg.stateDir}/repositories"; + description = "Path to the git repositories."; + }; + + domain = mkOption { + type = types.str; + default = "localhost"; + description = "Domain name of your server."; + }; + + rootUrl = mkOption { + type = types.str; + default = "http://localhost:3000/"; + description = "Full public URL of Gogs server."; + }; + + httpAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "HTTP listen address."; + }; + + httpPort = mkOption { + type = types.int; + default = 3000; + description = "HTTP listen port."; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Configuration lines appended to the generated Gogs configuration file."; + }; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.gogs = { + description = "Gogs (Go Git Service)"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.gogs.bin ]; + + preStart = '' + # copy custom configuration and generate a random secret key if needed + ${optionalString (cfg.useWizard == false) '' + mkdir -p ${cfg.stateDir}/custom/conf + cp -f ${configFile} ${cfg.stateDir}/custom/conf/app.ini + KEY=$(head -c 16 /dev/urandom | tr -dc A-Za-z0-9) + sed -i "s,#secretkey#,$KEY,g" ${cfg.stateDir}/custom/conf/app.ini + ''} + + mkdir -p ${cfg.repositoryRoot} + # update all hooks' binary paths + HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*") + if [ "$HOOKS" ] + then + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs.bin}/bin/gogs,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS + fi + ''; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.stateDir; + ExecStart = "${pkgs.gogs.bin}/bin/gogs web"; + Restart = "always"; + }; + + environment = { + USER = cfg.user; + HOME = cfg.stateDir; + GOGS_WORK_DIR = cfg.stateDir; + }; + }; + + users = { + extraUsers.gogs = { + description = "Go Git Service"; + uid = config.ids.uids.gogs; + group = "gogs"; + home = cfg.stateDir; + createHome = true; + }; + extraGroups.gogs.gid = config.ids.gids.gogs; + }; + }; +} diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix index 99583ebeebd5..0523c6549ed6 100644 --- a/nixos/modules/services/misc/mesos-master.nix +++ b/nixos/modules/services/misc/mesos-master.nix @@ -16,12 +16,30 @@ in { type = types.bool; }; + ip = mkOption { + description = "IP address to listen on."; + default = "0.0.0.0"; + type = types.str; + }; + port = mkOption { description = "Mesos Master port"; default = 5050; type = types.int; }; + advertiseIp = mkOption { + description = "IP address advertised to reach this master."; + default = null; + type = types.nullOr types.str; + }; + + advertisePort = mkOption { + description = "Port advertised to reach this Mesos master."; + default = null; + type = types.nullOr types.int; + }; + zk = mkOption { description = '' ZooKeeper URL (used for leader election amongst masters). @@ -84,7 +102,10 @@ in { serviceConfig = { ExecStart = '' ${pkgs.mesos}/bin/mesos-master \ + --ip=${cfg.ip} \ --port=${toString cfg.port} \ + ${optionalString (cfg.advertiseIp != null) "--advertise_ip=${cfg.advertiseIp}"} \ + ${optionalString (cfg.advertisePort != null) "--advertise_port=${toString cfg.advertisePort}"} \ ${if cfg.quorum == 0 then "--registry=in_memory" else "--zk=${cfg.zk} --registry=replicated_log --quorum=${toString cfg.quorum}"} \ diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index 9ddecb6fe30c..47be10274d3b 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -12,7 +12,23 @@ let attribsArg = optionalString (cfg.attributes != {}) "--attributes=${mkAttributes cfg.attributes}"; - containerizers = [ "mesos" ] ++ (optional cfg.withDocker "docker"); + containerizersArg = concatStringsSep "," ( + lib.unique ( + cfg.containerizers ++ (optional cfg.withDocker "docker") + ) + ); + + imageProvidersArg = concatStringsSep "," ( + lib.unique ( + cfg.imageProviders ++ (optional cfg.withDocker "docker") + ) + ); + + isolationArg = concatStringsSep "," ( + lib.unique ( + cfg.isolation ++ (optionals cfg.withDocker [ "filesystem/linux" "docker/runtime"]) + ) + ); in { @@ -27,7 +43,7 @@ in { ip = mkOption { description = "IP address to listen on."; default = "0.0.0.0"; - type = types.string; + type = types.str; }; port = mkOption { @@ -36,6 +52,53 @@ in { type = types.int; }; + advertiseIp = mkOption { + description = "IP address advertised to reach this agent."; + default = null; + type = types.nullOr types.str; + }; + + advertisePort = mkOption { + description = "Port advertised to reach this agent."; + default = null; + type = types.nullOr types.int; + }; + + containerizers = mkOption { + description = '' + List of containerizer implementations to compose in order to provide + containerization. Available options are mesos and docker. + The order the containerizers are specified is the order they are tried. + ''; + default = [ "mesos" ]; + type = types.listOf types.str; + }; + + imageProviders = mkOption { + description = "List of supported image providers, e.g., APPC,DOCKER."; + default = [ ]; + type = types.listOf types.str; + }; + + imageProvisionerBackend = mkOption { + description = '' + Strategy for provisioning container rootfs from images, + e.g., aufs, bind, copy, overlay. + ''; + default = "copy"; + type = types.str; + }; + + isolation = mkOption { + description = '' + Isolation mechanisms to use, e.g., posix/cpu,posix/mem, or + cgroups/cpu,cgroups/mem, or network/port_mapping, or `gpu/nvidia` for nvidia + specific gpu isolation. + ''; + default = [ "posix/cpu" "posix/mem" ]; + type = types.listOf types.str; + }; + master = mkOption { description = '' May be one of: @@ -57,6 +120,16 @@ in { type = types.bool; }; + dockerRegistry = mkOption { + description = '' + The default url for pulling Docker images. + It could either be a Docker registry server url, + or a local path in which Docker image archives are stored. + ''; + default = null; + type = types.nullOr (types.either types.str types.path); + }; + workDir = mkOption { description = "The Mesos work directory."; default = "/var/lib/mesos/slave"; @@ -96,28 +169,45 @@ in { host = "aabc123"; os = "nixos"; }; }; + + executorEnvironmentVariables = mkOption { + description = '' + The environment variables that should be passed to the executor, and thus subsequently task(s). + ''; + default = { + PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"; + }; + type = types.attrsOf types.str; + }; }; }; - config = mkIf cfg.enable { systemd.services.mesos-slave = { description = "Mesos Slave"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - environment.MESOS_CONTAINERIZERS = concatStringsSep "," containerizers; + path = [ pkgs.stdenv.shellPackage ]; serviceConfig = { ExecStart = '' ${pkgs.mesos}/bin/mesos-slave \ + --containerizers=${containerizersArg} \ + --image_providers=${imageProvidersArg} \ + --image_provisioner_backend=${cfg.imageProvisionerBackend} \ + --isolation=${isolationArg} \ --ip=${cfg.ip} \ --port=${toString cfg.port} \ + ${optionalString (cfg.advertiseIp != null) "--advertise_ip=${cfg.advertiseIp}"} \ + ${optionalString (cfg.advertisePort != null) "--advertise_port=${toString cfg.advertisePort}"} \ --master=${cfg.master} \ --work_dir=${cfg.workDir} \ --logging_level=${cfg.logLevel} \ ${attribsArg} \ ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \ ${optionalString cfg.withDocker "--docker=${pkgs.docker}/libexec/docker/docker"} \ + ${optionalString (cfg.dockerRegistry != null) "--docker_registry=${cfg.dockerRegistry}"} \ + --executor_environment_variables=${lib.escapeShellArg (builtins.toJSON cfg.executorEnvironmentVariables)} \ ${toString cfg.extraCmdLineOptions} ''; PermissionsStartOnly = true; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix new file mode 100644 index 000000000000..e1fde4fc9500 --- /dev/null +++ b/nixos/modules/services/monitoring/netdata.nix @@ -0,0 +1,78 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.netdata; + + configFile = pkgs.writeText "netdata.conf" cfg.configText; + + defaultUser = "netdata"; + +in { + options = { + services.netdata = { + enable = mkOption { + default = false; + type = types.bool; + description = "Whether to enable netdata monitoring."; + }; + + user = mkOption { + type = types.str; + default = "netdata"; + description = "User account under which netdata runs."; + }; + + group = mkOption { + type = types.str; + default = "netdata"; + description = "Group under which netdata runs."; + }; + + configText = mkOption { + type = types.lines; + default = ""; + description = "netdata.conf configuration."; + example = '' + [global] + debug log = syslog + access log = syslog + error log = syslog + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + systemd.services.netdata = { + description = "Real time performance monitoring"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = concatStringsSep "\n" (map (dir: '' + mkdir -vp ${dir} + chmod 750 ${dir} + chown -R ${cfg.user}:${cfg.group} ${dir} + '') [ "/var/cache/netdata" + "/var/log/netdata" + "/var/lib/netdata" ]); + serviceConfig = { + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + ExecStart = "${pkgs.netdata}/bin/netdata -D -c ${configFile}"; + TimeoutStopSec = 60; + }; + }; + + users.extraUsers = optional (cfg.user == defaultUser) { + name = defaultUser; + }; + + users.extraGroups = optional (cfg.group == defaultUser) { + name = defaultUser; + }; + + }; +} diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index ca47a18bc1f6..b93e28e34efd 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -149,6 +149,6 @@ in { serviceConfig.ExecStart = "${cfg.package}/bin/flannel"; }; - services.etcd.enable = mkDefault cfg.etcd.endpoints == ["http://127.0.0.1:2379"]; + services.etcd.enable = mkDefault (cfg.etcd.endpoints == ["http://127.0.0.1:2379"]); }; } diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 8f353979d3fc..c11d4434c206 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -174,7 +174,7 @@ in { assertions = [{ assertion = config.networking.wireless.enable == false; - message = "You can not use networking.networkmanager with services.networking.wireless"; + message = "You can not use networking.networkmanager with networking.wireless"; }]; boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections. @@ -239,7 +239,8 @@ in { # Turn off NixOS' network management networking = { useDHCP = false; - wireless.enable = false; + # use mkDefault to trigger the assertion about the conflict above + wireless.enable = lib.mkDefault false; }; powerManagement.resumeCommands = '' diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index 68acde85b5dc..05b979eef47f 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -20,6 +20,7 @@ let ${optionalString (cfg.defaultUser != null) ("default_user " + cfg.defaultUser)} ${optionalString (cfg.defaultUser != null) ("focus_password yes")} ${optionalString cfg.autoLogin "auto_login yes"} + ${optionalString (cfg.consoleCmd != null) "console_cmd ${cfg.consoleCmd}"} ${cfg.extraConfig} ''; @@ -105,6 +106,18 @@ in ''; }; + consoleCmd = mkOption { + type = types.nullOr types.str; + default = '' + ${pkgs.xterm}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e ${pkgs.shadow}/bin/login + ''; + defaultText = '' + ''${pkgs.xterm}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e ''${pkgs.shadow}/bin/login + ''; + description = '' + The command to run when "console" is given as the username. + ''; + }; }; }; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 515136c904c5..b91d64bb0a7f 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -28,6 +28,8 @@ def write_loader_conf(generation): if "@timeout@" != "": f.write("timeout @timeout@\n") f.write("default nixos-generation-%d\n" % generation) + if not @editor@: + f.write("editor 0"); os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") def copy_from_profile(generation, name, dry_run=False): diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index cc43fb8bab4c..ec02f73cada2 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -20,6 +20,8 @@ let timeout = if config.boot.loader.timeout != null then config.boot.loader.timeout else ""; + editor = if cfg.editor then "True" else "False"; + inherit (efi) efiSysMountPoint canTouchEfiVariables; }; in { @@ -36,6 +38,20 @@ in { description = "Whether to enable the systemd-boot (formerly gummiboot) EFI boot manager"; }; + + editor = mkOption { + default = true; + + type = types.bool; + + description = '' + Whether to allow editing the kernel command-line before + boot. It is recommended to set this to false, as it allows + gaining root access by passing init=/bin/sh as a kernel + parameter. However, it is enabled by default for backwards + compatibility. + ''; + }; }; config = mkIf cfg.enable { diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix index 3610603aeba2..6e9af126f032 100644 --- a/nixos/tests/mesos.nix +++ b/nixos/tests/mesos.nix @@ -1,32 +1,91 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "simple"; +import ./make-test.nix ({ pkgs, ...} : rec { + name = "mesos"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ offline ]; + maintainers = [ offline kamilchm cstrahan ]; }; - machine = { config, pkgs, ... }: { - services.zookeeper.enable = true; - virtualisation.docker.enable = true; - services.mesos = { - slave = { - enable = true; - master = "zk://localhost:2181/mesos"; - attributes = { - tag1 = "foo"; - tag2 = "bar"; - }; - }; - master = { - enable = true; - zk = "zk://localhost:2181/mesos"; + nodes = { + master = { config, pkgs, ... }: { + networking.firewall.enable = false; + services.zookeeper.enable = true; + services.mesos.master = { + enable = true; + zk = "zk://master:2181/mesos"; }; }; + + slave = { config, pkgs, ... }: { + networking.firewall.enable = false; + networking.nat.enable = true; + virtualisation.docker.enable = true; + services.mesos = { + slave = { + enable = true; + master = "master:5050"; + dockerRegistry = registry; + executorEnvironmentVariables = { + PATH = "/run/current-system/sw/bin"; + }; + }; + }; + }; + }; + + simpleDocker = pkgs.dockerTools.buildImage { + name = "echo"; + contents = [ pkgs.stdenv.shellPackage pkgs.coreutils ]; + config = { + Env = [ + # When shell=true, mesos invokes "sh -c ''", so make sure "sh" is + # on the PATH. + "PATH=${pkgs.stdenv.shellPackage}/bin:${pkgs.coreutils}/bin" + ]; + Entrypoint = [ "echo" ]; + }; + }; + + registry = pkgs.runCommand "registry" { } '' + mkdir -p $out + cp ${simpleDocker} $out/echo:latest.tar + ''; + + testFramework = pkgs.pythonPackages.buildPythonPackage { + name = "mesos-tests"; + propagatedBuildInputs = [ pkgs.mesos ]; + catchConflicts = false; + src = ./mesos_test.py; + phases = [ "installPhase" "fixupPhase" ]; + installPhase = '' + mkdir $out + cp $src $out/mesos_test.py + chmod +x $out/mesos_test.py + + echo "done" > test.result + tar czf $out/test.tar.gz test.result + ''; }; testScript = '' startAll; - $machine->waitForUnit("mesos-master.service"); - $machine->waitForUnit("mesos-slave.service"); + $master->waitForUnit("mesos-master.service"); + $slave->waitForUnit("mesos-slave.service"); + + $master->waitForOpenPort(5050); + $slave->waitForOpenPort(5051); + + # is slave registred? + $master->waitUntilSucceeds("curl -s --fail http://master:5050/master/slaves". + " | grep -q \"\\\"hostname\\\":\\\"slave\\\"\""); + + # try to run docker image + $master->succeed("${pkgs.mesos}/bin/mesos-execute --master=master:5050". + " --resources=\"cpus:0.1;mem:32\" --name=simple-docker". + " --containerizer=mesos --docker_image=echo:latest". + " --shell=true --command=\"echo done\" | grep -q TASK_FINISHED"); + + # simple command with .tar.gz uri + $master->succeed("${testFramework}/mesos_test.py master ". + "${testFramework}/test.tar.gz"); ''; }) diff --git a/nixos/tests/mesos_test.py b/nixos/tests/mesos_test.py new file mode 100644 index 000000000000..be8bb32e49a7 --- /dev/null +++ b/nixos/tests/mesos_test.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python +import uuid +import time +import subprocess +import os + +import sys + +from mesos.interface import Scheduler +from mesos.native import MesosSchedulerDriver +from mesos.interface import mesos_pb2 + +def log(msg): + process = subprocess.Popen("systemd-cat", stdin=subprocess.PIPE) + (out,err) = process.communicate(msg) + +class NixosTestScheduler(Scheduler): + def __init__(self): + self.master_ip = sys.argv[1] + self.download_uri = sys.argv[2] + + def resourceOffers(self, driver, offers): + log("XXX got resource offer") + + offer = offers[0] + task = self.new_task(offer) + uri = task.command.uris.add() + uri.value = self.download_uri + task.command.value = "cat test.result" + driver.launchTasks(offer.id, [task]) + + def statusUpdate(self, driver, update): + log("XXX status update") + if update.state == mesos_pb2.TASK_FAILED: + log("XXX test task failed with message: " + update.message) + driver.stop() + sys.exit(1) + elif update.state == mesos_pb2.TASK_FINISHED: + driver.stop() + sys.exit(0) + + def new_task(self, offer): + task = mesos_pb2.TaskInfo() + id = uuid.uuid4() + task.task_id.value = str(id) + task.slave_id.value = offer.slave_id.value + task.name = "task {}".format(str(id)) + + cpus = task.resources.add() + cpus.name = "cpus" + cpus.type = mesos_pb2.Value.SCALAR + cpus.scalar.value = 0.1 + + mem = task.resources.add() + mem.name = "mem" + mem.type = mesos_pb2.Value.SCALAR + mem.scalar.value = 32 + + return task + +if __name__ == '__main__': + log("XXX framework started") + + framework = mesos_pb2.FrameworkInfo() + framework.user = "root" + framework.name = "nixos-test-framework" + driver = MesosSchedulerDriver( + NixosTestScheduler(), + framework, + sys.argv[1] + ":5050" + ) + driver.run() diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 7d9b77e9661e..5b1f79a6c4fd 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, xulrunner }: stdenv.mkDerivation rec { - version = "2.0.18"; + version = "2.0.21"; name = "pencil-${version}"; src = fetchurl { url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; - sha256 = "0x0kibb2na12fwl0x68xhkjpbm5h2widm346cx2r29gp1kq9kklc"; + sha256 = "0xq3gczqy7gzf1997qxdql5z7qqk1vabr0rzgakmsi4dq2q4d3kq"; }; buildPhase = ""; @@ -32,8 +32,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; # Commercial license is also available maintainers = with maintainers; [ bjornfor prikhi ]; platforms = platforms.linux; - # See https://github.com/prikhi/pencil/issues/840 - # ("Error: Platform version '47.0' is not compatible with minVersion >= 36.0 maxVersion <= 46.*") - broken = true; }; } diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 5a149657931f..68c9246c24b1 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,34 +1,30 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia -, qttools, yacc, flex, zlib, config, qmakeHook, makeQtWrapper }: +{ stdenv, fetchurl +, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity +, yacc, flex, zlib, config, qmakeHook, makeQtWrapper +}: stdenv.mkDerivation rec { name = "golden-cheetah-${version}"; - version = "4.0-DEV1603"; + version = "3.4"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz"; - sha256 = "12knlzqmq8b3nyl3kvcsnzrbjksgd83mzwzj97wccyfiffjl4wah"; + sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf"; }; - buildInputs = [ + qtInputs = [ qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib + qtconnectivity ]; - nativeBuildInputs = [ makeQtWrapper qmakeHook ]; + nativeBuildInputs = [ makeQtWrapper qmakeHook ] ++ qtInputs; preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local ''; - #postConfigure = - # + ( - # with (config.golden-cheetah); - # stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) '' - # echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >> src/gcconfig.pri - # echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >> src/gcconfig.pri - # ''); installPhase = '' mkdir -p $out/bin cp src/GoldenCheetah $out/bin - wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" # patchelf doesn't seem to work + wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" ''; meta = { description = "Performance software for cyclists, runners and triathletes"; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 837d736d10dd..850512a837d0 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -35,6 +35,7 @@ let homepage = https://github.com/thestinger/termite/; maintainers = with maintainers; [ koral garbas ]; platforms = platforms.all; + broken = true; }; }; in if configFile == null then termite else symlinkJoin { diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix new file mode 100644 index 000000000000..de21c37bc79e --- /dev/null +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -0,0 +1,94 @@ +{ stdenv, fetchFromGitHub, makeDesktopItem +, pkgconfig, autoconf213, alsaLib, bzip2, cairo +, dbus, dbus_glib, file, fontconfig, freetype +, gstreamer, gst_plugins_base, gst_all_1 +, gtk2, hunspell, icu, libevent, libjpeg, libnotify +, libstartup_notification, libvpx, makeWrapper, mesa +, nspr, nss, pango, perl, python, libpulseaudio, sqlite +, unzip, xlibs, which, yasm, zip, zlib +}: + +stdenv.mkDerivation rec { + name = "palemoon-${version}"; + version = "27.0.3"; + + src = fetchFromGitHub { + name = "palemoon-src"; + owner = "MoonchildProductions"; + repo = "Pale-Moon"; + rev = "c09119484da17c682a66e32bacbffb8cff411608"; + sha256 = "1i4hp1lz0xaryy4zpncr67gbqg8v7a2cnyqjwvs2an86rk1vg913"; + }; + + desktopItem = makeDesktopItem { + name = "palemoon"; + exec = "palemoon %U"; + desktopName = "Pale Moon"; + genericName = "Web Browser"; + categories = "Application;Network;WebBrowser;"; + mimeType = stdenv.lib.concatStringsSep ";" [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + "x-scheme-handler/ftp" + ]; + }; + + buildInputs = [ + alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype + gst_plugins_base gstreamer gst_all_1.gst-plugins-base gtk2 + hunspell icu libevent libjpeg libnotify libstartup_notification + libvpx makeWrapper mesa nspr nss pango perl pkgconfig python + libpulseaudio sqlite unzip which yasm zip zlib + ] ++ (with xlibs; [ + libX11 libXext libXft libXi libXrender libXScrnSaver + libXt pixman scrnsaverproto xextproto + ]); + + enableParallelBuilding = true; + + configurePhase = '' + export AUTOCONF=${autoconf213}/bin/autoconf + export MOZBUILD_STATE_PATH=$(pwd)/.mozbuild + export MOZ_CONFIG=$(pwd)/.mozconfig + export builddir=$(pwd)/build + mkdir -p $MOZBUILD_STATE_PATH $builddir + echo > $MOZ_CONFIG " + . $src/build/mozconfig.common + ac_add_options --prefix=$out + ac_add_options --enable-application=browser + ac_add_options --enable-official-branding + ac_add_options --enable-optimize="-O2" + ac_add_options --enable-jemalloc + ac_add_options --enable-shared-js + ac_add_options --disable-tests + " + ''; + + patchPhase = '' + chmod u+w . + sed -i /status4evar/d browser/installer/package-manifest.in + ''; + + buildPhase = '' + cd $builddir + $src/mach build + ''; + + installPhase = '' + cd $builddir + $src/mach install + ''; + + meta = with stdenv.lib; { + description = "A web browser"; + homepage = https://www.palemoon.org/; + license = licenses.mpl20; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index f07668756adf..637041379dbd 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -15,7 +15,7 @@ assert mouseSupport -> gpm-ncurses != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "w3m-v0.5.3+git20161120"; + name = "w3m-0.5.3+git20161120"; src = fetchFromGitHub { owner = "tats"; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 8857e6ba4e35..818848f6a7f1 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -2,16 +2,27 @@ , automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython , setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent -, ethtool, coreutils +, ethtool, coreutils, which, iptables , bash }: let mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; }; soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; + # `tar -z` requires gzip on $PATH, so wrap tar. + # At some point, we should try to patch mesos so we add gzip to the PATH when + # tar is invoked. I think that only needs to be done here: + # src/common/command_utils.cpp + # https://github.com/NixOS/nixpkgs/issues/13783 + tarWithGzip = lib.overrideDerivation gnutar (oldAttrs: { + buildInputs = (oldAttrs.buildInputs or []) ++ [ makeWrapper ]; + postInstall = (oldAttrs.postInstall or "") + '' + wrapProgram $out/bin/tar --prefix PATH ":" "${gzip}/bin" + ''; + }); in stdenv.mkDerivation rec { - version = "1.0.1"; + version = "1.1.0"; name = "mesos-${version}"; enableParallelBuilding = true; @@ -19,17 +30,14 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "1hdh2wh11ck98ycfrxfzgivgk2pjl3638vkyw14xj7faj9qxjlz0"; + sha256 = "1hdjd4syyp88l0bnh88bhzvn9466ad2ysfp9pq3kwj3qzwg5jv8g"; }; patches = [ # https://reviews.apache.org/r/36610/ + # TODO: is this still needed? ./rb36610.patch - # https://issues.apache.org/jira/browse/MESOS-6013 - ./rb51324.patch - ./rb51325.patch - # see https://github.com/cstrahan/mesos/tree/nixos-${version} ./nixos.patch ]; @@ -46,33 +54,55 @@ in stdenv.mkDerivation rec { pythonProtobuf ]; + # note that we *must* statically link libprotobuf. + # if we dynamically link the lib, we get these errors: + # https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684 preConfigure = '' + substituteInPlace 3rdparty/stout/include/stout/os/posix/chown.hpp \ + --subst-var-by chown ${coreutils}/bin/chown + + substituteInPlace 3rdparty/stout/Makefile.am \ + --replace "-lprotobuf" \ + "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a" + substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \ --subst-var-by sh ${bash}/bin/bash - substituteInPlace 3rdparty/stout/include/stout/os/posix/shell.hpp \ - --subst-var-by sh ${bash}/bin/bash - - substituteInPlace src/Makefile.am \ - --subst-var-by mavenRepo ${mavenRepo} + substituteInPlace 3rdparty/stout/include/stout/posix/os.hpp \ + --subst-var-by tar ${tarWithGzip}/bin/tar substituteInPlace src/cli/mesos-scp \ --subst-var-by scp ${openssh}/bin/scp + substituteInPlace src/common/command_utils.cpp \ + --subst-var-by curl ${curl}/bin/curl \ + --subst-var-by gzip ${gzip}/bin/gzip \ + --subst-var-by sha512sum ${coreutils}/bin/sha512sum \ + --subst-var-by tar ${tarWithGzip}/bin/tar + substituteInPlace src/launcher/fetcher.cpp \ + --subst-var-by cp ${coreutils}/bin/cp \ --subst-var-by gzip ${gzip}/bin/gzip \ - --subst-var-by tar ${gnutar}/bin/tar \ + --subst-var-by tar ${tarWithGzip}/bin/tar \ --subst-var-by unzip ${unzip}/bin/unzip substituteInPlace src/python/cli/src/mesos/cli.py \ --subst-var-by mesos-resolve $out/bin/mesos-resolve + substituteInPlace src/python/native_common/ext_modules.py.in \ + --replace "-lprotobuf" \ + "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a" + + substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \ + --subst-var-by cp ${coreutils}/bin/cp \ + --subst-var-by which ${which}/bin/which + substituteInPlace src/slave/containerizer/mesos/isolators/posix/disk.cpp \ - --subst-var-by du ${coreutils}/bin/du \ - --subst-var-by cp ${coreutils}/bin/cp + --subst-var-by du ${coreutils}/bin/du substituteInPlace src/slave/containerizer/mesos/provisioner/backends/copy.cpp \ - --subst-var-by cp ${coreutils}/bin/cp + --subst-var-by cp ${coreutils}/bin/cp \ + --subst-var-by rm ${coreutils}/bin/rm substituteInPlace src/uri/fetchers/copy.cpp \ --subst-var-by cp ${coreutils}/bin/cp @@ -83,23 +113,48 @@ in stdenv.mkDerivation rec { substituteInPlace src/uri/fetchers/docker.cpp \ --subst-var-by curl ${curl}/bin/curl + substituteInPlace src/Makefile.am \ + --subst-var-by mavenRepo ${mavenRepo} \ + --replace "-lprotobuf" \ + "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a" + '' + lib.optionalString stdenv.isLinux '' substituteInPlace src/linux/perf.cpp \ --subst-var-by perf ${perf}/bin/perf + substituteInPlace src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp \ + --subst-var-by mount ${utillinux}/bin/mount + + substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/linux.cpp \ + --subst-var-by mount ${utillinux}/bin/mount + substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \ --subst-var-by mount ${utillinux}/bin/mount + substituteInPlace src/slave/containerizer/mesos/isolators/gpu/isolator.cpp \ + --subst-var-by mount ${utillinux}/bin/mount + substituteInPlace src/slave/containerizer/mesos/isolators/namespaces/pid.cpp \ --subst-var-by mount ${utillinux}/bin/mount + substituteInPlace src/slave/containerizer/mesos/isolators/network/cni/cni.cpp \ + --subst-var-by mount ${utillinux}/bin/mount + + substituteInPlace src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp \ + --subst-var-by iptables ${iptables}/bin/iptables + substituteInPlace src/slave/containerizer/mesos/isolators/network/port_mapping.cpp \ - --subst-var-by tc ${iproute}/bin/tc \ + --subst-var-by ethtool ${ethtool}/sbin/ethtool \ --subst-var-by ip ${iproute}/bin/ip \ --subst-var-by mount ${utillinux}/bin/mount \ - --subst-var-by sh ${stdenv.shell} \ - --subst-var-by ethtool ${ethtool}/sbin/ethtool + --subst-var-by tc ${iproute}/bin/tc + + substituteInPlace src/slave/containerizer/mesos/isolators/volume/image.cpp \ + --subst-var-by mount ${utillinux}/bin/mount + + substituteInPlace src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp \ + --subst-var-by mount ${utillinux}/bin/mount ''; configureFlags = [ @@ -108,7 +163,6 @@ in stdenv.mkDerivation rec { "--with-svn=${subversion.dev}" "--with-leveldb=${leveldb}" "--with-glog=${glog}" - "--with-glog=${glog}" "--enable-optimize" "--disable-python-dependency-install" "--enable-ssl" diff --git a/pkgs/applications/networking/cluster/mesos/maven_repo.patch b/pkgs/applications/networking/cluster/mesos/maven_repo.patch deleted file mode 100644 index 9ee12976fde1..000000000000 --- a/pkgs/applications/networking/cluster/mesos/maven_repo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index ae2740a..1df91a7 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1310,7 +1310,7 @@ if HAS_JAVA - - $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom - @echo "Building mesos-$(PACKAGE_VERSION).jar ..." -- @cd $(abs_top_builddir)/src/java && $(MVN) -f mesos.pom clean package -+ @cd $(abs_top_builddir)/src/java && $(MVN) -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package - - # Convenience library for JNI bindings. - # TODO(Charles Reiss): We really should be building the Java library diff --git a/pkgs/applications/networking/cluster/mesos/nixos.patch b/pkgs/applications/networking/cluster/mesos/nixos.patch index 032357e452db..78e374b8d6bc 100644 --- a/pkgs/applications/networking/cluster/mesos/nixos.patch +++ b/pkgs/applications/networking/cluster/mesos/nixos.patch @@ -1,5 +1,18 @@ +diff --git a/3rdparty/stout/include/stout/os/posix/chown.hpp b/3rdparty/stout/include/stout/os/posix/chown.hpp +index c82e2e574..15d332107 100644 +--- a/3rdparty/stout/include/stout/os/posix/chown.hpp ++++ b/3rdparty/stout/include/stout/os/posix/chown.hpp +@@ -34,7 +34,7 @@ inline Try chown( + // TODO(bmahler): Consider walking the file tree instead. We would need + // to be careful to not miss dotfiles. + std::string command = +- "chown -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'"; ++ "@chown@ -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'"; + + int status = os::system(command); + if (status != 0) { diff --git a/3rdparty/stout/include/stout/os/posix/fork.hpp b/3rdparty/stout/include/stout/os/posix/fork.hpp -index a29967d..290b98b 100644 +index a29967dcb..290b98b50 100644 --- a/3rdparty/stout/include/stout/os/posix/fork.hpp +++ b/3rdparty/stout/include/stout/os/posix/fork.hpp @@ -369,7 +369,7 @@ private: @@ -11,48 +24,97 @@ index a29967d..290b98b 100644 EXIT(EXIT_FAILURE) << "Failed to execute '" << command << "': " << os::strerror(errno); } else if (wait.isSome()) { -diff --git a/3rdparty/stout/include/stout/os/posix/shell.hpp b/3rdparty/stout/include/stout/os/posix/shell.hpp -index 1d73ae5..9bf89b5 100644 ---- a/3rdparty/stout/include/stout/os/posix/shell.hpp -+++ b/3rdparty/stout/include/stout/os/posix/shell.hpp -@@ -37,7 +37,7 @@ namespace Shell { - // received by the callee, usually the command name and `arg1` is the - // second command argument received by the callee. - --constexpr const char* name = "sh"; -+constexpr const char* name = "@sh@"; - constexpr const char* arg0 = "sh"; - constexpr const char* arg1 = "-c"; +diff --git a/3rdparty/stout/include/stout/posix/os.hpp b/3rdparty/stout/include/stout/posix/os.hpp +index c37e64db6..d3d87b7f0 100644 +--- a/3rdparty/stout/include/stout/posix/os.hpp ++++ b/3rdparty/stout/include/stout/posix/os.hpp +@@ -375,7 +375,7 @@ inline Option getenv(const std::string& key) + inline Try tar(const std::string& path, const std::string& archive) + { + Try tarOut = +- os::shell("tar %s %s %s", "-czf", archive.c_str(), path.c_str()); ++ os::shell("@tar@ %s %s %s", "-czf", archive.c_str(), path.c_str()); + if (tarOut.isError()) { + return Error("Failed to archive " + path + ": " + tarOut.error()); diff --git a/src/Makefile.am b/src/Makefile.am -index 28dd151..36fc6ec 100644 +index 3bcc0f2df..e5cbc57e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -1528,7 +1528,8 @@ if HAS_JAVA +@@ -1545,7 +1545,7 @@ if HAS_JAVA $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom @echo "Building mesos-$(PACKAGE_VERSION).jar ..." - @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom clean package + @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package -+ # Convenience library for JNI bindings. # TODO(Charles Reiss): We really should be building the Java library diff --git a/src/cli/mesos-scp b/src/cli/mesos-scp -index a71ab07..feed8c4 100755 +index a71ab0708..1043d1b3c 100755 --- a/src/cli/mesos-scp +++ b/src/cli/mesos-scp -@@ -19,7 +19,7 @@ if sys.version_info < (2,6,0): +@@ -19,7 +19,8 @@ if sys.version_info < (2,6,0): def scp(host, src, dst): - cmd = 'scp -pr %s %s' % (src, host + ':' + dst) + cmd = '@scp@ -pr %s %s' % (src, host + ':' + dst) ++ try: process = subprocess.Popen( cmd, +diff --git a/src/common/command_utils.cpp b/src/common/command_utils.cpp +index 09e805140..90bf65896 100644 +--- a/src/common/command_utils.cpp ++++ b/src/common/command_utils.cpp +@@ -140,7 +140,7 @@ Future tar( + + argv.emplace_back(input); + +- return launch("tar", argv) ++ return launch("@tar@", argv) + .then([]() { return Nothing(); }); + } + +@@ -162,7 +162,7 @@ Future untar( + argv.emplace_back(directory.get()); + } + +- return launch("tar", argv) ++ return launch("@tar@", argv) + .then([]() { return Nothing(); }); + } + +@@ -170,7 +170,7 @@ Future untar( + Future sha512(const Path& input) + { + #ifdef __linux__ +- const string cmd = "sha512sum"; ++ const string cmd = "@sha512sum@"; + vector argv = { + cmd, + input // Input file to compute shasum. +@@ -206,7 +206,7 @@ Future gzip(const Path& input) + input + }; + +- return launch("gzip", argv) ++ return launch("@gzip@", argv) + .then([]() { return Nothing(); }); + } + +@@ -219,7 +219,7 @@ Future decompress(const Path& input) + input + }; + +- return launch("gzip", argv) ++ return launch("@gzip@", argv) + .then([]() { return Nothing(); }); + } + diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp -index 4456c28..e22c8fc 100644 +index 4456c2813..e22c8fc03 100644 --- a/src/launcher/fetcher.cpp +++ b/src/launcher/fetcher.cpp @@ -68,13 +68,13 @@ static Try extract( @@ -82,11 +144,11 @@ index 4456c28..e22c8fc 100644 LOG(INFO) << "Copying resource with command:" << command; diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp -index ea823b3..170f54d 100644 +index aa31982eb..8b5331b17 100644 --- a/src/linux/perf.cpp +++ b/src/linux/perf.cpp -@@ -125,7 +125,7 @@ private: - // NOTE: The watchdog process places perf in its own process group +@@ -127,7 +127,7 @@ private: + // NOTE: The supervisor childhook places perf in its own process group // and will kill the perf process when the parent dies. Try _perf = subprocess( - "perf", @@ -104,37 +166,51 @@ index ea823b3..170f54d 100644 command << " --event " << event; } diff --git a/src/linux/systemd.cpp b/src/linux/systemd.cpp -index 619aa27..c1cbfe4 100644 +index 6318f48fc..394d88d47 100644 --- a/src/linux/systemd.cpp +++ b/src/linux/systemd.cpp -@@ -196,12 +196,19 @@ bool exists() +@@ -196,13 +196,21 @@ bool exists() // This is static as the init system should not change while we are running. static const bool exists = []() -> bool { // (1) Test whether `/sbin/init` links to systemd. - const Result realpath = os::realpath("/sbin/init"); - if (realpath.isError() || realpath.isNone()) { - LOG(WARNING) << "Failed to test /sbin/init for systemd environment: " -- << realpath.error(); +- << (realpath.isError() ? realpath.error() +- : "does not exist"); - - return false; -+ // cstrahan: first assume we're on NixOS, then try non-NixOS ++ // cstrahan(nixos): first assume we're on NixOS, then try non-NixOS + Result realpath = os::realpath("/run/current-system/systemd/lib/systemd/systemd"); + Result realpathNixOS = realpath; + if (realpathNixOS.isError() || realpathNixOS.isNone()) { + Result realpathNonNixOS = realpath = os::realpath("/sbin/init"); + if (realpathNonNixOS.isError() || realpathNonNixOS.isNone()) { + LOG(WARNING) << "Failed to test /run/current-system/systemd/lib/systemd/systemd for systemd environment: " -+ << realpathNixOS.error(); ++ << (realpathNixOS.isError() ? realpathNixOS.error() ++ : "does not exist"); + LOG(WARNING) << "Failed to test /sbin/init for systemd environment: " -+ << realpathNonNixOS.error(); ++ << (realpathNonNixOS.isError() ? realpathNonNixOS.error() ++ : "does not exist"); + + return false; + } } CHECK_SOME(realpath); +@@ -278,6 +286,10 @@ Path hierarchy() + + Try daemonReload() + { ++ // cstrahan(nixos): should we patch these `systemctl`s? ++ // probably don't want to hard-code a particular systemd store path here, ++ // but if we use /run/current-system/sw/bin/systemctl, ++ // we won't be able to support non-NixOS distros. + Try daemonReload = os::shell("systemctl daemon-reload"); + if (daemonReload.isError()) { + return Error("Failed to reload systemd daemon: " + daemonReload.error()); diff --git a/src/python/cli/src/mesos/cli.py b/src/python/cli/src/mesos/cli.py -index f342992..354abf4 100644 +index f342992e0..354abf443 100644 --- a/src/python/cli/src/mesos/cli.py +++ b/src/python/cli/src/mesos/cli.py @@ -40,7 +40,7 @@ def resolve(master): @@ -146,11 +222,70 @@ index f342992..354abf4 100644 stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, +diff --git a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp +index af9f3736b..f8554d414 100644 +--- a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp ++++ b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp +@@ -499,7 +499,7 @@ Future> DockerVolumeIsolatorProcess::_prepare( + // unsafe arbitrary commands). + CommandInfo* command = launchInfo.add_pre_exec_commands(); + command->set_shell(false); +- command->set_value("mount"); ++ command->set_value("@mount@"); + command->add_arguments("mount"); + command->add_arguments("-n"); + command->add_arguments("--rbind"); +diff --git a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp +index df16b8fee..4a17475bd 100644 +--- a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp ++++ b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp +@@ -159,9 +159,9 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags) + // here because 'create' will only be invoked during + // initialization. + Try mount = os::shell( +- "mount --bind %s %s && " +- "mount --make-private %s && " +- "mount --make-shared %s", ++ "@mount@ --bind %s %s && " ++ "@mount@ --make-private %s && " ++ "@mount@ --make-shared %s", + workDir->c_str(), + workDir->c_str(), + workDir->c_str(), +@@ -180,8 +180,8 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags) + LOG(INFO) << "Making '" << workDir.get() << "' a shared mount"; + + Try mount = os::shell( +- "mount --make-private %s && " +- "mount --make-shared %s", ++ "@mount@ --make-private %s && " ++ "@mount@ --make-shared %s", + workDir->c_str(), + workDir->c_str()); + +@@ -404,7 +404,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands( + + CommandInfo command; + command.set_shell(false); +- command.set_value("mount"); ++ command.set_value("@mount@"); + command.add_arguments("mount"); + command.add_arguments("-n"); + command.add_arguments("--rbind"); +@@ -569,7 +569,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands( + // TODO(jieyu): Consider the mode in the volume. + CommandInfo command; + command.set_shell(false); +- command.set_value("mount"); ++ command.set_value("@mount@"); + command.add_arguments("mount"); + command.add_arguments("-n"); + command.add_arguments("--rbind"); diff --git a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp -index 51d1518..783adb5 100644 +index a1283e5ee..a918427bf 100644 --- a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp +++ b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp -@@ -204,7 +204,7 @@ Future> SharedFilesystemIsolatorProcess::prepare( +@@ -207,7 +207,7 @@ Future> SharedFilesystemIsolatorProcess::prepare( } launchInfo.add_pre_exec_commands()->set_value( @@ -159,36 +294,148 @@ index 51d1518..783adb5 100644 } return launchInfo; +diff --git a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp +index e3756c920..cfe458b59 100644 +--- a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp ++++ b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp +@@ -355,7 +355,7 @@ Future> NvidiaGpuIsolatorProcess::_prepare( + } + + launchInfo.add_pre_exec_commands()->set_value( +- "mount --no-mtab --rbind --read-only " + ++ "@mount@ --no-mtab --rbind --read-only " + + volume.HOST_PATH() + " " + target); + } + +diff --git a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp +index 478752f37..ab527f0cd 100644 +--- a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp ++++ b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp +@@ -281,7 +281,7 @@ Try NvidiaVolume::create() + string path = path::join(hostPath, "bin", binary); + + if (!os::exists(path)) { +- string command = "which " + binary; ++ string command = "@which@ " + binary; + Try which = os::shell(command); + + if (which.isSome()) { +@@ -295,7 +295,7 @@ Try NvidiaVolume::create() + : "No such file or directory")); + } + +- command = "cp " + realpath.get() + " " + path; ++ command = "@cp@ " + realpath.get() + " " + path; + Try cp = os::shell(command); + if (cp.isError()) { + return Error("Failed to os::shell '" + command + "': " + cp.error()); +@@ -367,7 +367,7 @@ Try NvidiaVolume::create() + Path(realpath.get()).basename()); + + if (!os::exists(libraryPath)) { +- string command = "cp " + realpath.get() + " " + libraryPath; ++ string command = "@cp@ " + realpath.get() + " " + libraryPath; + Try cp = os::shell(command); + if (cp.isError()) { + return Error("Failed to os::shell '" + command + "':" diff --git a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp -index b41e266..e07c163 100644 +index 0d9ec57d9..a177e4476 100644 --- a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp +++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp -@@ -163,7 +163,7 @@ Future> NamespacesPidIsolatorProcess::prepare( - // containers cannot see the namespace bind mount of other - // containers. - launchInfo.add_pre_exec_commands()->set_value( -- "mount -n --bind " + string(PID_NS_BIND_MOUNT_MASK_DIR) + -+ "@mount@ -n --bind " + string(PID_NS_BIND_MOUNT_MASK_DIR) + - " " + string(PID_NS_BIND_MOUNT_ROOT)); - - // Mount /proc for the container's pid namespace to show the -@@ -176,9 +176,9 @@ Future> NamespacesPidIsolatorProcess::prepare( - // -n flag so the mount is not added to the mtab where it will not - // be correctly removed with the namespace terminates. - launchInfo.add_pre_exec_commands()->set_value( -- "mount none /proc --make-private -o rec"); -+ "@mount@ none /proc --make-private -o rec"); +@@ -94,7 +94,7 @@ Future> NamespacesPidIsolatorProcess::prepare( + // + // TOOD(jieyu): Consider unmount the existing /proc. launchInfo.add_pre_exec_commands()->set_value( - "mount -n -t proc proc /proc -o nosuid,noexec,nodev"); + "@mount@ -n -t proc proc /proc -o nosuid,noexec,nodev"); return launchInfo; } +diff --git a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp +index c87e6715a..6601cd1b3 100644 +--- a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp ++++ b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp +@@ -262,9 +262,9 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags) + // here because 'create' will only be invoked during + // initialization. + Try mount = os::shell( +- "mount --bind %s %s && " +- "mount --make-private %s && " +- "mount --make-shared %s", ++ "@mount@ --bind %s %s && " ++ "@mount@ --make-private %s && " ++ "@mount@ --make-shared %s", + rootDir->c_str(), + rootDir->c_str(), + rootDir->c_str(), +@@ -284,8 +284,8 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags) + LOG(INFO) << "Making '" << rootDir.get() << "' a shared mount"; + + Try mount = os::shell( +- "mount --make-private %s && " +- "mount --make-shared %s", ++ "@mount@ --make-private %s && " ++ "@mount@ --make-shared %s", + rootDir->c_str(), + rootDir->c_str()); + +diff --git a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp +index b470f0c82..6110a43ee 100644 +--- a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp ++++ b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp +@@ -303,7 +303,7 @@ Try PortMapper::addPortMapping( + # Check if the `chain` exists in the iptable. If it does not + # exist go ahead and install the chain in the iptables NAT + # table. +- iptables -w -t nat --list %s ++ @iptables@ -w -t nat --list %s + if [ $? -ne 0 ]; then + # NOTE: When we create the chain, there is a possibility of a + # race due to which a container launch can fail. This can +@@ -317,25 +317,25 @@ Try PortMapper::addPortMapping( + # since it can happen only when the chain is created the first + # time and two commands for creation of the chain are executed + # simultaneously. +- (iptables -w -t nat -N %s || exit 1) ++ (@iptables@ -w -t nat -N %s || exit 1) + + # Once the chain has been installed add a rule in the PREROUTING + # chain to jump to this chain for any packets that are + # destined to a local address. +- (iptables -w -t nat -A PREROUTING \ ++ (@iptables@ -w -t nat -A PREROUTING \ + -m addrtype --dst-type LOCAL -j %s || exit 1) + + # For locally generated packets we need a rule in the OUTPUT + # chain as well, since locally generated packets directly hit + # the output CHAIN, bypassing PREROUTING. +- (iptables -w -t nat -A OUTPUT \ ++ (@iptables@ -w -t nat -A OUTPUT \ + ! -d 127.0.0.0/8 -m addrtype \ + --dst-type LOCAL -j %s || exit 1) + fi + + # Within the `chain` go ahead and install the DNAT rule, if it + # does not exist. +- (iptables -w -t nat -C %s || iptables -t nat -A %s))~", ++ (@iptables@ -w -t nat -C %s || @iptables@ -t nat -A %s))~", + chain, + chain, + chain, +@@ -362,7 +362,7 @@ Try PortMapper::delPortMapping() + # The iptables command searches for the DNAT rules with tag + # "container_id: ", and if it exists goes ahead + # and deletes it. +- iptables -w -t nat -S %s | sed "/%s/ s/-A/iptables -w -t nat -D/e")~", ++ @iptables@ -w -t nat -S %s | sed "/%s/ s/-A/@iptables@ -w -t nat -D/e")~", + chain, + getIptablesRuleTag()).get(); + diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp -index 79ee960..d55a353 100644 +index 20fb6ab35..46c160977 100644 --- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp +++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp -@@ -1392,19 +1392,19 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) +@@ -1393,19 +1393,19 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) // Check the availability of a few Linux commands that we will use. // We use the blocking os::shell here because 'create' will only be // invoked during initialization. @@ -211,7 +458,7 @@ index 79ee960..d55a353 100644 if (checkCommandIp.isError()) { return Error("Check command 'ip' failed: " + checkCommandIp.error()); } -@@ -1924,9 +1924,9 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) +@@ -1925,9 +1925,9 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) // visible. It's OK to use the blocking os::shell here because // 'create' will only be invoked during initialization. Try mount = os::shell( @@ -224,7 +471,7 @@ index 79ee960..d55a353 100644 bindMountRoot->c_str(), bindMountRoot->c_str(), bindMountRoot->c_str(), -@@ -1943,8 +1943,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) +@@ -1944,8 +1944,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) // shared mount yet (possibly due to slave crash while preparing // the work directory mount). It's safe to re-do the following. Try mount = os::shell( @@ -235,7 +482,7 @@ index 79ee960..d55a353 100644 bindMountRoot->c_str(), bindMountRoot->c_str()); -@@ -1963,8 +1963,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) +@@ -1964,8 +1964,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) // so that they are in different peer groups. if (entry.shared() == bindMountEntry->shared()) { Try mount = os::shell( @@ -246,14 +493,16 @@ index 79ee960..d55a353 100644 bindMountRoot->c_str(), bindMountRoot->c_str()); -@@ -3916,13 +3916,13 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -3911,6 +3911,8 @@ Try PortMappingIsolatorProcess::removeHostIPFilters( + // TODO(jieyu): Use the Subcommand abstraction to remove most of the + // logic here. Completely remove this function once we can assume a + // newer kernel where 'setns' works for mount namespaces. ++// cstrahan(nixos): this is executed in the container, ++// so we don't want to substitute paths here. + string PortMappingIsolatorProcess::scripts(Info* info) { ostringstream script; - -- script << "#!/bin/sh\n"; -+ script << "#!@sh@\n"; - script << "set -xe\n"; - +@@ -3921,7 +3923,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) // Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave // mount so that changes in the container will not be propagated to // the host. @@ -262,7 +511,7 @@ index 79ee960..d55a353 100644 // Disable IPv6 when IPv6 module is loaded as IPv6 packets won't be // forwarded anyway. -@@ -3930,7 +3930,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -3929,7 +3931,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) << " echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6\n"; // Configure lo and eth0. @@ -271,7 +520,7 @@ index 79ee960..d55a353 100644 << " mtu " << hostEth0MTU << " up\n"; // NOTE: This is mostly a kernel issue: in veth_xmit() the kernel -@@ -3939,12 +3939,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -3938,12 +3940,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) // when we receive a packet with a bad checksum. Disabling rx // checksum offloading ensures the TCP layer will checksum and drop // it. @@ -288,7 +537,7 @@ index 79ee960..d55a353 100644 // Restrict the ephemeral ports that can be used by the container. script << "echo " << info->ephemeralPorts.lower() << " " -@@ -3973,19 +3973,19 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -3972,19 +3974,19 @@ string PortMappingIsolatorProcess::scripts(Info* info) } // Set up filters on lo and eth0. @@ -312,7 +561,7 @@ index 79ee960..d55a353 100644 << " protocol ip" << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" << " flowid ffff:0" -@@ -3996,7 +3996,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -3995,7 +3997,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) foreach (const PortRange& range, getPortRanges(info->nonEphemeralPorts + info->ephemeralPorts)) { // Local traffic inside a container will not be redirected to eth0. @@ -321,7 +570,7 @@ index 79ee960..d55a353 100644 << " protocol ip" << " prio " << Priority(IP_FILTER_PRIORITY, HIGH).get() << " u32" << " flowid ffff:0" -@@ -4005,7 +4005,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -4004,7 +4006,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) // Traffic going to host loopback IP and ports assigned to this // container will be redirected to lo. @@ -330,7 +579,7 @@ index 79ee960..d55a353 100644 << " protocol ip" << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" << " flowid ffff:0" -@@ -4017,14 +4017,14 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -4016,14 +4018,14 @@ string PortMappingIsolatorProcess::scripts(Info* info) } // Do not forward the ICMP packet if the destination IP is self. @@ -347,7 +596,7 @@ index 79ee960..d55a353 100644 << " protocol ip" << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32" << " flowid ffff:0" -@@ -4033,9 +4033,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -4032,9 +4034,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) << net::IPNetwork::LOOPBACK_V4().address() << "\n"; // Display the filters created on eth0 and lo. @@ -359,7 +608,7 @@ index 79ee960..d55a353 100644 << " parent " << ingress::HANDLE << "\n"; // If throughput limit for container egress traffic exists, use HTB -@@ -4047,9 +4047,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -4046,9 +4048,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) // throughput. TBF requires other parameters such as 'burst' that // HTB already has default values for. if (egressRateLimitPerContainer.isSome()) { @@ -371,12 +620,12 @@ index 79ee960..d55a353 100644 << CONTAINER_TX_HTB_HANDLE << " classid " << CONTAINER_TX_HTB_CLASS_ID << " htb rate " << egressRateLimitPerContainer.get().bytes() * 8 << "bit\n"; -@@ -4060,12 +4060,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -4059,12 +4061,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) // fq_codel, which has a larger buffer and better control on // buffer bloat. // TODO(cwang): Verity that fq_codel qdisc is available. - script << "tc qdisc add dev " << eth0 -+ script << "@tC@ qdisc add dev " << eth0 ++ script << "@tc@ qdisc add dev " << eth0 << " parent " << CONTAINER_TX_HTB_CLASS_ID << " fq_codel\n"; // Display the htb qdisc and class created on eth0. @@ -388,11 +637,11 @@ index 79ee960..d55a353 100644 return script.str(); diff --git a/src/slave/containerizer/mesos/isolators/posix/disk.cpp b/src/slave/containerizer/mesos/isolators/posix/disk.cpp -index 3dfe7ad..4288666 100644 +index db0583386..542586370 100644 --- a/src/slave/containerizer/mesos/isolators/posix/disk.cpp +++ b/src/slave/containerizer/mesos/isolators/posix/disk.cpp -@@ -492,7 +492,7 @@ private: - // NOTE: The monitor watchdog will watch the parent process and kill +@@ -540,7 +540,7 @@ private: + // NOTE: The supervisor childhook will watch the parent process and kill // the 'du' process in case that the parent die. Try s = subprocess( - "du", @@ -400,11 +649,37 @@ index 3dfe7ad..4288666 100644 command, Subprocess::PATH("/dev/null"), Subprocess::PIPE(), +diff --git a/src/slave/containerizer/mesos/isolators/volume/image.cpp b/src/slave/containerizer/mesos/isolators/volume/image.cpp +index 210e67ad0..60b3a15e4 100644 +--- a/src/slave/containerizer/mesos/isolators/volume/image.cpp ++++ b/src/slave/containerizer/mesos/isolators/volume/image.cpp +@@ -214,7 +214,7 @@ Future> VolumeImageIsolatorProcess::_prepare( + + CommandInfo* command = launchInfo.add_pre_exec_commands(); + command->set_shell(false); +- command->set_value("mount"); ++ command->set_value("@mount@"); + command->add_arguments("mount"); + command->add_arguments("-n"); + command->add_arguments("--rbind"); +diff --git a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp +index 7b976d292..474dcd486 100644 +--- a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp ++++ b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp +@@ -240,7 +240,7 @@ Future> VolumeSandboxPathIsolatorProcess::prepare( + + CommandInfo* command = launchInfo.add_pre_exec_commands(); + command->set_shell(false); +- command->set_value("mount"); ++ command->set_value("@mount@"); + command->add_arguments("mount"); + command->add_arguments("-n"); + command->add_arguments("--rbind"); diff --git a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp -index b9f6d7a..0fcf455 100644 +index 9c5354e5f..a73a9692e 100644 --- a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp +++ b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp -@@ -141,7 +141,7 @@ Future CopyBackendProcess::_provision( +@@ -147,7 +147,7 @@ Future CopyBackendProcess::_provision( #endif // __APPLE__ || __FreeBSD__ Try s = subprocess( @@ -413,11 +688,20 @@ index b9f6d7a..0fcf455 100644 args, Subprocess::PATH("/dev/null"), Subprocess::PATH("/dev/null"), +@@ -180,7 +180,7 @@ Future CopyBackendProcess::destroy(const string& rootfs) + vector argv{"rm", "-rf", rootfs}; + + Try s = subprocess( +- "rm", ++ "@rm@", + argv, + Subprocess::PATH("/dev/null"), + Subprocess::FD(STDOUT_FILENO), diff --git a/src/uri/fetchers/copy.cpp b/src/uri/fetchers/copy.cpp -index f095ad6..ee0c2a7 100644 +index 2cfef5ab0..8a62f7699 100644 --- a/src/uri/fetchers/copy.cpp +++ b/src/uri/fetchers/copy.cpp -@@ -88,7 +88,7 @@ Future CopyFetcherPlugin::fetch( +@@ -97,7 +97,7 @@ Future CopyFetcherPlugin::fetch( const vector argv = {"cp", "-a", uri.path(), directory}; Try s = subprocess( @@ -427,10 +711,10 @@ index f095ad6..ee0c2a7 100644 Subprocess::PATH("/dev/null"), Subprocess::PIPE(), diff --git a/src/uri/fetchers/curl.cpp b/src/uri/fetchers/curl.cpp -index cc3f9ee..691d2d9 100644 +index 7b746d619..12bbb04df 100644 --- a/src/uri/fetchers/curl.cpp +++ b/src/uri/fetchers/curl.cpp -@@ -98,7 +98,7 @@ Future CurlFetcherPlugin::fetch( +@@ -107,7 +107,7 @@ Future CurlFetcherPlugin::fetch( }; Try s = subprocess( @@ -440,10 +724,10 @@ index cc3f9ee..691d2d9 100644 Subprocess::PATH("/dev/null"), Subprocess::PIPE(), diff --git a/src/uri/fetchers/docker.cpp b/src/uri/fetchers/docker.cpp -index 211be6f..d7e3771 100644 +index 3f38dddfb..fd991ee74 100644 --- a/src/uri/fetchers/docker.cpp +++ b/src/uri/fetchers/docker.cpp -@@ -113,7 +113,7 @@ static Future curl( +@@ -114,7 +114,7 @@ static Future curl( // TODO(jieyu): Kill the process if discard is called. Try s = subprocess( @@ -452,7 +736,7 @@ index 211be6f..d7e3771 100644 argv, Subprocess::PATH("/dev/null"), Subprocess::PIPE(), -@@ -212,7 +212,7 @@ static Future download( +@@ -213,7 +213,7 @@ static Future download( // TODO(jieyu): Kill the process if discard is called. Try s = subprocess( diff --git a/pkgs/applications/networking/cluster/mesos/rb36610.patch b/pkgs/applications/networking/cluster/mesos/rb36610.patch index c3b1b290422a..bee578cc3e93 100644 --- a/pkgs/applications/networking/cluster/mesos/rb36610.patch +++ b/pkgs/applications/networking/cluster/mesos/rb36610.patch @@ -1,11 +1,12 @@ diff --git a/src/linux/fs.cpp b/src/linux/fs.cpp -index ea0891e320154b85a21ed2d138c192821efae9cd..7b24c377c9a28cad91738305c273fb53a4dc7365 100644 +index 913e233..c2917a6 100644 --- a/src/linux/fs.cpp +++ b/src/linux/fs.cpp -@@ -19,6 +19,7 @@ +@@ -17,6 +17,7 @@ #include #include #include +#include - + #include + #include diff --git a/pkgs/applications/networking/cluster/mesos/rb51324.patch b/pkgs/applications/networking/cluster/mesos/rb51324.patch deleted file mode 100644 index 68ef866161fe..000000000000 --- a/pkgs/applications/networking/cluster/mesos/rb51324.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/3rdparty/stout/include/stout/os/ls.hpp b/3rdparty/stout/include/stout/os/ls.hpp -index f8da9ef..6d549d3 100644 ---- a/3rdparty/stout/include/stout/os/ls.hpp -+++ b/3rdparty/stout/include/stout/os/ls.hpp -@@ -18,6 +18,7 @@ - #else - #include - #endif // __WINDOWS__ -+ - #include - - #include -@@ -26,8 +27,6 @@ - #include - #include - --#include -- - - namespace os { - -@@ -36,36 +35,32 @@ inline Try> ls(const std::string& directory) - DIR* dir = opendir(directory.c_str()); - - if (dir == nullptr) { -- // Preserve `opendir` error. - return ErrnoError("Failed to opendir '" + directory + "'"); - } - -- dirent* temp = (dirent*) malloc(os::dirent_size(dir)); -- -- if (temp == nullptr) { -- // Preserve `malloc` error. -- ErrnoError error("Failed to allocate directory entries"); -- closedir(dir); -- return error; -- } -- - std::list result; - struct dirent* entry; -- int error; - -- while ((error = readdir_r(dir, temp, &entry)) == 0 && entry != nullptr) { -+ // Zero `errno` before starting to call `readdir`. This is necessary -+ // to allow us to determine when `readdir` returns an error. -+ errno = 0; -+ -+ while ((entry = readdir(dir)) != NULL) { - if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) { - continue; - } - result.push_back(entry->d_name); - } - -- free(temp); -- closedir(dir); -+ if (errno != 0) { -+ // Preserve `readdir` error. -+ Error error = ErrnoError("Failed to read directory"); -+ closedir(dir); -+ return error; -+ } - -- if (error != 0) { -- // Preserve `readdir_r` error. -- return ErrnoError("Failed to read directories"); -+ if (closedir(dir) == -1) { -+ return ErrnoError("Failed to close directory"); - } - - return result; diff --git a/pkgs/applications/networking/cluster/mesos/rb51325.patch b/pkgs/applications/networking/cluster/mesos/rb51325.patch deleted file mode 100644 index 5c5ce00730bb..000000000000 --- a/pkgs/applications/networking/cluster/mesos/rb51325.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff --git a/3rdparty/stout/include/Makefile.am b/3rdparty/stout/include/Makefile.am -index 1f2ee85..b0b08d8 100644 ---- a/3rdparty/stout/include/Makefile.am -+++ b/3rdparty/stout/include/Makefile.am -@@ -64,7 +64,6 @@ nobase_include_HEADERS = \ - stout/os/chroot.hpp \ - stout/os/close.hpp \ - stout/os/constants.hpp \ -- stout/os/direntsize.hpp \ - stout/os/environment.hpp \ - stout/os/exists.hpp \ - stout/os/fcntl.hpp \ -@@ -108,7 +107,6 @@ nobase_include_HEADERS = \ - stout/os/posix/chown.hpp \ - stout/os/posix/chroot.hpp \ - stout/os/posix/close.hpp \ -- stout/os/posix/direntsize.hpp \ - stout/os/posix/exists.hpp \ - stout/os/posix/fcntl.hpp \ - stout/os/posix/fork.hpp \ -@@ -134,7 +132,6 @@ nobase_include_HEADERS = \ - stout/os/windows/bootid.hpp \ - stout/os/windows/chroot.hpp \ - stout/os/windows/close.hpp \ -- stout/os/windows/direntsize.hpp \ - stout/os/windows/exists.hpp \ - stout/os/windows/fcntl.hpp \ - stout/os/windows/fork.hpp \ -diff --git a/3rdparty/stout/include/stout/os/direntsize.hpp b/3rdparty/stout/include/stout/os/direntsize.hpp -deleted file mode 100644 -index 819f99a..0000000 ---- a/3rdparty/stout/include/stout/os/direntsize.hpp -+++ /dev/null -@@ -1,26 +0,0 @@ --// Licensed under the Apache License, Version 2.0 (the "License"); --// you may not use this file except in compliance with the License. --// You may obtain a copy of the License at --// --// http://www.apache.org/licenses/LICENSE-2.0 --// --// Unless required by applicable law or agreed to in writing, software --// distributed under the License is distributed on an "AS IS" BASIS, --// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --// See the License for the specific language governing permissions and --// limitations under the License. -- --#ifndef __STOUT_OS_DIRENTSIZE_HPP__ --#define __STOUT_OS_DIRENTSIZE_HPP__ -- -- --// For readability, we minimize the number of #ifdef blocks in the code by --// splitting platform specifc system calls into separate directories. --#ifdef __WINDOWS__ --#include --#else --#include --#endif // __WINDOWS__ -- -- --#endif // __STOUT_OS_DIRENTSIZE_HPP__ -diff --git a/3rdparty/stout/include/stout/os/posix/direntsize.hpp b/3rdparty/stout/include/stout/os/posix/direntsize.hpp -deleted file mode 100644 -index 9d8f72e..0000000 ---- a/3rdparty/stout/include/stout/os/posix/direntsize.hpp -+++ /dev/null -@@ -1,42 +0,0 @@ --// Licensed under the Apache License, Version 2.0 (the "License"); --// you may not use this file except in compliance with the License. --// You may obtain a copy of the License at --// --// http://www.apache.org/licenses/LICENSE-2.0 --// --// Unless required by applicable law or agreed to in writing, software --// distributed under the License is distributed on an "AS IS" BASIS, --// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --// See the License for the specific language governing permissions and --// limitations under the License. -- --#ifndef __STOUT_OS_POSIX_DIRENTSIZE_HPP__ --#define __STOUT_OS_POSIX_DIRENTSIZE_HPP__ -- --#include --#include -- -- --namespace os { -- --inline size_t dirent_size(DIR* dir) --{ -- // Calculate the size for a "directory entry". -- long name_max = fpathconf(dirfd(dir), _PC_NAME_MAX); -- -- // If we don't get a valid size, check NAME_MAX, but fall back on -- // 255 in the worst case ... Danger, Will Robinson! -- if (name_max == -1) { -- name_max = (NAME_MAX > 255) ? NAME_MAX : 255; -- } -- -- size_t name_end = (size_t) offsetof(dirent, d_name) + name_max + 1; -- -- size_t size = (name_end > sizeof(dirent) ? name_end : sizeof(dirent)); -- -- return size; --} -- --} // namespace os { -- --#endif // __STOUT_OS_POSIX_DIRENTSIZE_HPP__ -diff --git a/3rdparty/stout/include/stout/os/windows/direntsize.hpp b/3rdparty/stout/include/stout/os/windows/direntsize.hpp -deleted file mode 100644 -index 7c8c7a0..0000000 ---- a/3rdparty/stout/include/stout/os/windows/direntsize.hpp -+++ /dev/null -@@ -1,43 +0,0 @@ --// Licensed under the Apache License, Version 2.0 (the "License"); --// you may not use this file except in compliance with the License. --// You may obtain a copy of the License at --// --// http://www.apache.org/licenses/LICENSE-2.0 --// --// Unless required by applicable law or agreed to in writing, software --// distributed under the License is distributed on an "AS IS" BASIS, --// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --// See the License for the specific language governing permissions and --// limitations under the License. -- --#ifndef __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__ --#define __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__ -- --#include -- --#include -- -- --namespace os { -- --inline size_t dirent_size(DIR* dir) --{ -- // NOTE: Size calculation logic here is much simpler than on POSIX because -- // our implementation of `dirent` is constant-sized. In particular, on POSIX, -- // we usually have to calculate the maximum name size for a path before we -- // can alloc a correctly-size `dirent`, but on Windows, `dirent.d_name` is -- // always `MAX_PATH` bytes in size. -- // -- // This follows closely from the Windows standard API data structures for -- // manipulating and querying directories. For example, the structures -- // `WIN32_FIND_DATA`[1] (which in many ways is the Windows equivalent of -- // `dirent`) has a field `cFileName` (which is much like `d_name`) that is -- // also `MAX_PATH` in size. -- // -- // [1] https://msdn.microsoft.com/en-us/library/windows/desktop/aa365740(v=vs.85).aspx -- return sizeof(dirent); --} -- --} // namespace os { -- --#endif // __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__ diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index c0951d979904..984616173cb6 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.23.0.2"; in +let version = "3.24.0"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "0bq22nq2g1b0x5msm9if74ync2qk13n2782mwj2r1r7hsmx4liiz"; + sha256 = "1bacrl8lj90hqbh129hpbgqj78k1i84j83rkzn507jnykj4x8p9x"; }; configureFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 3041d6e045ef..52d1e3d79335 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { name = "gajim-icon-index.patch"; - url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb"; + url = "https://dev.gajim.org/gajim/gajim/commit/7d20ed2b98a3070add188efab7308a5a06d9f4a2.diff"; sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; }) ]; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index bbeb6c4aa4a3..25d71fa88597 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0h7wdsic4v6ys130w61zvxm5s2vc7y574hn7zby12rq88lhhrjh7"; }; + patches = [ ./uchar.patch ]; + buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib topkg ppx_sexp_conv erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring diff --git a/pkgs/applications/networking/instant-messengers/jackline/uchar.patch b/pkgs/applications/networking/instant-messengers/jackline/uchar.patch new file mode 100644 index 000000000000..f861135090e5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jackline/uchar.patch @@ -0,0 +1,302 @@ +diff --git a/_tags b/_tags +index 88318d9..b433ee8 100644 +--- a/_tags ++++ b/_tags +@@ -7,9 +7,11 @@ true : package(sexplib astring) + + : package(otr ppx_sexp_conv) + : package(uutf) ++: package(uchar) ++: package(uchar) + : package(lwt nocrypto) + : package(ppx_sexp_conv erm_xmpp) +-: package(ppx_sexp_conv otr hex ptime ptime.clock.os) ++: package(uchar ppx_sexp_conv otr hex ptime ptime.clock.os) + : package(erm_xmpp lwt tls tls.lwt ptime) + : package(erm_xmpp lwt tls tls.lwt) + +@@ -18,6 +20,6 @@ true : package(sexplib astring) + : package(notty lwt erm_xmpp otr) + : package(lwt otr erm_xmpp) + : package(lwt nocrypto otr notty tls.lwt x509) +-: package(hex lwt nocrypto erm_xmpp tls.lwt x509) ++: package(uchar hex lwt nocrypto erm_xmpp tls.lwt x509) + + : package(erm_xmpp hex lwt notty notty.lwt nocrypto otr sexplib tls tls.lwt ptime ptime.clock.os) +diff --git a/cli/cli_config.ml b/cli/cli_config.ml +index 618d655..dac6e68 100644 +--- a/cli/cli_config.ml ++++ b/cli/cli_config.ml +@@ -34,7 +34,7 @@ let rewrap term above below (prefix, inp, inp2) (width, _) = + let height = if col mod width = 0 then succ h else h in + (succ (col mod width), height) + in +- Notty_lwt.Term.cursor term (Some (col, row)) ++ Notty_lwt.Term.cursor term (Some (col - 1, row - 1)) + + let read_line ?(above = []) ?(prefix = "") ?default ?(below = []) term = + let rec go (pre, post) = +@@ -56,8 +56,8 @@ let read_line ?(above = []) ?(prefix = "") ?default ?(below = []) term = + | `Unhandled k -> + match k with + | `Key (`Enter, []) -> Lwt.return (char_list_to_str (pre @ post)) +- | `Key (`Uchar 0x43, [`Ctrl]) -> Lwt.fail (Invalid_argument "Ctrl-c") +- | `Key (`Uchar 0x44, [`Ctrl]) -> Lwt.fail (Invalid_argument "Ctrl-d") ++ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x43 -> Lwt.fail (Invalid_argument "Ctrl-c") ++ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x44 -> Lwt.fail (Invalid_argument "Ctrl-d") + | _ -> go (pre, post) + in + let pre = Utils.option [] str_to_char_list default in +@@ -180,7 +180,7 @@ let configure term () = + let pw = "Password: " in + let chars = match password with + | None -> I.string A.empty "will be asked at startup" +- | Some _ -> I.uchar A.empty 0x2605 5 1 ++ | Some _ -> I.uchar A.empty (Uchar.of_int 0x2605) 5 1 + in + above @ [I.(string A.empty pw <|> chars)] + in +diff --git a/cli/cli_input.ml b/cli/cli_input.ml +index 34b4288..07488f2 100644 +--- a/cli/cli_input.ml ++++ b/cli/cli_input.ml +@@ -314,19 +314,19 @@ let read_terminal term mvar input_mvar () = + | `Key (`Arrow `Up, []) -> p (fun s -> ok (history s Up)) >>= fun () -> loop () + | `Key (`Arrow `Down, []) -> p (fun s -> ok (history s Down)) >>= fun () -> loop () + +- | `Key (`Uchar 0x44, [`Ctrl]) (* C-d *) -> p (fun s -> Lwt.return (`Quit s)) ++ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x44 (* C-d *) -> p (fun s -> Lwt.return (`Quit s)) + + (* UI navigation and toggles *) + | `Key (`Page `Up, []) -> p (fun s -> ok (navigate_buddy_list s Up)) >>= fun () -> loop () + | `Key (`Page `Down, []) -> p (fun s -> ok (navigate_buddy_list s Down)) >>= fun () -> loop () + + | `Key (`Page `Up, [`Ctrl]) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop () +- | `Key (`Uchar 0x50, [`Ctrl]) (* C-p *) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop () ++ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x50 (* C-p *) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop () + | `Key (`Page `Down, [`Ctrl]) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop () +- | `Key (`Uchar 0x4E, [`Ctrl]) (* C-n *) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop () ++ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x4E (* C-n *) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop () + +- | `Key (`Uchar 0x58, [`Ctrl]) (* C-x *) -> p (fun s -> ok (activate_contact s s.last_active_contact)) >>= fun () -> loop () +- | `Key (`Uchar 0x51, [`Ctrl]) (* C-q *) -> ++ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x58 (* C-x *) -> p (fun s -> ok (activate_contact s s.last_active_contact)) >>= fun () -> loop () ++ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x51 (* C-q *) -> + let handle s = + let s = match List.rev s.notifications with + | x::_ -> activate_contact s x +diff --git a/cli/cli_state.ml b/cli/cli_state.ml +index 5603cfe..ee320ce 100644 +--- a/cli/cli_state.ml ++++ b/cli/cli_state.ml +@@ -24,7 +24,7 @@ type connect_v = + | Reconnect + | Presence of (User.presence * string option * int option) + +-type input = int list * int list ++type input = Uchar.t list * Uchar.t list + + type state = { + (* set only initially *) +diff --git a/cli/cli_support.ml b/cli/cli_support.ml +index 1c54df6..8275c38 100644 +--- a/cli/cli_support.ml ++++ b/cli/cli_support.ml +@@ -4,17 +4,17 @@ open Notty + module Char = struct + let hdash a w = + if !Utils.unicode then +- I.uchar a 0x2500 w 1 ++ I.uchar a (Uchar.of_int 0x2500) w 1 + else + I.char a '-' w 1 + and vdash a h = + if !Utils.unicode then +- I.uchar a 0x2502 1 h ++ I.uchar a (Uchar.of_int 0x2502) 1 h + else + I.char a '|' 1 h + and star a w = + if !Utils.unicode then +- I.uchar a 0x2605 w 1 ++ I.uchar a (Uchar.of_int 0x2605) w 1 + else + I.char a '*' w 1 + end +@@ -186,8 +186,8 @@ let v_center left right width = + and rw = I.width right + in + match rw, lw >= width with +- | 0, true -> (I.hcrop (lw - width + 1) 0 left, width) +- | 0, false -> (left, succ lw) ++ | 0, true -> (I.hcrop (lw - width + 1) 0 left, width - 1) ++ | 0, false -> (left, lw) + | _, _ -> + if lw + rw >= width then + let leftw = min (max (width - rw) (width / 2)) lw in +@@ -195,11 +195,11 @@ let v_center left right width = + let l = I.hcrop (lw - leftw) 0 left + and r = I.hcrop 0 (rw - rightw) right + in +- (I.(l <|> r), succ leftw) ++ (I.(l <|> r), leftw) + else +- (I.(left <|> right), succ lw) ++ (I.(left <|> right), lw) + +-let str_to_char_list str : int list = ++let str_to_char_list str : Uchar.t list = + let open Uutf in + List.rev (String.fold_utf_8 (fun acc _ -> function `Uchar i -> i :: acc | `Malformed _ -> acc) [] str) + +@@ -236,22 +236,26 @@ let readline_input = function + | k -> `Unhandled k + + let emacs_bindings = function +- | `Key (`Uchar 0x41, [`Ctrl]) (* C-a *) -> `Ok (fun (pre, post) -> ([], pre @ post)) +- | `Key (`Uchar 0x45, [`Ctrl]) (* C-e *) -> `Ok (fun (pre, post) -> (pre @ post, [])) ++ | `Key (`Uchar u, [`Ctrl]) as k -> ++ begin match Uchar.to_int u with ++ | 0x41 (* C-a *) -> `Ok (fun (pre, post) -> ([], pre @ post)) ++ | 0x45 (* C-e *) -> `Ok (fun (pre, post) -> (pre @ post, [])) + +- | `Key (`Uchar 0x4b, [`Ctrl]) (* C-k *) -> `Ok (fun (pre, _) -> (pre, [])) +- | `Key (`Uchar 0x55, [`Ctrl]) (* C-u *) -> `Ok (fun (_, post) -> ([], post)) ++ | 0x4b (* C-k *) -> `Ok (fun (pre, _) -> (pre, [])) ++ | 0x55 (* C-u *) -> `Ok (fun (_, post) -> ([], post)) + +- | `Key (`Uchar 0x46, [`Ctrl]) (* C-f *) -> ++ | 0x46 (* C-f *) -> + `Ok (fun (pre, post) -> + match post with + | [] -> (pre, post) + | hd::tl -> (pre @ [hd], tl)) +- | `Key (`Uchar 0x42, [`Ctrl]) (* C-b *) -> ++ | 0x42 (* C-b *) -> + `Ok (fun (pre, post) -> + match List.rev pre with + | [] -> ([], post) + | hd::tl -> (List.rev tl, hd :: post)) ++ | _ -> `Unhandled k ++ end + + | `Key (`Arrow `Left, [`Ctrl]) -> + `Ok (fun (pre, post) -> +diff --git a/src/contact.mli b/src/contact.mli +index 6926296..d6c795b 100644 +--- a/src/contact.mli ++++ b/src/contact.mli +@@ -8,7 +8,7 @@ val bare : contact -> Xjid.bare_jid + val preserve_messages : contact -> bool + val expanded : contact -> bool + val messages : contact -> User.message list +-val input_buffer : contact -> (int list * int list) ++val input_buffer : contact -> (Uchar.t list * Uchar.t list) + + val readline_history : contact -> string list + val add_readline_history : contact -> string -> contact +@@ -18,7 +18,7 @@ val set_history_position : contact -> int -> contact + val received : contact -> string -> contact + + val expand : contact -> contact +-val set_input_buffer : contact -> (int list * int list) -> contact ++val set_input_buffer : contact -> (Uchar.t list * Uchar.t list) -> contact + val set_preserve_messages : contact -> bool -> contact + + val reset : contact -> contact +diff --git a/src/muc.ml b/src/muc.ml +index 1c98037..3293541 100644 +--- a/src/muc.ml ++++ b/src/muc.ml +@@ -132,7 +132,7 @@ type groupchat = { + expand : bool ; + preserve_messages : bool ; + message_history : User.message list ; (* persistent if preserve_messages *) +- input_buffer : (int list * int list) ; ++ input_buffer : (Uchar.t list * Uchar.t list) ; + readline_history : string list ; + history_position : int ; + autojoin : bool ; +diff --git a/src/user.ml b/src/user.ml +index d039278..42a8c47 100644 +--- a/src/user.ml ++++ b/src/user.ml +@@ -229,7 +229,7 @@ type user = { + properties : property list ; + preserve_messages : bool ; + message_history : message list ; (* persistent if preserve_messages is true *) +- input_buffer: (int list * int list) ; (* not persistent *) ++ input_buffer: (Uchar.t list * Uchar.t list) ; (* not persistent *) + readline_history : string list ; (* not persistent *) + history_position : int ; (* not persistent *) + otr_fingerprints : fingerprint list ; +diff --git a/src/user.mli b/src/user.mli +index 52b503d..5ce41be 100644 +--- a/src/user.mli ++++ b/src/user.mli +@@ -118,7 +118,7 @@ type user = { + properties : property list ; + preserve_messages : bool ; + message_history : message list ; (* persistent if preserve_messages is true *) +- input_buffer: (int list * int list) ; (* not persistent *) ++ input_buffer: (Uchar.t list * Uchar.t list) ; (* not persistent *) + readline_history : string list ; (* not persistent *) + history_position : int ; + otr_fingerprints : fingerprint list ; +diff --git a/src/utils.ml b/src/utils.ml +index 0b4a3a7..cd9cb10 100644 +--- a/src/utils.ml ++++ b/src/utils.ml +@@ -30,31 +30,33 @@ let validate_utf8 txt = + let rec loop d buf = match Uutf.decode d with + | `Await -> Buffer.contents buf + | `End -> Buffer.contents buf +- | `Malformed _ -> if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD; loop d buf +- | `Uchar 0x000A -> (* newline *) Uutf.Buffer.add_utf_8 buf 0x000A ; loop d buf +- | `Uchar 0x0009 -> (* tab -> 4 spaces *) Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; loop d buf +- | `Uchar 0x007F (* DEL *) ++ | `Malformed _ -> if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD); loop d buf ++ | `Uchar u -> ++ match Uchar.to_int u with ++ | 0x000A -> (* newline *) Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x000A) ; loop d buf ++ | 0x0009 -> (* tab -> 4 spaces *) Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; loop d buf ++ | 0x007F (* DEL *) + (* See https://en.wikipedia.org/wiki/Unicode_control_characters / https://en.wikipedia.org/wiki/Bi-directional_text *) +- | `Uchar 0x200E | `Uchar 0x200F (* left-to-right / right-to-left *) +- | `Uchar 0x202A | `Uchar 0x202D (* left-to-right embedding / override *) +- | `Uchar 0x202B | `Uchar 0x202E (* right-to-left embedding / override *) +- | `Uchar 0x202C (* pop directional format *) +- | `Uchar 0x2066 | `Uchar 0x2067 (* l-t-r isolate r-t-l isolate *) +- | `Uchar 0x2068 | `Uchar 0x2069 (* first strong isolate / pop directional isolate *) +- | `Uchar 0x2028 | `Uchar 0x2029 (* line separator / page separator *) -> +- if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf +- | `Uchar x when x < 0x20 -> ++ | 0x200E | 0x200F (* left-to-right / right-to-left *) ++ | 0x202A | 0x202D (* left-to-right embedding / override *) ++ | 0x202B | 0x202E (* right-to-left embedding / override *) ++ | 0x202C (* pop directional format *) ++ | 0x2066 | 0x2067 (* l-t-r isolate r-t-l isolate *) ++ | 0x2068 | 0x2069 (* first strong isolate / pop directional isolate *) ++ | 0x2028 | 0x2029 (* line separator / page separator *) -> ++ if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf ++ | x when x < 0x20 -> + (* other control characters *) +- if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf +- | `Uchar x when x >= 0x0080 && x <= 0x009F -> ++ if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf ++ | x when x >= 0x0080 && x <= 0x009F -> + (* ctrl chars used in conjunction with ISO 8859 character sets (C0/C1) *) +- if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf ++ if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf + +- | `Uchar x -> ++ | x -> + let c = if !unicode then x else if x > 0xff then 0x3f else x in +- Uutf.Buffer.add_utf_8 buf c ; loop d buf ++ Uutf.Buffer.add_utf_8 buf (Uchar.of_int c) ; loop d buf + in +- let nln = `Readline 0x000A in ++ let nln = `Readline (Uchar.of_int 0x000A) in + loop (Uutf.decoder ~nln ~encoding:`UTF_8 (`String txt)) (Buffer.create (String.length txt)) + + let version = "%%VERSION_NUM%%" diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix deleted file mode 100644 index 45bb5518f9c1..000000000000 --- a/pkgs/applications/networking/yafc/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl, readline, libssh, intltool, libbsd, pkgconfig}: - -stdenv.mkDerivation rec { - name = "yafc-1.3.6"; - src = fetchurl { - url = "http://www.yafc-ftp.com/downloads/${name}.tar.xz"; - sha256 = "0wvrljihliggysfnzczc0s74i3ab2c1kzjjs99iqk98nxmb2b8v3"; - }; - - buildInputs = [ readline libssh intltool libbsd pkgconfig ]; - - meta = { - description = "ftp/sftp client with readline, autocompletion and bookmarks"; - homepage = http://www.yafc-ftp.com; - maintainers = [ stdenv.lib.maintainers.page ]; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 45e6674439e7..7cf0aeb203de 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "alt-ergo-${version}"; - version = "0.99.1"; + version = "1.30"; src = fetchurl { url = "http://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "0lnlf56ysisa45dxvbwzhl4fgyxyfz35psals2kv9x8gyq54zwpm"; + sha256 = "025pacb4ax864fn5x8k78mw6hiig4jcazblj18gzxspg4f1l5n1g"; }; buildInputs = with ocamlPackages; - [ ocaml findlib ocamlgraph zarith lablgtk ]; + [ ocaml findlib camlzip ocamlgraph zarith lablgtk ocplib-simplex ]; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 3891f3ca6d17..6363afb7a668 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "0.87.1"; + version = "0.87.3"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/35893/why3-0.87.1.tar.gz; - sha256 = "1ssik2f6fkpvwpdmxz8hrm3p62qas3sjlqya0r57s60ilpkgiwwb"; + url = https://gforge.inria.fr/frs/download.php/file/36398/why3-0.87.3.tar.gz; + sha256 = "1fn9v6w1ilkrm2n4rz31w8qvjnchyvwxiqs67z3f59b5k99wb2ka"; }; buildInputs = (with ocamlPackages; [ diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix new file mode 100644 index 000000000000..b9a1f2e7a843 --- /dev/null +++ b/pkgs/applications/version-management/gogs/default.nix @@ -0,0 +1,48 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper +, git, coreutils, bash, gzip, openssh +, sqliteSupport ? true +}: + +buildGoPackage rec { + name = "gogs-${version}"; + version = "0.9.113"; + + src = fetchFromGitHub { + owner = "gogits"; + repo = "gogs"; + rev = "v${version}"; + sha256 = "1zk83c9jiazfw3221yi2sidp7917q3dxb2xb7wrjg4an18gj46j7"; + }; + + patchPhase = '' + substituteInPlace models/repo.go \ + --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' + ''; + + buildInputs = [ makeWrapper ]; + + buildFlags = stdenv.lib.optionalString sqliteSupport "-tags sqlite"; + + outputs = [ "bin" "out" "data" ]; + + postInstall = '' + mkdir $data + cp -R $src/{public,templates} $data + + wrapProgram $bin/bin/gogs \ + --prefix PATH : ${stdenv.lib.makeBinPath [ bash git gzip openssh ]} \ + --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \ + --run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \ + --run "ln -fs $data/{public,templates} ." + ''; + + goPackagePath = "github.com/gogits/gogs"; + goDeps = ./deps.nix; + + meta = { + description = "A painless self-hosted Git service"; + homepage = "https://gogs.io"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ schneefux ]; + }; +} diff --git a/pkgs/applications/version-management/gogs/deps.nix b/pkgs/applications/version-management/gogs/deps.nix new file mode 100644 index 000000000000..4596eb1d2437 --- /dev/null +++ b/pkgs/applications/version-management/gogs/deps.nix @@ -0,0 +1,443 @@ +[ + { + goPackagePath = "github.com/Unknwon/cae"; + fetch = { + type = "git"; + url = "https://github.com/Unknwon/cae"; + rev = "c6aac99ea2cae2ebaf23f26f76b04fe3fcfc9f8c"; + sha256 = "0j6l1fcs6gp4qw6b9w3pg9fgah18lh1hanfz5y64r6ks244v3l7s"; + }; + } + { + goPackagePath = "github.com/Unknwon/com"; + fetch = { + type = "git"; + url = "https://github.com/Unknwon/com"; + rev = "28b053d5a2923b87ce8c5a08f3af779894a72758"; + sha256 = "09i9slj4zbsqmwkkx9bqi7cgpv6hqby6r98l6qx1wag89qijybz2"; + }; + } + { + goPackagePath = "github.com/Unknwon/i18n"; + fetch = { + type = "git"; + url = "https://github.com/Unknwon/i18n"; + rev = "39d6f2727e0698b1021ceb6a77c1801aa92e7d5d"; + sha256 = "1f4s9srdaqw2yqgc3d76vww3glbwka2f5q4zrwn8bb66kcazbfb7"; + }; + } + { + goPackagePath = "github.com/Unknwon/paginater"; + fetch = { + type = "git"; + url = "https://github.com/Unknwon/paginater"; + rev = "701c23f468663c34d1b1768c3ae1bcc57e11c5b3"; + sha256 = "09h3gyd9wyzgbkny5g5ihd4ckmv0bams8g5y2xfkd55gizlmx07p"; + }; + } + { + goPackagePath = "github.com/bradfitz/gomemcache"; + fetch = { + type = "git"; + url = "https://github.com/bradfitz/gomemcache"; + rev = "2fafb84a66c4911e11a8f50955b01e74fe3ab9c5"; + sha256 = "1k3vqmq008gad1cq1gaqa35k5ldn0z8fcx07c15x9v8p9xjbhkc9"; + }; + } + { + goPackagePath = "github.com/go-macaron/binding"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/binding"; + rev = "48920167fa152d02f228cfbece7e0f1e452d200a"; + sha256 = "00h4mdyhqkh75vgafyyyn54kdpwj82ifg9l6lxv9gnkw6frxhkan"; + }; + } + { + goPackagePath = "github.com/go-macaron/cache"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/cache"; + rev = "56173531277692bc2925924d51fda1cd0a6b8178"; + sha256 = "1116a22wm43q2l54nnycgli90kix787j20mpgya9qb6xnglcck59"; + }; + } + { + goPackagePath = "github.com/go-macaron/captcha"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/captcha"; + rev = "8aa5919789ab301e865595eb4b1114d6b9847deb"; + sha256 = "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm"; + }; + } + { + goPackagePath = "github.com/go-macaron/csrf"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/csrf"; + rev = "6a9a7df172cc1fcd81e4585f44b09200b6087cc0"; + sha256 = "173da2hl9fcfgkn0nv1ws3pr0gyyp88amhj2bfk4414k5a3r0nsa"; + }; + } + { + goPackagePath = "github.com/go-macaron/gzip"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/gzip"; + rev = "cad1c6580a07c56f5f6bc52d66002a05985c5854"; + sha256 = "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf"; + }; + } + { + goPackagePath = "github.com/go-macaron/i18n"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/i18n"; + rev = "ef57533c3b0fc2d8581deda14937e52f11a203ab"; + sha256 = "1nkrcnpjl3x6fhjss2vp29mnvam20vpvxvxpfg1zspi1rjmpyhqy"; + }; + } + { + goPackagePath = "github.com/go-macaron/inject"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/inject"; + rev = "d8a0b8677191f4380287cfebd08e462217bac7ad"; + sha256 = "0p47pz699xhmi8yxhahvrpai9r49rqap5ckwmz1dlkrnh3zwhrhh"; + }; + } + { + goPackagePath = "github.com/go-macaron/session"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/session"; + rev = "b8a2b5ef7fb4c91c1c8ca23e2a52e29a4bcbb22f"; + sha256 = "1nz823fn23wp87pzzhpxlbr6j7q4khywa9n0h1kpdikiy87z5k5m"; + }; + } + { + goPackagePath = "github.com/go-macaron/toolbox"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/toolbox"; + rev = "99a42f20e9e88daec5c0d7beb4e7eac134680ab0"; + sha256 = "0r6ksiqzrii7b9vv8daz68044pyifsxmpz48m6h8m6l3h9ygz8cx"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034"; + sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5"; + }; + } + { + goPackagePath = "github.com/go-xorm/builder"; + fetch = { + type = "git"; + url = "https://github.com/go-xorm/builder"; + rev = "db75972580de4a7c6c20fff5b16a924c3de3fa12"; + sha256 = "0qgrvjfghkgfhbrm989yhrwgs36d6wxcap012glpmd2ddp5klw46"; + }; + } + { + goPackagePath = "github.com/go-xorm/core"; + fetch = { + type = "git"; + url = "https://github.com/go-xorm/core"; + rev = "2fbe2c76c6781d9e1c0398fc25386426e611f975"; + sha256 = "1rfry5md6g8b6d6vyqpqys3wl2mxf6v55d2aapxlx3hqn6lz0lax"; + }; + } + { + goPackagePath = "github.com/go-xorm/xorm"; + fetch = { + type = "git"; + url = "https://github.com/go-xorm/xorm"; + rev = "2189b36884a485d1d609fc5690bfc71a8a7de8c3"; + sha256 = "02z140xbwqins6ql8hwdr6ar3d67jqrkm22bamqbj2rmfl7z0846"; + }; + } + { + goPackagePath = "github.com/gogits/chardet"; + fetch = { + type = "git"; + url = "https://github.com/gogits/chardet"; + rev = "2404f777256163ea3eadb273dada5dcb037993c0"; + sha256 = "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd"; + }; + } + { + goPackagePath = "github.com/gogits/cron"; + fetch = { + type = "git"; + url = "https://github.com/gogits/cron"; + rev = "2fc07a4c4f1e3c4d2301c5ed578d5e2c31c70421"; + sha256 = "0a153pspisnhjpxjsryqdb29y6b8ics0203icbq5lps2g5jyaiw0"; + }; + } + { + goPackagePath = "github.com/gogits/git-module"; + fetch = { + type = "git"; + url = "https://github.com/gogits/git-module"; + rev = "df1013f8eb4dc70de90bc5597bf560a4b7da802e"; + sha256 = "1vnfiwdwp210hn7z7fgi5i80mggk76blbhykqg8wvx8bi0wxlrs8"; + }; + } + { + goPackagePath = "github.com/gogits/go-gogs-client"; + fetch = { + type = "git"; + url = "https://github.com/gogits/go-gogs-client"; + rev = "98046bb98061fc6baa5bb86359af0b7c300d384a"; + sha256 = "1wsg70irk4lwyak4kn2ml64j1fglqkyzs2lgc2mk4n4j5kn9hs1k"; + }; + } + { + goPackagePath = "github.com/gogits/go-libravatar"; + fetch = { + type = "git"; + url = "https://github.com/gogits/go-libravatar"; + rev = "cd1abbd55d09b793672732a7a1dfdaa12a40dfd0"; + sha256 = "00xvnddfh1m5g17mrnvp505i4sgwpk1r0wqz6a15bp6lvadwwlnj"; + }; + } + { + goPackagePath = "github.com/issue9/identicon"; + fetch = { + type = "git"; + url = "https://github.com/issue9/identicon"; + rev = "d36b54562f4cf70c83653e13dc95c220c79ef521"; + sha256 = "0y82b3gq8rpqglvf3lsqhgp5djfdammwd1w24k3i97iqls0rch7l"; + }; + } + { + goPackagePath = "github.com/jaytaylor/html2text"; + fetch = { + type = "git"; + url = "https://github.com/jaytaylor/html2text"; + rev = "4b9124c9b0a2279e2092c4a9aaf1c83bbd2dcffc"; + sha256 = "1yp0rawzziia9diffxs6k5g85acq3a62yb5ajbvy04r2p04dv85h"; + }; + } + { + goPackagePath = "github.com/klauspost/compress"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/compress"; + rev = "e3b7981a12dd3cab49afa1d3a50e715846f23732"; + sha256 = "0hxciiaqrbf7rr112r7rwk7jcwhvjpbhnp8ikszp56zwqd64k9vn"; + }; + } + { + goPackagePath = "github.com/klauspost/cpuid"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/cpuid"; + rev = "09cded8978dc9e80714c4d85b0322337b0a1e5e0"; + sha256 = "05l8pfch0gvxh0khapwxhsk4xajn40vbjr360n49vh2z5531v2xq"; + }; + } + { + goPackagePath = "github.com/klauspost/crc32"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/crc32"; + rev = "cb6bfca970f6908083f26f39a79009d608efd5cd"; + sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "8df6253d1317616f36b0c3740eb30c239a7372cb"; + sha256 = "0djs6k6rdh06v8bz0msn0lv532hk2vrljj1pz4kgmbqcmd17y31k"; + }; + } + { + goPackagePath = "github.com/mcuadros/go-version"; + fetch = { + type = "git"; + url = "https://github.com/mcuadros/go-version"; + rev = "257f7b9a7d87427c8d7f89469a5958d57f8abd7c"; + sha256 = "0mpbcc698503hbrlc74l3nqd6hdr0n6vybfzw10pg7qx3cpmn512"; + }; + } + { + goPackagePath = "github.com/microcosm-cc/bluemonday"; + fetch = { + type = "git"; + url = "https://github.com/microcosm-cc/bluemonday"; + rev = "e79763773ab6222ca1d5a7cbd9d62d83c1f77081"; + sha256 = "04rd8jzy8kzzm0j0k7wy90pykl8ws43yhhwl2gkyz6rak10jhqpz"; + }; + } + { + goPackagePath = "github.com/nfnt/resize"; + fetch = { + type = "git"; + url = "https://github.com/nfnt/resize"; + rev = "891127d8d1b52734debe1b3c3d7e747502b6c366"; + sha256 = "08lg2v4s1iyzqja7xb69d57gpz1y43yqfwv7i4fa7a06m595r9iw"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70"; + sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "b061729afc07e77a8aa4fad0a2fd840958f1942a"; + sha256 = "0q87n5an7ha2d8kl6gn9wi41rq0whsxq68w5x3nxz7w9vgkfnq1k"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "83532ca1c1caa393179c677b6facf48e61f4ca5d"; + sha256 = "08niiivkn9a1hdl738w2sq4vq6csqhw91an8wq83dk40q62f4sq8"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2"; + sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; + sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "cb497ae8f18e3c55f81bc9f3876c8f4c3d8a2813"; + sha256 = "0zah08y0a9rqk1ggp0ylkpycr3amrc22ncsppyrymry44g56xyfj"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "ae05321a78c1401cec22ba7bc203b597ea372496"; + sha256 = "1fzbijklrmhwj4mlwrnrxbbrhlzpgrsbv05zldbkvhic14g0ii2c"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "44f4f658a783b0cee41fe0a23b8fc91d9c120558"; + sha256 = "1hgwc2p5azfyzvl7i47my3wnbp2g7814a2sshqw63dvggs9mszcx"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/asn1-ber.v1"; + rev = "4e86f4367175e39f69d9358a5f17b4dda270378d"; + sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk"; + }; + } + { + goPackagePath = "gopkg.in/bufio.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/bufio.v1"; + rev = "567b2bfa514e796916c4747494d6ff5132a1dfce"; + sha256 = "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b"; + }; + } + { + goPackagePath = "gopkg.in/editorconfig/editorconfig-core-go.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/editorconfig/editorconfig-core-go.v1"; + rev = "a872f05c2e34b37b567401384d202aff11ba06d4"; + sha256 = "17mc7rm0fl5vi7ky95c2bd7c8ck0ms5bghzmgx9qk7x1zrw91335"; + }; + } + { + goPackagePath = "gopkg.in/gomail.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/gomail.v2"; + rev = "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1"; + sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc"; + }; + } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/ini.v1"; + rev = "6f66b0e091edb3c7b380f7c4f0f884274d550b67"; + sha256 = "1n09b7ypbayhk6x7qi3g3hrqjlmj5yszwl5d8jykjd5azp6h8sb8"; + }; + } + { + goPackagePath = "gopkg.in/ldap.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/ldap.v2"; + rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f"; + sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895"; + }; + } + { + goPackagePath = "gopkg.in/macaron.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/macaron.v1"; + rev = "ddb19a9f3e8cedd44696b9dd5854dc8a43f3dd6c"; + sha256 = "0riggdq8zxy5x6zhks66slvsg22b9i4399f7ns2l6daj79myqyvy"; + }; + } + { + goPackagePath = "gopkg.in/redis.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/redis.v2"; + rev = "e6179049628164864e6e84e973cfb56335748dea"; + sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } +] diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index f179325e0a22..6abb47b81c30 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -232,7 +232,7 @@ in homepage = https://github.com/kodi-pvr/pvr.hts; description = "Kodi's Tvheadend HTSP client addon"; platforms = platforms.all; - maintainers = with maintainers; [ page ]; + maintainers = with maintainers; [ cpages ]; }; }).override { buildInputs = [ cmake kodi libcec_platform kodi-platform ]; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 118d416df054..0801dc8573d0 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmakeHook, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-16.11.0"; + name = "smplayer-17.1.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0nhbr33p21qb7n6wry0nkavl5nfjzl5yylrhnxz0pyv69n5msfp5"; + sha256 = "0wgw940gxf3gqh6xzxvz037ipvr1xcw86gf0myvpb4lkwqh5jds0"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ba21a23f8ad8..2391775af42a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man -, go, containerd, runc +, go, containerd, runc, docker-proxy, tini , sqlite, iproute, bridge-utils, devicemapper, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , procps @@ -11,15 +11,53 @@ with lib; stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.12.6"; + version = "1.13.0"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "10jhjas07xxlxjsxby8865rr0d0zsc5azy16rsz1idmy7f7lk6jh"; + sha256 = "03b181xiqgnwanc567w9p6rbdgdvrfv0lk4r7b604ksm0fr4cz23"; }; + docker-runc = runc.overrideAttrs (oldAttrs: rec { + name = "docker-runc"; + src = fetchFromGitHub { + owner = "docker"; + repo = "runc"; + rev = "2f7393a47307a16f8cee44a37b262e8b81021e3e"; + sha256 = "1s5nfnbinzmcnm8avhvsniz0ihxyva4w5qz1hzzyqdyr0w2scnbj"; + }; + # docker/runc already include these patches / are not applicable + patches = []; + }); + docker-containerd = containerd.overrideAttrs (oldAttrs: rec { + name = "docker-containerd"; + src = fetchFromGitHub { + owner = "docker"; + repo = "containerd"; + rev = "03e5862ec0d8d3b3f750e19fca3ee367e13c090e"; + sha256 = "184sd9dwkcba3zhxnz9grw8p81x05977p36cif2dgkhjdhv12map"; + }; + }); + docker-tini = tini.overrideAttrs (oldAttrs: rec { + name = "docker-init"; + src = fetchFromGitHub { + owner = "krallin"; + repo = "tini"; + rev = "949e6facb77383876aeff8a6944dde66b3089574"; + sha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + }; + + # Do not remove static from make files as we want a static binary + patchPhase = '' + ''; + + NIX_CFLAGS_COMPILE = [ + "-DMINIMAL=ON" + ]; + }); + buildInputs = [ makeWrapper pkgconfig go-md2man go sqlite devicemapper btrfs-progs systemd @@ -52,16 +90,17 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd - install -Dm755 ./bundles/${version}/dynbinary-daemon/docker-proxy-${version} $out/libexec/docker/docker-proxy makeWrapper $out/libexec/docker/docker $out/bin/docker \ --prefix PATH : "$out/libexec/docker:$extraPath" makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ --prefix PATH : "$out/libexec/docker:$extraPath" # docker uses containerd now - ln -s ${containerd}/bin/containerd $out/libexec/docker/docker-containerd - ln -s ${containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim - ln -s ${runc}/bin/runc $out/libexec/docker/docker-runc + ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd + ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim + ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc + ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy + ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix new file mode 100644 index 000000000000..a9f278c4d2a8 --- /dev/null +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, go, docker }: + +with lib; + +stdenv.mkDerivation rec { + name = "docker-proxy-${rev}"; + rev = "0f534354b813003a754606689722fe253101bc4e"; + + src = fetchFromGitHub { + inherit rev; + owner = "docker"; + repo = "libnetwork"; + sha256 = "1ah7h417llcq0xzdbp497pchb9m9qvjhrwajcjb0ybrs8v889m31"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + mkdir -p .gopath/src/github.com/docker + ln -sf $(pwd) .gopath/src/github.com/docker/libnetwork + GOPATH="$(pwd)/.gopath:$(pwd)/Godeps/_workspace" go build -ldflags="$PROXY_LDFLAGS" -o docker-proxy ./cmd/proxy + ''; + + installPhase = '' + mkdir -p $out/bin + cp docker-proxy $out/bin + ''; + + meta = { + description = "Docker proxy binary to forward traffic between host and containers"; + license = licenses.asl20; + homepage = https://github.com/docker/libnetwork; + maintainers = with maintainers; [vdemeester]; + platforms = docker.meta.platforms; + }; +} diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index 535ca551785f..2a7b4810a24f 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.8.3"; + version = "0.13.1"; name = "tini-${version}"; - src = fetchurl { - url = "https://github.com/krallin/tini/archive/v0.8.3.tar.gz"; - sha256 ="1w7rj4crrcyv25idmh4asbp2sxzwyihy5mbpw384bzxjzaxn9xpa"; + src = fetchFromGitHub { + owner = "krallin"; + repo = "tini"; + rev = "v${version}"; + sha256 ="1g4n8v5d197zcb41fcpbhip2x342383zw1d2zkv57w73vkqgv6z6"; }; patchPhase = "sed -i /tini-static/d CMakeLists.txt"; NIX_CFLAGS_COMPILE = [ "-DPR_SET_CHILD_SUBREAPER=36" "-DPR_GET_CHILD_SUBREAPER=37" ]; - buildInputs = [ cmake ]; + buildInputs = [ cmake glibc glibc.static ]; meta = with stdenv.lib; { description = "A tiny but valid init for containers"; homepage = https://github.com/krallin/tini; diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index 2958611e474b..fe9d30854708 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "paratype-pt-sane"; + name = "paratype-pt-sans"; src = fetchurl rec { url = "http://www.paratype.ru/uni/public/PTSans.zip"; diff --git a/pkgs/desktops/gnome-3/3.20/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.20/apps/accerciser/default.nix deleted file mode 100644 index f8856ca71307..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/accerciser/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, itstool, libxml2, python3Packages, at_spi2_core -, dbus, intltool, libwnck3 }: - -stdenv.mkDerivation rec { - name = "accerciser-3.14.0"; - - src = fetchurl { - url = "mirror://gnome/sources/accerciser/3.14/${name}.tar.xz"; - sha256 = "0x05gpajpcs01g7m34g6fxz8122cf9kx3k0lchwl34jy8xfr39gm"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi - python3Packages.pygobject3 python3Packages.ipython - at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme - ]; - - wrapPrefixVariables = [ "PYTHONPATH" ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Accerciser; - description = "Interactive Python accessibility explorer"; - maintainers = gnome3.maintainers; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.20/apps/bijiben/default.nix deleted file mode 100644 index 00895f9a2bb2..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/bijiben/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, evolution_data_server, evolution, sqlite -, makeWrapper, itstool, desktop_file_utils -, clutter_gtk, libuuid, webkitgtk, zeitgeist -, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig glib intltool itstool libxml2 - clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.defaultIconTheme librsvg - evolution_data_server evolution sqlite ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/bijiben" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Bijiben; - description = "Note editor designed to remain simple to use"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.20/apps/bijiben/src.nix deleted file mode 100644 index 83961869826b..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/bijiben/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "bijiben-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/bijiben/3.20/bijiben-3.20.2.tar.xz; - sha256 = "5774dfdedb79f5ffe5bac3cebe0816dc7e6410381744dcb999815061dee6a981"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix deleted file mode 100644 index b5f70d84e520..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 -, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool -, libgudev -, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool - gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2 - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop - gst_all_1.gst-plugins-bad clutter_gtk clutter-gst - libcanberra_gtk3 libgudev ]; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Cheese; - description = "Take photos and videos with your webcam, with fun graphical effects"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.20/apps/cheese/src.nix deleted file mode 100644 index 3ca8c8c73c8c..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/cheese/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "cheese-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/cheese/3.20/cheese-3.20.2.tar.xz; - sha256 = "b7c18719b708e039c063ef09278ee813923556e06af4a7e9598c5d3bdeb83775"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix deleted file mode 100644 index 095c6e7814eb..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, libnotify, gtkspell3 -, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite -, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf }: - -let - majVer = gnome3.version; -in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome3.evolution_data_server ]; - - propagatedBuildInputs = [ gnome3.gtkhtml ]; - - buildInputs = [ gtk3 glib intltool itstool libxml2 libtool - gdk_pixbuf gnome3.defaultIconTheme librsvg db icu - gnome3.evolution_data_server libsecret libical gcr - webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 - libcanberra_gtk3 bogofilter gnome3.libgdata sqlite - gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas dconf - gnome3.libgnome_keyring gnome3.glib_networking ]; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" - "--disable-libcryptui" ]; - - NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Evolution; - description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix deleted file mode 100644 index b43dc9c505d1..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evolution-3.20.5"; - - src = fetchurl { - url = mirror://gnome/sources/evolution/3.20/evolution-3.20.5.tar.xz; - sha256 = "2e13551ce0996963506f0bdde5e01c3b8aa0622849a272ff12877cd595baeb6e"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.20/apps/file-roller/default.nix deleted file mode 100644 index 181888293777..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/file-roller/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive - gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg - gnome3.dconf libnotify nautilus ]; - - installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/FileRoller; - description = "Archive manager for the GNOME desktop environment"; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix deleted file mode 100644 index 37595ae27d78..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "file-roller-3.20.3"; - - src = fetchurl { - url = mirror://gnome/sources/file-roller/3.20/file-roller-3.20.3.tar.xz; - sha256 = "6b5c2de4c6bd52318cacd2a398cdfa45a5f1df8a77c6652a38a6a1d3e53644e9"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix deleted file mode 100644 index 69056e28c260..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, intltool, fetchurl, enchant, isocodes -, pkgconfig, gtk3, glib -, bash, wrapGAppsHook, itstool, libsoup, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, gspell }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup - gnome3.libpeas gnome3.gtksourceview libxml2 - gnome3.gsettings_desktop_schemas gnome3.dconf file gspell ]; - - enableParallelBuilding = true; - - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.libpeas gnome3.gtksourceview ]}") - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gedit; - description = "Official text editor of the GNOME desktop environment"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gedit/src.nix deleted file mode 100644 index c511bc663a55..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gedit/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gedit-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gedit/3.20/gedit-3.20.2.tar.xz; - sha256 = "32a1276a71a0d4a5af4e20a87bc273170ba8e075fc1ca7f51c8d3a6c150463f8"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.20/apps/glade/default.nix deleted file mode 100644 index a0f8d9669556..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/glade/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, intltool, fetchurl, python -, pkgconfig, gtk3, glib -, makeWrapper, itstool, libxml2, docbook_xsl -, gnome3, librsvg, gdk_pixbuf, libxslt }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python - gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl - gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/glade" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Glade; - description = "User interface designer for GTK+ applications"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/glade/src.nix b/pkgs/desktops/gnome-3/3.20/apps/glade/src.nix deleted file mode 100644 index d32dbd94d059..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/glade/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "glade-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/glade/3.20/glade-3.20.0.tar.xz; - sha256 = "82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix deleted file mode 100644 index edb0075fdae5..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib -, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk -, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32 -, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg -, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen -, libusb, libarchive, acl, libgudev, qemu -}: - -# TODO: ovirt (optional) - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - enableParallelBuilding = true; - - doCheck = true; - - buildInputs = [ - makeWrapper pkgconfig intltool itstool libvirt-glib glib - gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol - libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp - gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive - librsvg desktop_file_utils acl libgudev numactl xen - ]; - - preFixup = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}" - done - ''; - - meta = with stdenv.lib; { - description = "Simple GNOME 3 application to access remote or virtual systems"; - homepage = https://wiki.gnome.org/action/show/Apps/Boxes; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/src.nix deleted file mode 100644 index 1d53821b13a2..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-boxes-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-boxes/3.20/gnome-boxes-3.20.2.tar.xz; - sha256 = "c0379ce1de9d2a43a6875cbe1f2ef7ef69161b284926d59c44246a9142130fc5"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/default.nix deleted file mode 100644 index 5fe6583660cb..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, evolution_data_server, sqlite, libxml2, libsoup -, glib, gnome_online_accounts }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server - sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Calendar; - description = "Simple and beautiful calendar application for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/src.nix deleted file mode 100644 index 4871139a6f31..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-calendar-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-calendar/3.20/gnome-calendar-3.20.2.tar.xz; - sha256 = "f132cff56310b83cf086628e949685b04cdaf872e989d67dbb8a3e4e9943deee"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/default.nix deleted file mode 100644 index 4571a5d50e8b..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, gjs, gdk_pixbuf, librsvg }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf - librsvg gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Design/Apps/CharacterMap; - description = "Simple utility application to find and insert unusual characters"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/src.nix deleted file mode 100644 index d29173c23ff4..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-characters-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-characters/3.20/gnome-characters-3.20.1.tar.xz; - sha256 = "6891eed27a5b023200992540266a9216d081eef890d6d0836380dc3c0033857c"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/default.nix deleted file mode 100644 index e39614e765d6..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, intltool, fetchurl, libgweather, libnotify -, pkgconfig, gtk3, glib, gsound -, makeWrapper, itstool, libcanberra_gtk3, libtool -, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 - libgweather libnotify libtool gsound - wrapGAppsHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Clocks; - description = "Clock application designed for GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/src.nix deleted file mode 100644 index 30fccb61d34f..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-clocks-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-clocks/3.20/gnome-clocks-3.20.1.tar.xz; - sha256 = "92ad7b409c5118464af49ca28262ae43e9d377435ad2b10048b23e6e11ae476f"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix deleted file mode 100644 index 5daa7277f7b4..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, intltool, fetchurl, evince, gjs -, pkgconfig, gtk3, glib -, makeWrapper, itstool, libxslt, webkitgtk -, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib, inkscape, poppler_utils -, gmp, desktop_file_utils, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - configureFlags = [ "--enable-getting-started" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt - docbook_xsl desktop_file_utils inkscape poppler_utils - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.defaultIconTheme librsvg evince - libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib - wrapGAppsHook ]; - - enableParallelBuilding = true; - - preFixup = '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication" - - gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi') - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Documents; - description = "Document manager application designed to work with GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/src.nix deleted file mode 100644 index db5d2c610c99..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-documents-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-documents/3.20/gnome-documents-3.20.0.tar.xz; - sha256 = "a5fa496c5e80eccb8d2e5bba7f4d7dc4cc6c9f53d5bc028402428771be1237d2"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/default.nix deleted file mode 100644 index 0c75ebd7c783..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ intltool itstool libxml2 ]; - - meta = with stdenv.lib; { - homepage = https://live.gnome.org/DocumentationProject; - description = "Help a new user get started in GNOME"; - maintainers = gnome3.maintainers; - license = licenses.cc-by-sa-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/src.nix deleted file mode 100644 index 2550b1a46b4d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-getting-started-docs-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-getting-started-docs/3.20/gnome-getting-started-docs-3.20.0.tar.xz; - sha256 = "0dc3a69d646c3ee3c6ef1a34dbc7f469d66275bd20215071fd495ae5900fcfdc"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/default.nix deleted file mode 100644 index d4135fdb1bae..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libxml2, systemd }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - configureFlags = [ "--disable-tests" ]; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - systemd gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Logs; - description = "A log viewer for the systemd journal"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/src.nix deleted file mode 100644 index 81f5c29d7cae..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-logs-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-logs/3.20/gnome-logs-3.20.1.tar.xz; - sha256 = "b797841faac4e176c64497837de27b1b953d16d2482e8a773a48b38117b1367e"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix deleted file mode 100644 index 8625f21f3db7..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3 -, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook -, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup -, webkitgtk }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook - gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph - gnome3.geocode_glib libchamplain file libsoup - gdk_pixbuf librsvg autoreconfHook - gnome3.gsettings_desktop_schemas gnome3.evolution_data_server - gnome3.gnome_online_accounts gnome3.defaultIconTheme - webkitgtk ]; - - patches = [ ./soup.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Maps; - description = "A map application for GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/soup.patch b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/soup.patch deleted file mode 100644 index ef8c7a1287db..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/soup.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- gnome-maps-3.18.0/configure.ac.orig 2015-09-24 18:38:31.912498368 +0200 -+++ gnome-maps-3.18.0/configure.ac 2015-09-24 18:38:40.783320413 +0200 -@@ -50,8 +50,9 @@ - folks >= $FOLKS_MIN_VERSION - geocode-glib-1.0 >= $GEOCODE_MIN_VERSION - champlain-0.12 >= $CHAMPLAIN_MIN_VERSION - libxml-2.0 - rest-0.7 -+ libsoup-2.4 - ]) - AC_SUBST(GNOME_MAPS_LIB_CFLAGS) - AC_SUBST(GNOME_MAPS_LIB_LIBS) diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix deleted file mode 100644 index 054f340bf42f..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-maps-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-maps/3.20/gnome-maps-3.20.2.tar.xz; - sha256 = "e860144795339fdbb2f1239c4db092ad12beb9acaa3f3f8aa1d935c36d86bc3f"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix deleted file mode 100644 index ea8f15fd4e59..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker -, libxml2, python3Packages, libnotify, wrapGAppsHook -, pkgconfig, gtk3, glib, cairo -, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart - gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python - gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify - python3Packages.pycairo python3Packages.dbus-python python3Packages.requests2 - python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook - gnome3.gsettings_desktop_schemas makeWrapper tracker ]; - - wrapPrefixVariables = [ "PYTHONPATH" ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Music; - description = "Music player and management application for the GNOME desktop environment"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-music/src.nix deleted file mode 100644 index 43cec97929c2..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-music/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-music-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-music/3.20/gnome-music-3.20.2.tar.xz; - sha256 = "ca328bfd85ba8cb651e4e3c5d56499b111cb95b4f3e9b2e482cca7830213c7a0"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-nettool/default.nix deleted file mode 100644 index 4c152777f2cb..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-nettool/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libgtop, intltool, itstool, libxml2, nmap, inetutils }: - -stdenv.mkDerivation rec { - name = "gnome-nettool-3.8.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz"; - sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - propagatedUserEnvPkgs = [ nmap inetutils ]; - - meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gnome-network; - description = "A collection of networking tools"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/default.nix deleted file mode 100644 index df7e23ef9d4f..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, intltool, fetchurl, exempi, libxml2 -, pkgconfig, gtk3, glib -, makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp, libmediaart, wrapGAppsHook -, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata - gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart - gdk_pixbuf gnome3.defaultIconTheme librsvg exempi - gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif gnome3.tracker libxml2 desktop_file_utils - wrapGAppsHook gexiv2 ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Photos; - description = "Photos is an application to access, organize and share your photos with GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix deleted file mode 100644 index e8569dc5433a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-photos-3.20.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-photos/3.20/gnome-photos-3.20.3.tar.xz; - sha256 = "d1dd8bd8178dd1d0120abd2ff3e959fb1199f4e1751558f925ce7f1278548996"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/default.nix deleted file mode 100644 index 599bed87d6ee..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs -, libgweather, intltool, itstool, geoclue2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook gjs intltool itstool - libgweather gnome3.defaultIconTheme geoclue2 - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Weather; - description = "Access current weather conditions and forecasts"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/src.nix deleted file mode 100644 index 8229ad4dc045..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-weather-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-weather/3.20/gnome-weather-3.20.1.tar.xz; - sha256 = "e310ecd56f396ac0e8e5652ac8b63258720034e23afbf32fbb2d509f25bbb2b6"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.20/apps/nautilus-sendto/default.nix deleted file mode 100644 index 093900dcb7ab..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/nautilus-sendto/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool -, gobjectIntrospection, makeWrapper }: - -stdenv.mkDerivation rec { - name = "nautilus-sendto-${version}"; - - version = "3.8.1"; - - src = fetchurl { - url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; - sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; - }; - - buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ]; - - meta = with stdenv.lib; { - description = "Integrates Evolution and Pidgin into the Nautilus file manager"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.20/apps/polari/default.nix deleted file mode 100644 index 8efaa4e4aac8..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/polari/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme -, telepathy_glib, gjs, itstool, telepathy_idle -, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ telepathy_idle ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook - telepathy_glib gjs gdk_pixbuf librsvg ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Polari; - description = "IRC chat client designed to integrate with the GNOME desktop"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.20/apps/polari/src.nix deleted file mode 100644 index 3585deac26f4..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/polari/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "polari-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/polari/3.20/polari-3.20.2.tar.xz; - sha256 = "4b7641e54ee8a2e6018e1b4cea4802d94d90c2f09b9558e0a767838effd1347f"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix deleted file mode 100644 index e59df06f8a05..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, intltool, fetchurl, vala_0_32 -, pkgconfig, gtk3, glib -, makeWrapper, itstool, gnupg, libsoup -, gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit, openssh }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas makeWrapper gnupg - gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala_0_32 gnome3.gcr - openssh ]; - - preFixup = '' - wrapProgram "$out/bin/seahorse" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Seahorse; - description = "Application for managing encryption keys and passwords in the GnomeKeyring"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/3.20/apps/seahorse/src.nix deleted file mode 100644 index 0ae195a0a7ba..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/seahorse/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "seahorse-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/seahorse/3.20/seahorse-3.20.0.tar.xz; - sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.20/apps/vinagre/default.nix deleted file mode 100644 index 8b8b6248642c..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/vinagre/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool -, libsecret, itstool, makeWrapper, librsvg }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret - itstool makeWrapper gnome3.defaultIconTheme librsvg ]; - - preFixup = '' - wrapProgram "$out/bin/vinagre" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Vinagre; - description = "Remote desktop viewer for GNOME"; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/3.20/apps/vinagre/src.nix deleted file mode 100644 index ceb419cfdeed..000000000000 --- a/pkgs/desktops/gnome-3/3.20/apps/vinagre/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vinagre-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/vinagre/3.20/vinagre-3.20.2.tar.xz; - sha256 = "5fc78ef9ab9ee7d4e3c50d38d82d9bcbd915191bcf0349d55a2fd56eaa87eaa0"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/default.nix deleted file mode 100644 index 3c3a05dc3af8..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 -, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # For convenience, we can specify adwaita-icon-theme only in packages - propagatedBuildInputs = [ hicolor_icon_theme ]; - - buildInputs = [ gdk_pixbuf librsvg ]; - - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; - - # remove a tree of dirs with no files within - postInstall = '' rm -rf "$out/locale" ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/src.nix deleted file mode 100644 index e7eba88d2a3d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "adwaita-icon-theme-3.20"; - - src = fetchurl { - url = mirror://gnome/sources/adwaita-icon-theme/3.20/adwaita-icon-theme-3.20.tar.xz; - sha256 = "7a0a887349f340dd644032f89d81264b694c4b006bd51af1c2c368d431e7ae35"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix deleted file mode 100644 index f7a0ff473cc1..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, intltool, fetchurl, vala_0_32, libgtop -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - preFixup = '' - wrapProgram "$out/bin/baobab" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Baobab; - description = "Graphical application to analyse disk usage in any Gnome environment"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.20/core/baobab/src.nix deleted file mode 100644 index c72e5428c09a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/baobab/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "baobab-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/baobab/3.20/baobab-3.20.1.tar.xz; - sha256 = "e9dff12a76b0d730ce224215860512eb0188280c622faf186937563b96249d1f"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.20/core/caribou/default.nix deleted file mode 100644 index c2cb6a661abe..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/caribou/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake114x }: - -let - majorVersion = "0.4"; -in -stdenv.mkDerivation rec { - name = "caribou-${majorVersion}.18.1"; - - src = fetchurl { - url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz"; - sha256 = "0l1ikx56ddgayvny3s2xv8hs3p23xsclw4zljs3cczv4b89dzymf"; - }; - - buildInputs = with gnome3; - [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake114x - pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ]; - - propagatedBuildInputs = [ gnome3.libgee libxklavier ]; - - preBuild = '' - patchShebangs . - substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix deleted file mode 100644 index 6e0184e134e2..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme - intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix deleted file mode 100644 index ee04b9cd463f..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "dconf-editor-3.20.3"; - - src = fetchurl { - url = mirror://gnome/sources/dconf-editor/3.20/dconf-editor-3.20.3.tar.xz; - sha256 = "a8721499a277550b28d8dd94dafbea6efeb95fa153020da10603d0d4d628c579"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.20/core/dconf/default.nix deleted file mode 100644 index 598d60dd8b70..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/dconf/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: - -let - majorVersion = "0.24"; -in -stdenv.mkDerivation rec { - name = "dconf-${version}"; - version = "${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz"; - sha256 = "4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2"; - }; - - buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 - intltool docbook_xsl docbook_xsl_ns makeWrapper ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix deleted file mode 100644 index 9a29d11f1aea..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, gnome3, gdk_pixbuf -, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream -, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control -, telepathy_logger, libnotify, clutter, libsoup, gnutls -, evolution_data_server -, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info -, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: - -# TODO: enable more features - -let - majorVersion = "3.12"; -in -stdenv.mkDerivation rec { - name = "empathy-${majorVersion}.11"; - - src = fetchurl { - url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz"; - sha256 = "11yl8msyf017197fm6h15yw159yjp9i08566l967yashbx7gzr6i"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome_online_accounts shared_mime_info ]; - propagatedBuildInputs = [ folks telepathy_logger evolution_data_server - telepathy_mission_control ]; - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper - telepathy_glib clutter_gtk clutter-gst cogl - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas - file libtool librsvg ]; - - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" - "-I${dbus_libs.dev}/include/dbus-1.0" - "-I${dbus_libs.dev}/lib/dbus-1.0/include" ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Empathy; - description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = gnome3.maintainers; - # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/eog/default.nix b/pkgs/desktops/gnome-3/3.20/core/eog/default.nix deleted file mode 100644 index 5f36f25e095e..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/eog/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, wrapGAppsHook, librsvg, libexif }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = with gnome3; - [ intltool itstool libxml2 libjpeg gtk glib libpeas librsvg - gsettings_desktop_schemas shared_mime_info adwaita-icon-theme - gnome_desktop libexif dconf ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/EyeOfGnome; - platforms = platforms.linux; - description = "GNOME image viewer"; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix b/pkgs/desktops/gnome-3/3.20/core/eog/src.nix deleted file mode 100644 index d6962861e5cf..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "eog-3.20.4"; - - src = fetchurl { - url = mirror://gnome/sources/eog/3.20/eog-3.20.4.tar.xz; - sha256 = "1qsv3brhi8l8fr22nd3d0fwq5xhwspqw0bammhkkq3ga0z6791wn"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix deleted file mode 100644 index e472014e38f6..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu -, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk214x, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # Tests need an X display - configureFlags = [ "--disable-static --disable-tests" ]; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; - - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file - webkitgtk214x libsoup libsecret gnome_desktop libnotify libtool - sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools - gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common - gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf - gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav]; - - NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Epiphany; - description = "WebKit based web browser for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix deleted file mode 100644 index 84c94b45a592..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "epiphany-3.20.4"; - - src = fetchurl { - url = mirror://gnome/sources/epiphany/3.20/epiphany-3.20.4.tar.xz; - sha256 = "051av2xcg7ii2y273vqmdkzanygws9qsaq7ks0070y06d4rhl6xy"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/evince/default.nix b/pkgs/desktops/gnome-3/3.20/core/evince/default.nix deleted file mode 100644 index 7629e5b56550..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/evince/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libsecret , wrapGAppsHook -, librsvg, gobjectIntrospection -, recentListSize ? null # 5 is not enough, allow passing a different number -, supportXPS ? false # Open XML Paper Specification via libgxps -}: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ - intltool perl perlXMLParser libxml2 - glib gtk3 pango atk gdk_pixbuf gobjectIntrospection - itstool gnome3.adwaita-icon-theme - gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas - poppler ghostscriptX djvulibre libspectre - libsecret librsvg gnome3.adwaita-icon-theme gnome3.dconf - ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; - - configureFlags = [ - "--disable-nautilus" # Do not use nautilus - "--enable-introspection" - (if supportXPS then "--enable-xps" else "--disable-xps") - ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - preConfigure = with stdenv.lib; - optionalString doCheck '' - for file in test/*.py; do - echo "patching $file" - sed '1s,/usr,${python},' -i "$file" - done - '' + optionalString (recentListSize != null) '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c - ''; - - preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") - ''; - - doCheck = false; # would need pythonPackages.dogTail, which is missing - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/projects/evince/; - description = "GNOME's document viewer"; - - longDescription = '' - Evince is a document viewer for multiple document formats. It - currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal - of Evince is to replace the multiple document viewers that exist - on the GNOME Desktop with a single simple application. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/evince/src.nix b/pkgs/desktops/gnome-3/3.20/core/evince/src.nix deleted file mode 100644 index 6f924bbbc1b7..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/evince/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evince-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/evince/3.20/evince-3.20.1.tar.xz; - sha256 = "fc7ac23036939c24f02e9fed6dd6e28a85b4b00b60fa4b591b86443251d20055"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix deleted file mode 100644 index 6b13b726296e..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python -, intltool, libsoup, libxml2, libsecret, icu, sqlite -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts - gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ] - ++ stdenv.lib.optional valaSupport vala_0_32; - - propagatedBuildInputs = [ libsecret nss nspr libical db ]; - - # uoa irrelevant for now - configureFlags = [ "--disable-uoa" "--disable-google-auth" ] - ++ stdenv.lib.optional valaSupport "--enable-vala-bindings"; - - preFixup = '' - for f in "$out/libexec/"*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix deleted file mode 100644 index eaeece5baf20..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evolution-data-server-3.20.5"; - - src = fetchurl { - url = mirror://gnome/sources/evolution-data-server/3.20/evolution-data-server-3.20.5.tar.xz; - sha256 = "0d1586cd326d997497a2a6fddd939a83892be07cb20f8c88fda5013f8c5bbe7e"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/folks/default.nix b/pkgs/desktops/gnome-3/3.20/core/folks/default.nix deleted file mode 100644 index 8327f9d31cc9..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/folks/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs -, telepathy_glib, evolution_data_server, libsecret, db }: - -# TODO: enable more folks backends - -let - majorVersion = "0.11"; -in -stdenv.mkDerivation rec { - name = "folks-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz"; - sha256 = "0q9hny6a38zn0gamv0ji0pn3jw6bpn2i0fr6vbzkhm9h9ws0cqvz"; - }; - - propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; - # dbus_daemon needed for tests - buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs - vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ]; - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = "--disable-fatal-warnings"; - - NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss" - "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; - - enableParallelBuilding = true; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Folks"; - - homepage = https://wiki.gnome.org/Projects/Folks; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = gnome3.maintainers; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.20/core/gconf/default.nix deleted file mode 100644 index a4cb3e8c1464..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gconf/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 -, intltool, polkit, orbit, withGtk ? false }: - -assert withGtk -> (gnome3 != null); - -stdenv.mkDerivation rec { - - versionMajor = "3.2"; - versionMinor = "6"; - moduleName = "GConf"; - - origName = "${moduleName}-${versionMajor}.${versionMinor}"; - - name = "gconf-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; - sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; - }; - - buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk; - propagatedBuildInputs = [ glib dbus_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # ToDo: ldap reported as not found but afterwards reported as supported - - meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gconf/; - description = "A system for storing application preferences"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.20/core/gcr/default.nix deleted file mode 100644 index 55eebf77be59..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gcr/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk -, gobjectIntrospection, makeWrapper, libxslt, vala_0_32, gnome3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig intltool gnupg glib gobjectIntrospection libxslt - libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32 - ]; - - propagatedBuildInputs = [ p11_kit ]; - - #doCheck = true; - - #enableParallelBuilding = true; issues on hydra - - preFixup = '' - wrapProgram "$out/bin/gcr-viewer" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gcr/src.nix b/pkgs/desktops/gnome-3/3.20/core/gcr/src.nix deleted file mode 100644 index d166f033266c..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gcr/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gcr-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gcr/3.20/gcr-3.20.0.tar.xz; - sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/default.nix deleted file mode 100644 index 51b67afb01fd..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus -, intltool, accountsservice, libX11, gnome3, systemd, gnome_session -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gdm-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz"; - sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3"; - }; - - preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" - substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' - substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch' - substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false' - sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in - ''; - - configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-initial-vt=10" ]; - - buildInputs = [ pkgconfig glib itstool libxml2 intltool - accountsservice gnome3.dconf systemd - gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam libtool ]; - - #enableParallelBuilding = true; # problems compiling - - # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GDM; - description = "A program that manages graphical display servers and handles graphical user logins"; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/disable_x_access_control.patch deleted file mode 100644 index 7691a9e86f0f..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/disable_x_access_control.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gdm-3.16.0/daemon/gdm-display.c.orig 2015-04-08 13:53:14.370274369 +0200 -+++ gdm-3.16.0/daemon/gdm-display.c 2015-04-08 13:53:36.287520435 +0200 -@@ -1706,9 +1706,10 @@ - - gdm_error_trap_push (); - -- for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { -+ /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { - XAddHost (self->priv->x11_display, &host_entries[i]); -- } -+ }*/ -+ XDisableAccessControl(self->priv->x11_display); - - XSync (self->priv->x11_display, False); - if (gdm_error_trap_pop ()) { diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/sessions_dir.patch deleted file mode 100644 index b8fbad4d731d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/sessions_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index f759d2d..d154716 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -373,9 +373,12 @@ get_system_session_dirs (void) - #ifdef ENABLE_WAYLAND_SUPPORT - DATADIR "/wayland-sessions/", - #endif -+ NULL, - NULL - }; - -+ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL; -+ - return search_dirs; - } - diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/xserver_path.patch deleted file mode 100644 index b451d129391a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/xserver_path.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200 -+++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200 -@@ -322,7 +322,11 @@ - fallback: - #endif - -- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ if (g_getenv("GDM_X_SERVER") != NULL) { -+ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER")); -+ } else { -+ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ } - } - - static gboolean ---- gdm-3.16.0/daemon/gdm-x-session.c.orig 2015-04-15 18:44:16.875743928 +0200 -+++ gdm-3.16.0/daemon/gdm-x-session.c 2015-04-16 13:34:02.335708638 +0200 -@@ -207,6 +207,8 @@ - char *display_fd_string = NULL; - char *vt_string = NULL; - char *display_number; -+ int nixos_argc = 0; -+ char **nixos_argv = NULL; - gsize display_number_size; - - auth_file = prepare_auth_file (); -@@ -236,7 +238,15 @@ - - display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO); - -- g_ptr_array_add (arguments, X_SERVER); -+ if (g_getenv("GDM_X_SERVER") != NULL) { -+ int i = 0; -+ g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL); -+ for (i = 0; i < nixos_argc; i++) { -+ g_ptr_array_add (arguments, nixos_argv[i]); -+ } -+ } else { -+ g_ptr_array_add (arguments, X_SERVER); -+ } - - if (vt_string != NULL) { - g_ptr_array_add (arguments, vt_string); -@@ -259,12 +269,12 @@ - g_ptr_array_add (arguments, "-noreset"); - g_ptr_array_add (arguments, "-keeptty"); - -- g_ptr_array_add (arguments, "-verbose"); -+ /*g_ptr_array_add (arguments, "-verbose"); - if (state->debug_enabled) { - g_ptr_array_add (arguments, "7"); - } else { - g_ptr_array_add (arguments, "3"); -- } -+ }*/ - - if (state->debug_enabled) { - g_ptr_array_add (arguments, "-core"); -@@ -275,6 +285,9 @@ - (const char * const *) arguments->pdata, - &error); - g_free (display_fd_string); -+ if (nixos_argv) { -+ g_strfreev (nixos_argv); -+ } - g_clear_object (&launcher); - g_ptr_array_free (arguments, TRUE); - ---- gdm-3.16.0/daemon/gdm-session.c.orig 2015-04-16 14:19:01.392802683 +0200 -+++ gdm-3.16.0/daemon/gdm-session.c 2015-04-16 14:20:36.012296764 +0200 -@@ -2359,6 +2359,12 @@ - gchar *desktop_names; - const char *locale; - -+ if (g_getenv ("GDM_X_SERVER") != NULL) { -+ gdm_session_set_environment_variable (self, -+ "GDM_X_SERVER", -+ g_getenv ("GDM_X_SERVER")); -+ } -+ - gdm_session_set_environment_variable (self, - "GDMSESSION", - get_session_name (self)); diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.20/core/gdm/default.nix deleted file mode 100644 index 25a44d90a5b2..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gdm/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus -, intltool, accountsservice, libX11, gnome3, systemd, gnome_session, autoreconfHook -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # Only needed to make it build - preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" - ''; - - configureFlags = [ "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-systemd=yes" - "--with-plymouth=yes" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - - buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook - accountsservice gnome3.dconf systemd - gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam libtool plymouth ]; - - #enableParallelBuilding = true; # problems compiling - - preBuild = '' - substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' - ''; - - # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ ./xserver_path.patch ./sessions_dir.patch - ./disable_x_access_control.patch ./no-dbus-launch.patch - ./libsystemd.patch ]; - - installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; - - postInstall = '' - mv $out/share/gdm/greeter/applications/gnome-shell.desktop $out/share/gdm/greeter/applications/org.gnome.Shell.desktop - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GDM; - description = "A program that manages graphical display servers and handles graphical user logins"; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/disable_x_access_control.patch deleted file mode 100644 index e100e013b786..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gdm/disable_x_access_control.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gdm-3.14.2/daemon/gdm-slave.c.orig 2015-04-16 15:05:27.844353079 +0200 -+++ gdm-3.14.2/daemon/gdm-slave.c 2015-04-16 15:05:40.240417915 +0200 -@@ -369,8 +369,9 @@ - gdm_error_trap_push (); - - for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { -- XAddHost (slave->priv->server_display, &host_entries[i]); -+ //XAddHost (slave->priv->server_display, &host_entries[i]); - } -+ XDisableAccessControl(slave->priv->server_display); - - XSync (slave->priv->server_display, False); - if (gdm_error_trap_pop ()) { diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/libsystemd.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/libsystemd.patch deleted file mode 100644 index 4556f418cc81..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gdm/libsystemd.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd ---- a/configure.ac 2016-05-27 11:10:44.589740789 +0200 -+++ b/configure.ac 2016-05-27 11:11:00.146427723 +0200 -@@ -888,7 +888,7 @@ - dnl --------------------------------------------------------------------------- - - PKG_CHECK_MODULES(SYSTEMD, -- [libsystemd-login >= 186 libsystemd-daemon], -+ [libsystemd], - [have_systemd=yes], [have_systemd=no]) - - if test "x$with_systemd" = "xauto" ; then -@@ -912,7 +912,7 @@ - AC_SUBST(SYSTEMD_LIBS) - - PKG_CHECK_MODULES(JOURNALD, -- [libsystemd-journal], -+ [libsystemd], - [have_journald=yes], [have_journald=no]) - - if test "x$enable_systemd_journal" = "xauto" ; then diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/no-dbus-launch.patch deleted file mode 100644 index c87554078c7c..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gdm/no-dbus-launch.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/daemon/gdm-launch-environment.c 2015-06-22 15:11:07.277474398 +0000 -+++ b/daemon/gdm-launch-environment.c 2015-06-22 15:12:31.301157665 +0000 -@@ -48,8 +48,6 @@ - #include "gdm-session-enum-types.h" - #include "gdm-launch-environment.h" - --#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session" -- - extern char **environ; - - #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate)) -@@ -512,7 +510,7 @@ - gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command); - } else { - /* wrap it in dbus-launch */ -- char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command); -+ char *command = g_strdup (launch_environment->priv->command); - - gdm_session_select_program (launch_environment->priv->session, command); - g_free (command); diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/sessions_dir.patch deleted file mode 100644 index b8fbad4d731d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gdm/sessions_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index f759d2d..d154716 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -373,9 +373,12 @@ get_system_session_dirs (void) - #ifdef ENABLE_WAYLAND_SUPPORT - DATADIR "/wayland-sessions/", - #endif -+ NULL, - NULL - }; - -+ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL; -+ - return search_dirs; - } - diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.20/core/gdm/src.nix deleted file mode 100644 index acd46534e14f..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gdm/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gdm-3.14.2"; - - src = fetchurl { - url = mirror://gnome/sources/gdm/3.14/gdm-3.14.2.tar.xz; - sha256 = "e20eb61496161ad95b1058dbf8aea9b7b004df4d0ea6b0fab4401397d9db5930"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/xserver_path.patch deleted file mode 100644 index 412daee9f270..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gdm/xserver_path.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200 -+++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200 -@@ -322,7 +322,11 @@ - fallback: - #endif - -- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ if (g_getenv("GDM_X_SERVER") != NULL) { -+ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER")); -+ } else { -+ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ } - } - - static gboolean diff --git a/pkgs/desktops/gnome-3/3.20/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.20/core/geocode-glib/default.nix deleted file mode 100644 index 4d75bdc49963..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/geocode-glib/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json_glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.20/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.20/core/geocode-glib/src.nix deleted file mode 100644 index 135e05e90e99..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/geocode-glib/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "geocode-glib-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/geocode-glib/3.20/geocode-glib-3.20.1.tar.xz; - sha256 = "669fc832cabf8cc2f0fc4194a8fa464cdb9c03ebf9aca5353d7cf935ba8637a2"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.20/core/gjs/default.nix deleted file mode 100644 index 20c3d4c99565..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gjs/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection -, spidermonkey_24, pango, readline, glib, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline ]; - - propagatedBuildInputs = [ spidermonkey_24 ]; - - postInstall = '' - sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la - ''; - - meta = with stdenv.lib; { - maintainers = gnome3.maintainers; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.20/core/gjs/src.nix deleted file mode 100644 index 4f63d858d7df..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gjs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gjs-1.44.0"; - - src = fetchurl { - url = mirror://gnome/sources/gjs/1.44/gjs-1.44.0.tar.xz; - sha256 = "88c960f6ad47a6931d123f5d6317d13704f58572f68a4391913a254ff27dce80"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/default.nix deleted file mode 100644 index 32d6d6e7535a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/src.nix deleted file mode 100644 index 23a31263bcf8..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-backgrounds-3.20"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-backgrounds/3.20/gnome-backgrounds-3.20.tar.xz; - sha256 = "d66c6e165e5c16b79ee4ab83102fa73fa20ce4e14191036ee68e8e82cf537127"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/default.nix deleted file mode 100644 index 7fae0b5c67f4..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, gnome3, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, makeWrapper, libnotify, libcanberra_gtk3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme - makeWrapper gnome3.gsettings_desktop_schemas itstool - libnotify libcanberra_gtk3 ]; - - preFixup = '' - wrapProgram "$out/bin/bluetooth-sendto" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; - description = "Application that let you manage Bluetooth in the GNOME destkop"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix deleted file mode 100644 index 474d4722b4ab..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-bluetooth-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.0.tar.xz; - sha256 = "93b3ca16b348a168d044b3f777049b7dba2a9292c4adb2751a771e3bc5e4eb53"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix deleted file mode 100644 index 3df800f402d4..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, wrapGAppsHook -, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - # Fix for https://github.com/NixOS/nixpkgs/issues/17912 - # See also https://bugzilla.gnome.org/show_bug.cgi?id=673101 - # Should be removed when next release comes out - srcHistoryEntry = fetchurl { - url = "https://raw.githubusercontent.com/GNOME/gnome-calculator/9bb6936ba74602ec891c1ffecdf1665dba1a1be4/data/history-entry.ui"; - sha256 = "0a6d6anwrg5l3kc7i8jyky4idnzi9bhjv9awi6615505pjhcxnaj"; - }; - - srcHistoryView = fetchurl { - url = "https://raw.githubusercontent.com/GNOME/gnome-calculator/b87b4f5cd0cff0b9cf9e9cd2a056c56be653cab1/data/history-view.ui"; - sha256 = "0zyq1mcxsh707jhh3vfqplk5s83lb26gvjz62l5l6rq5yrd43fyw"; - }; - - prePatch = '' - [ -f data/history-entry.ui ] && echo Remove the fix && exit 1 - [ -f data/history-view.ui ] && echo Remove the fix && exit 1 - cp -v ${srcHistoryEntry} data/history-entry.ui - cp -v ${srcHistoryView} data/history-view.ui - ''; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ bash gtk3 glib intltool itstool - libxml2 gnome3.gtksourceview mpfr gmp - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Calculator; - description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix deleted file mode 100644 index 60270be06b7f..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-calculator-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-calculator/3.20/gnome-calculator-3.20.2.tar.xz; - sha256 = "2af1c12a12a230f90fc221ff908efd80fe7eebfeaad56cd698c393d2fc34a8fb"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-common/default.nix deleted file mode 100644 index f9261e183ef1..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-common/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, which, gnome3, autoconf, automake }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - patches = [(fetchurl { - name = "gnome-common-patch"; - url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; - sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; - })]; - - propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which - - meta = with stdenv.lib; { - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-common/src.nix deleted file mode 100644 index 8ffe7e20e1a9..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-common/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-common-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz; - sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix deleted file mode 100644 index 8097cf32ba6e..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, intltool, fetchurl, evolution_data_server, db -, pkgconfig, gtk3, glib, libsecret -, libchamplain, clutter_gtk, geocode_glib -, bash, makeWrapper, itstool, folks, libnotify, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; - - # force build from vala - preBuild = '' - touch src/*.vala - ''; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server - gnome3.gsettings_desktop_schemas makeWrapper file libnotify - folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib - libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.defaultIconTheme librsvg - libchamplain clutter_gtk geocode_glib - vala_0_32 automake115x autoconf db ]; - - preFixup = '' - for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - patches = [ ./gio_unix.patch ]; - - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Contacts; - description = "Contacts is GNOME's integrated address book"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/gio_unix.patch deleted file mode 100644 index f1b3d3c94ac2..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/gio_unix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2015-04-09 18:45:50.581232289 +0200 -+++ configure.ac 2015-04-09 18:45:59.744280137 +0200 -@@ -54,6 +54,7 @@ - champlain-0.12 - clutter-gtk-1.0 - geocode-glib-1.0 >= 3.15.3 -+ gio-unix-2.0 - " - PKG_CHECK_MODULES(CONTACTS, [$pkg_modules]) - diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/src.nix deleted file mode 100644 index f483acaa441d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-contacts-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-contacts/3.20/gnome-contacts-3.20.0.tar.xz; - sha256 = "bef88dc728aa7bb058c530fd936b262d96bbc17e73d640279842371bb3ad1588"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix deleted file mode 100644 index 726f47d0cde6..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio -, gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev -, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, libkrb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev -, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk -, fontconfig, sound-theme-freedesktop, grilo }: - -# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules -# TODO: bluetooth, wacom, printers - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = - [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; - - # https://bugzilla.gnome.org/show_bug.cgi?id=752596 - enableParallelBuilding = false; - - buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib upower libcanberra_gtk2 gsettings_desktop_schemas - libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus - gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality - accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo - gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk - gnome3.vino udev libcanberra_gtk3 libgudev - networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ]; - - preBuild = '' - substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" - - # hack to make test-endianess happy - mkdir -p $out/share/locale - substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/" - ''; - - preFixup = with gnome3; '' - wrapProgram $out/bin/gnome-control-center \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - for i in $out/share/applications/*; do - substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" - done - ''; - - meta = with stdenv.lib; { - description = "Utilities to configure the GNOME desktop"; - license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/src.nix deleted file mode 100644 index 83c6e04d2433..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-control-center-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-control-center/3.20/gnome-control-center-3.20.1.tar.xz; - sha256 = "ce6474fc60f78ed3cfaf555e55a52ec3ebb6437fa184e08ad6077bbec380a1ed"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix deleted file mode 100644 index 7265f09731fd..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland -, gobjectIntrospection }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # this should probably be setuphook for glib - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 - xkeyboard_config isocodes itstool wayland - gtk3 glib intltool gnome_doc_utils libxkbfile - gobjectIntrospection ]; - - propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/src.nix deleted file mode 100644 index 1388a51aa78d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-desktop-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-desktop/3.20/gnome-desktop-3.20.2.tar.xz; - sha256 = "492c2da7aa8c3a8b65796e8171fc8f0dfb5d322dd2799c0d76392e1fb061e2b2"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix deleted file mode 100644 index c94c178558da..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-dictionary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Dictionary; - description = "Dictionary is the GNOME application to look up definitions"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/src.nix deleted file mode 100644 index 249cb314c2aa..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-dictionary-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-dictionary/3.20/gnome-dictionary-3.20.0.tar.xz; - sha256 = "efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/default.nix deleted file mode 100644 index c329d68674a4..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, bash, gtk3, glib, makeWrapper, cracklib, libnotify -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python -, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - libxslt libtool libsecret libpwquality cracklib - libnotify libdvdread libcanberra_gtk3 docbook_xsl - gdk_pixbuf gnome3.defaultIconTheme - librsvg udisks2 gnome3.gnome_settings_daemon - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-disks" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Disks; - description = "A udisks graphical front-end"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/src.nix deleted file mode 100644 index fd49e82e8c3a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-disk-utility-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-disk-utility/3.20/gnome-disk-utility-3.20.2.tar.xz; - sha256 = "ad12ae0f3a2ae9c690ca799dd1f690a8eb238575e0fd8f328b66a96eb9bf2c3d"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/default.nix deleted file mode 100644 index d0ec2307a852..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool -, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-font-viewer" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Program that can preview fonts and create thumbnails for fonts"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/src.nix deleted file mode 100644 index 7fc8110f3d8e..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-font-viewer-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-font-viewer/3.20/gnome-font-viewer-3.20.2.tar.xz; - sha256 = "c95b336c15fade23ce239087897d91abcd3ae3776cd15b0c71321629a94abe8e"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix deleted file mode 100644 index 3ea108808f50..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper -, docbook_xsl_ns, docbook_xsl, gnome3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = with gnome3; [ - dbus libgcrypt pam python gtk3 gconf libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit makeWrapper - ]; - - propagatedBuildInputs = [ glib libtasn1 libxslt ]; - - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; - - configureFlags = [ - "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories - "--with-pkcs11-modules=$$out/lib/pkcs11/" - ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-keyring" \ - --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - wrapProgram "$out/bin/gnome-keyring-daemon" \ - --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/src.nix deleted file mode 100644 index 88179fff3c7e..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-keyring-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz; - sha256 = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-menus/default.nix deleted file mode 100644 index 90209634fbf1..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-menus/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gnome-menus-${version}"; - version = "3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; - sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; - }; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; - - meta = { - homepage = "http://www.gnome.org"; - description = "Gnome menu specification"; - - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix deleted file mode 100644 index 85c15042614b..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper -, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common -, telepathy_glib, intltool, dbus_libs, icu -, libsoup, docbook_xsl_ns, docbook_xsl, gnome3 -}: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper - libsecret dbus_glib telepathy_glib intltool icu libsoup - docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; - - preFixup = '' - for f in "$out/libexec/"*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix deleted file mode 100644 index 088c4127b800..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-online-accounts-3.20.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-online-accounts/3.20/gnome-online-accounts-3.20.3.tar.xz; - sha256 = "094fc04cf3e0b4ace667fce3b5bdcca5093e0c93f9184439e663c69546c1e046"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/default.nix deleted file mode 100644 index 90fc3a8737ae..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, makeWrapper }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl - gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/libexec/*; do - wrapProgram "$f" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-${gnome3.grilo-plugins.major}" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; - description = "A set of crawlers that go through your online content and index them locally in Tracker"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/src.nix deleted file mode 100644 index 185a8e2bc6da..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-online-miners-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-online-miners/3.20/gnome-online-miners-3.20.0.tar.xz; - sha256 = "f46dac7743283385d2aeea588eeead216274d9f365e323b90f586de982336e36"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix deleted file mode 100644 index 29ebe8b0ca64..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-screenshot" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot; - description = "Utility used in the GNOME desktop environment for taking screenshots"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix deleted file mode 100644 index d6b0e28a0c27..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-screenshot-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-screenshot/3.20/gnome-screenshot-3.20.1.tar.xz; - sha256 = "06a89b6887146cdbbeb64adf11bdae21acf22b0422337041c66eedb21ef7e143"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix deleted file mode 100644 index 69b908ec01ed..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - configureFlags = "--enable-systemd"; - - buildInputs = with gnome3; - [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme - gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; - - # FIXME: glib binaries shouldn't be in .dev! - preFixup = '' - wrapProgram "$out/bin/gnome-session" \ - --prefix PATH : "${glib.dev}/bin" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-session/src.nix deleted file mode 100644 index 06c40b6c2cfb..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-session/src.nix +++ /dev/null @@ -1,11 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "3.20"; - name = "gnome-session-${major}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${major}/${name}.tar.xz"; - sha256 = "1npnjm6wirz2v0liv7n23ivp2w0y1q230qcdb681hhzmp7h9fpq2"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix deleted file mode 100644 index 00999353c2fb..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit -, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager -, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager - libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio - libcanberra_gtk3 upower colord libgweather xkeyboard_config - polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt - libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; - - # FIXME: glib binaries shouldn't be in .dev! - preFixup = '' - wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PATH : "${glib.dev}/bin" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/src.nix deleted file mode 100644 index 9091f2eb3617..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-settings-daemon-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-settings-daemon/3.20/gnome-settings-daemon-3.20.1.tar.xz; - sha256 = "e84a075d895ca3baeefb8508e0a901027b66f7d5a7ee8c966e31d301b38e78e7"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/default.nix deleted file mode 100644 index e9eae87f14e3..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, gnome3, file }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool - makeWrapper file ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; - description = "Modify and extend GNOME Shell functionality and behavior"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/src.nix deleted file mode 100644 index 5ad056ba1561..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-extensions-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell-extensions/3.20/gnome-shell-extensions-3.20.1.tar.xz; - sha256 = "bc432ec163c79794331290d7a9321bee184be077d348faf3b7a1639b672939a3"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix deleted file mode 100644 index cf781d24b6f0..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret -, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core -, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip -, sqlite, libgweather, libcanberra_gtk3 -, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: - -# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # Needed to find /etc/NetworkManager/VPN - configureFlags = [ "--sysconfdir=/etc" ]; - - buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf librsvg - clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns - libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server - libical libtool nss gtk gstreamer makeWrapper gdm - libcanberra_gtk3 gnome_control_center - defaultIconTheme sqlite gnome3.gnome-bluetooth - libgweather # not declared at build time, but typelib is needed at runtime - gnome3.gnome-clocks # schemas needed - at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; - - propagatedBuildInputs = [ python3Packages.pygobject3 python3Packages.python gobjectIntrospection ]; - - installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; - - preBuild = '' - patchShebangs src/data-to-c.pl - substituteInPlace data/Makefile --replace " install-keysDATA" "" - ''; - - preFixup = with gnome3; '' - wrapProgram "$out/bin/gnome-shell" \ - --prefix PATH : "${unzip}/bin" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ - --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - - wrapProgram "$out/bin/gnome-shell-extension-tool" \ - --prefix PYTHONPATH : "${python3Packages.pygobject3}/${python3Packages.python.sitePackages}:$PYTHONPATH" - - wrapProgram "$out/libexec/gnome-shell-calendar-server" \ - --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix deleted file mode 100644 index df4994cead0b..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-3.20.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell/3.20/gnome-shell-3.20.3.tar.xz; - sha256 = "b23fd558623bfdc726066be3f47bb5fb8ed9c0ad980a95d6afc6397b6d41171e"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-software/default.nix deleted file mode 100644 index 7c258e9cf211..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-software/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit -, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3 -, json_glib }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; - buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup - gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gtkspell3 json_glib - polkit attr acl libyaml ]; - propagatedBuildInputs = [ isocodes ]; - - postInstall = '' - mkdir -p $out/share/xml/ - ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes - ''; - - meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/software/PackageKit/; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - description = "GNOME Software lets you install and update applications and system extensions."; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix deleted file mode 100644 index ea9378fcd3cc..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-software-3.20.4"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-software/3.20/gnome-software-3.20.4.tar.xz; - sha256 = "d6a2794348e2c543218e3efb01105a7e6d51e93ad3055a2482e3104ca75345f2"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix deleted file mode 100644 index 50ee229cfa49..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-system-log-3.9.90"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; - sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-system-log" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-log/3.9/; - description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/default.nix deleted file mode 100644 index bdbdefecf229..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop makeWrapper - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-system-monitor" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/; - description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/src.nix deleted file mode 100644 index 3dd167ce5f7a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-system-monitor-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-system-monitor/3.20/gnome-system-monitor-3.20.1.tar.xz; - sha256 = "9b23ab443fd92050b95c03a0ab321bbd41696a0ffc89c06e79c8798dca0a44f9"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix deleted file mode 100644 index beb019947ce2..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32 -, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool gnome3.nautilus vala_0_32 ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 - desktop_file_utils wrapGAppsHook ]; - - # Silly ./configure, it looks for dbus file from gnome-shell in the - # installation tree of the package it is configuring. - preConfigure = '' - mkdir -p "$out/share/dbus-1/interfaces" - cp "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" "$out/share/dbus-1/interfaces" - ''; - - # FIXME: enable for gnome3 - configureFlags = [ "--disable-migration" ]; - - meta = with stdenv.lib; { - description = "The GNOME Terminal Emulator"; - homepage = https://wiki.gnome.org/Apps/Terminal/; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/src.nix deleted file mode 100644 index 9fa8e510ad80..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-terminal-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-terminal/3.20/gnome-terminal-3.20.2.tar.xz; - sha256 = "f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/default.nix deleted file mode 100644 index a33252a934c3..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk_pixbuf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf - gnome3.defaultIconTheme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/src.nix deleted file mode 100644 index 8388bd612213..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-themes-standard-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-themes-standard/3.20/gnome-themes-standard-3.20.2.tar.xz; - sha256 = "9d0d9c4b2c9f9008301c3c1878ebb95859a735b7fd4a6a518802b9637e4a7915"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/default.nix deleted file mode 100644 index 4f02673e036f..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; - - meta = with stdenv.lib; { - homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}"; - description = "User and system administration help for the GNOME desktop"; - maintainers = gnome3.maintainers; - license = licenses.cc-by-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/src.nix deleted file mode 100644 index 4c12fa6e0435..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-user-docs-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-user-docs/3.20/gnome-user-docs-3.20.2.tar.xz; - sha256 = "3e998ba05956582219b068e7f7abd9baebf8bc4067c9618d6d0be92c68a5bf32"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix deleted file mode 100644 index a405751a963e..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus -, pkgconfig, gtk3, glib, libxml2, gnused -, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - preConfigure = '' - sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf - ''; - - configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2.dev}/modules" - "--disable-bluetooth" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg - nautilus libnotify libcanberra_gtk3 ]; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas - ''; - - preFixup = '' - wrapProgram "$out/libexec/gnome-user-share-webdav" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-user-share/3.8; - description = "Service that exports the contents of the Public folder in your home directory on the local network"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/src.nix deleted file mode 100644 index b748091af68d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/src.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "3.18"; - minor = "1"; - name = "gnome-user-share-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/${major}/${name}.tar.xz"; - sha256 = "1p9cz93jbfx4a5gxfk54jm0sxddm73lrag92h3qgpgfrmp7xlr1y"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.20/core/grilo-plugins/default.nix deleted file mode 100644 index caa0176036fe..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/grilo-plugins/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av -, gmime, json_glib, avahi, tracker, itstool }: - -stdenv.mkDerivation rec { - major = "0.3"; - minor = "2"; - name = "grilo-plugins-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz"; - sha256 = "1z8s62a29zidm35ajf708r7d36glb27im4s52l02q9w1jwl8j6vr"; - }; - - installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ]; - - buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata - lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts - gnome3.totem-pl-parser gnome3.rest gmime json_glib - avahi gnome3.libmediaart tracker intltool itstool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "A collection of plugins for the Grilo framework"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.20/core/grilo/default.nix deleted file mode 100644 index 0bae28387bb1..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/grilo/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib -, libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }: - -stdenv.mkDerivation rec { - major = "0.3"; # if you change this, also change ./setup-hook.sh - minor = "1"; - name = "grilo-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz"; - sha256 = "0k6d8drgh7inbpxqfa9m9dm4vrhfb9ifi5b88fn8q2ljqwfwdggb"; - }; - - setupHook = ./setup-hook.sh; - - configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ]; - - preConfigure = '' - for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do - substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/" - substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0" - done - ''; - - buildInputs = [ pkgconfig file intltool glib libxml2 libsoup - gnome3.totem-pl-parser ]; - - propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.20/core/grilo/setup-hook.sh deleted file mode 100644 index 3291e38addb8..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/grilo/setup-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -make_grilo_find_plugins() { - if [ -d "$1"/lib/grilo-0.3 ]; then - addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.3" - fi -} - -envHooks+=(make_grilo_find_plugins) diff --git a/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/default.nix deleted file mode 100644 index 5123cadbdafd..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection - # just for passthru -, gnome3, gtk3, gsettings_desktop_schemas }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - postPatch = '' - for file in "background" "screensaver"; do - substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \ - --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/" - done - ''; - - buildInputs = [ glib gobjectIntrospection ]; - - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/src.nix deleted file mode 100644 index 14199e47dbb3..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gsettings-desktop-schemas-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gsettings-desktop-schemas/3.20/gsettings-desktop-schemas-3.20.0.tar.xz; - sha256 = "55a41b533c0ab955e0a36a84d73829451c88b027d8d719955d8f695c35c6d9c1"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix deleted file mode 100644 index 95785d9ed4d2..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libcanberra_gtk2, gobjectIntrospection, libtool, gnome3 }: - -let - majVer = "1.0"; -in stdenv.mkDerivation rec { - name = "gsound-${majVer}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz"; - sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; - }; - - buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GSound; - description = "Small library for playing system sounds"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceview/default.nix deleted file mode 100644 index ea95e39e5b2a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2Python, perl, intltool, gettext, gnome3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedBuildInputs = [ gtk3 ]; - - buildInputs = [ pkgconfig atk cairo glib pango - libxml2Python perl intltool gettext ]; - - preBuild = '' - substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" - ''; - - patches = [ ./nix_share_path.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.20/core/gtksourceview/nix_share_path.patch deleted file mode 100644 index c87350167c25..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/nix_share_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gtksourceview/gtksourceview-utils.c 2014-07-13 16:13:57.418687726 +0200 -+++ b/gtksourceview/gtksourceview-utils.c 2014-07-13 16:14:20.550847767 +0200 -@@ -68,6 +68,8 @@ - basename, - NULL)); - -+ g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL)); -+ - g_ptr_array_add (dirs, NULL); - - return (gchar**) g_ptr_array_free (dirs, FALSE); diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix deleted file mode 100644 index 4f80104cc3b2..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtksourceview-3.20.4"; - - src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.20/gtksourceview-3.20.4.tar.xz; - sha256 = "7a0e6ac95ff3862bd8ef77a40e95a942939e73cb407f2eb67af600d7ce533d01"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix deleted file mode 100644 index d0453ba8ebbf..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig glibmm gtkmm gtksourceview ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - homepage = "https://developer.gnome.org/gtksourceviewmm/"; - description = "C++ wrapper for gtksourceview"; - license = licenses.lgpl2; - maintainers = [ maintainers.juliendehos ]; - }; -} - diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix deleted file mode 100644 index 21fecfdc48af..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix +++ /dev/null @@ -1,11 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtksourceviewmm-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gtksourceviewmm/3.18/gtksourceviewmm-3.18.0.tar.xz; - sha256 = "51081ae3d37975dae33d3f6a40621d85cb68f4b36ae3835eec1513482aacfb39"; - }; -} - diff --git a/pkgs/desktops/gnome-3/3.20/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.20/core/gucharmap/default.nix deleted file mode 100644 index a43d3c570ce9..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gucharmap/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3 -, glib, desktop_file_utils, bash, appdata-tools -, makeWrapper, gnome3, file, itstool, libxml2 }: - -# TODO: icons and theme still does not work -# use packaged gnome3.adwaita-icon-theme - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools - gnome3.yelp_tools libxml2 file desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gucharmap" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gucharmap; - description = "GNOME Character Map, based on the Unicode Character Database"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/3.20/core/gucharmap/src.nix deleted file mode 100644 index 69c0dd600251..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/gucharmap/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gucharmap-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.2.tar.xz; - sha256 = "80141d3e892c3c4812c1a8fad8f89978559ef19e933843267e6e9a5524c09ec9"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix deleted file mode 100644 index a4c46ef85d4c..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib }: - -stdenv.mkDerivation rec { - name = "libcroco-0.6.11"; - - src = fetchurl { - url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; - sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk"; - }; - - outputs = [ "out" "dev" ]; - outputBin = "dev"; - - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - - buildInputs = [ pkgconfig libxml2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.unix; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgdata/default.nix deleted file mode 100644 index e455be07bdf9..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libgdata/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib -, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl, uhttpmock }: - -let - majorVersion = "0.17"; -in -stdenv.mkDerivation rec { - name = "libgdata-${majorVersion}.4"; - - src = fetchurl { - url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz"; - sha256 = "1xniw4y90hbk9fa548pa9pfclibw7amr2f458lfh16jdzq7gw5cz"; - }; - - NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; - - buildInputs = with gnome3; - [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection - liboauth gcr gnome_online_accounts p11_kit openssl uhttpmock ]; - - propagatedBuildInputs = [ json_glib ]; - - meta = with stdenv.lib; { - description = "GData API library"; - maintainers = with maintainers; [ raskin lethalman ]; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgee/default.nix deleted file mode 100644 index 0eaa7132e684..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libgee/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }: -let - ver_maj = "0.16"; - ver_min = "1"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "d95f8ea8e78f843c71b1958fa2fb445e4a325e4821ec23d0d5108d8170e564a5"; - }; - - doCheck = true; - - patches = [ ./fix_introspection_paths.patch ]; - - buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.20/core/libgee/fix_introspection_paths.patch deleted file mode 100644 index 67003f451645..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libgee/fix_introspection_paths.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000 -+++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000 -@@ -12085,8 +12085,8 @@ - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0" -+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix b/pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix deleted file mode 100644 index 0bfc617fac66..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }: -let - ver_maj = "0.6"; - ver_min = "8"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6"; - }; - - doCheck = true; - - patches = [ ./fix_introspection_paths.patch ]; - - buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = [ maintainers.spacefrogg ] ++ gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgnome-keyring/default.nix deleted file mode 100644 index c6c9323c010a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libgnome-keyring/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "libgnome-keyring-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz"; - sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; - }; - - propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = { - description = "Framework for managing passwords and other secrets"; - homepage = http://live.gnome.org/GnomeKeyring; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; - inherit (glib.meta) platforms maintainers; - - longDescription = '' - gnome-keyring is a program that keeps password and other secrets for - users. The library libgnome-keyring is used by applications to integrate - with the gnome-keyring system. - ''; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgnomekbd/default.nix deleted file mode 100644 index 4939a4ff7281..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libgnomekbd/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: - -stdenv.mkDerivation rec { - name = "libgnomekbd-3.6.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz"; - sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09"; - }; - - buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ]; - - preFixup = '' - wrapProgram $out/bin/gkbd-keyboard-display \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Keyboard management library"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgweather/default.nix deleted file mode 100644 index 79ede15df8f0..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libgweather/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf -, pango, gdk_pixbuf, atk, tzdata, gnome3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.20/core/libgweather/src.nix deleted file mode 100644 index ddded9a28d7c..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libgweather/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgweather-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/libgweather/3.20/libgweather-3.20.1.tar.xz; - sha256 = "81eb829fab6375cc9a4d448ae0f790e48f9720e91eb74678b22264cfbc8938d0"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix deleted file mode 100644 index b39e1f6fa56c..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff -, openssl, bzip2, acl, attr, libxml2 -}: - -stdenv.mkDerivation rec { - name = "libgxps-0.2.2"; - - src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; - sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; - }; - - buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ]; - propagatedBuildInputs = [ libarchive ]; - - configureFlags = "--without-liblcms2"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.20/core/libpeas/default.nix deleted file mode 100644 index 1ba143539d40..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libpeas/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 -, glib, gtk3, gobjectIntrospection, python3Packages, ncurses -}: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - configureFlags = [ "--enable-python3" ]; - - buildInputs = [ intltool pkgconfig glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "A GObject-based plugins engine"; - homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libpeas/src.nix b/pkgs/desktops/gnome-3/3.20/core/libpeas/src.nix deleted file mode 100644 index cd440858946e..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libpeas/src.nix +++ /dev/null @@ -1,13 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "1.18"; - minor = "0"; - version = "${major}.${minor}"; - name = "libpeas-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz"; - sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.20/core/libzapojit/default.nix deleted file mode 100644 index 5a8117528b68..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/libzapojit/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: - -stdenv.mkDerivation rec { - name = "libzapojit-0.0.3"; - - src = fetchurl { - url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz"; - sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; - }; - - buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix deleted file mode 100644 index 8b992d30e809..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 -, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; - - buildInputs = with gnome3; - [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2 - gnome3.geocode_glib - libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ]; - - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - patches = [ ./x86.patch ./math.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/math.patch b/pkgs/desktops/gnome-3/3.20/core/mutter/math.patch deleted file mode 100644 index dbdfd93f5e1d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/mutter/math.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig 2015-09-23 13:54:31.297523343 +0200 -+++ mutter-3.18.0/src/backends/meta-cursor-renderer.c 2015-09-23 13:54:43.728271766 +0200 -@@ -31,6 +31,7 @@ - - #include - #include -+#include - - #include "meta-stage.h" - diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.20/core/mutter/src.nix deleted file mode 100644 index 89f05f8ed1b2..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/mutter/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "mutter-3.20.3"; - - src = fetchurl { - url = mirror://gnome/sources/mutter/3.20/mutter-3.20.3.tar.xz; - sha256 = "142c5271df4bde968c725ed09026173292c07b4dd7ba75f19c4b14fc363af916"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.20/core/mutter/x86.patch deleted file mode 100644 index a997b27540ee..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/mutter/x86.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/core/window.c 2015-05-26 10:52:41.382834963 +0200 -+++ b/src/core/window.c 2015-05-26 10:53:03.039948034 +0200 -@@ -3499,7 +3499,7 @@ - - static MetaMonitorInfo * - find_monitor_by_winsys_id (MetaWindow *window, -- guint winsys_id) -+ gint winsys_id) - { - int i; - -@@ -3618,7 +3618,7 @@ - */ - - gboolean did_placement; -- guint old_output_winsys_id; -+ gint old_output_winsys_id; - MetaRectangle unconstrained_rect; - MetaRectangle constrained_rect; - MetaMoveResizeResultFlags result = 0; ---- a/src/core/startup-notification.c 2016-06-06 12:13:27.100251933 +0200 -+++ b/src/core/startup-notification.c 2016-06-06 12:13:42.554956773 +0200 -@@ -418,7 +418,7 @@ - elapsed = ctod->now - timestamp; - - meta_topic (META_DEBUG_STARTUP, -- "Sequence used %ld ms vs. %d max: %s\n", -+ "Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n", - elapsed, STARTUP_TIMEOUT, - meta_startup_notification_sequence_get_id (sequence)); - -[?25l[?25h[?1049h[?1h=[?25h[?25l~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ [?25h[?25lType :quit to exit Vim[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h -[?1l>[?1049l diff --git a/pkgs/desktops/gnome-3/3.20/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.20/core/nautilus/default.nix deleted file mode 100644 index 4cb0b7fb35ca..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/nautilus/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif -, gtk, gnome3, libunique, intltool, gobjectIntrospection -, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg - gnome3.gnome_desktop gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker libselinux ]; - - hardeningDisable = [ "format" ]; - - patches = [ ./extension_dir.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.20/core/nautilus/extension_dir.patch deleted file mode 100644 index 317b82579924..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/nautilus/extension_dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c -index 6273a76..4adcc8a 100644 ---- a/libnautilus-private/nautilus-module.c -+++ b/libnautilus-private/nautilus-module.c -@@ -242,11 +242,17 @@ void - nautilus_module_setup (void) - { - static gboolean initialized = FALSE; -+ const gchar* extensiondir = NULL; - - if (!initialized) { - initialized = TRUE; -- -- load_module_dir (NAUTILUS_EXTENSIONDIR); -+ -+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR"); -+ if (extensiondir == NULL) { -+ extensiondir = NAUTILUS_EXTENSIONDIR; -+ } -+ -+ load_module_dir (extensiondir); - - eel_debug_call_at_shutdown (free_module_objects); - } diff --git a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix deleted file mode 100644 index 5592e3bd7f89..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "nautilus-3.20.3"; - - src = fetchurl { - url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.3.tar.xz; - sha256 = "46600a2361a022a0170304aef7167caa29c0d52232063a3556bec6a77881310e"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/rest/default.nix b/pkgs/desktops/gnome-3/3.20/core/rest/default.nix deleted file mode 100644 index 344bc00780f9..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/rest/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }: - -stdenv.mkDerivation rec { - name = "rest-0.7.93"; - - src = fetchurl { - url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz"; - sha256 = "05mj10hhiik23ai8w4wkk5vhsp7hcv24bih5q3fl82ilam268467"; - }; - - buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.20/core/sushi/default.nix deleted file mode 100644 index fb010756f290..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/sushi/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz -, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 -, gdk_pixbuf, librsvg, gtk3, harfbuzz }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - - buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3 - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf - librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk - gnome3.evince icu makeWrapper harfbuzz ]; - - enableParallelBuilding = true; - - postConfigure = '' - substituteInPlace src/libsushi/sushi-font-widget.h \ - --replace "" "" - substituteInPlace src/libsushi/sushi-font-widget.c \ - --replace "" "" - ''; - - preFixup = '' - wrapProgram $out/libexec/sushi-start \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; - description = "A quick previewer for Nautilus"; - maintainers = gnome3.maintainers; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.20/core/sushi/src.nix deleted file mode 100644 index f972b22fae63..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/sushi/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "sushi-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/sushi/3.20/sushi-3.20.0.tar.xz; - sha256 = "6e729c789e9e7f02505e25d4ac6cfed47e676366f0942fca740094f7fe9eae9e"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.20/core/totem-pl-parser/default.nix deleted file mode 100644 index 63f36004bcd6..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/totem-pl-parser/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }: - -stdenv.mkDerivation rec { - name = "totem-pl-parser-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz"; - sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; - }; - - buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Simple GObject-based library to parse and save a host of playlist formats"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix b/pkgs/desktops/gnome-3/3.20/core/totem/default.nix deleted file mode 100644 index 884b328dbe71..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, intltool, fetchurl, gst_all_1 -, clutter_gtk, clutter-gst, python3Packages, shared_mime_info -, pkgconfig, gtk3, glib, gobjectIntrospection -, bash, wrapGAppsHook, itstool, libxml2, dbus_glib -, gnome3, librsvg, gdk_pixbuf, file, tracker, nautilus }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo - clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav - gnome3.libpeas shared_mime_info dbus_glib - gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop - gnome3.gsettings_desktop_schemas wrapGAppsHook file tracker nautilus ]; - - patches = [ ./x86.patch ]; - - propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; - - configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; - - GI_TYPELIB_PATH = "$out/lib/girepository-1.0"; - - wrapPrefixVariables = [ "PYTHONPATH" ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Movie player for the GNOME desktop based on GStreamer"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/totem/src.nix b/pkgs/desktops/gnome-3/3.20/core/totem/src.nix deleted file mode 100644 index 244549c4e26c..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/totem/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "totem-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/totem/3.20/totem-3.20.1.tar.xz; - sha256 = "6f22480361ae869fd336854b4f83614fde528aff4e808eb716de33432eb45c27"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/totem/x86.patch b/pkgs/desktops/gnome-3/3.20/core/totem/x86.patch deleted file mode 100644 index ada6d59e8e04..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/totem/x86.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/backend/bacon-video-widget.c 2016-06-07 20:47:22.981213063 +0200 -+++ b/src/backend/bacon-video-widget.c 2016-06-07 20:47:44.065781036 +0200 -@@ -2334,7 +2334,7 @@ - if (!gst_toc_entry_get_start_stop_times (entry, &start, &stop)) { - GST_DEBUG ("Chapter #%d (couldn't get times)", i); - } else { -- GST_DEBUG ("Chapter #%d (start: %li stop: %li)", i, start, stop); -+ GST_DEBUG ("Chapter #%d (start: %" G_GINT64_FORMAT " stop: %" G_GINT64_FORMAT ")", i, start, stop); - } - } - diff --git a/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix deleted file mode 100644 index 72ebd543e902..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, vala_0_32, sqlite, libxslt -, gnome3, librsvg, gdk_pixbuf, file, libnotify -, evolution_data_server, gst_all_1, poppler -, icu, taglib, libjpeg, libtiff, giflib, libcue -, libvorbis, flac, exempi, networkmanager -, libpng, libexif, libgsf, libuuid, bzip2 }: - -stdenv.mkDerivation rec { - - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler"; - - enableParallelBuilding = true; - - buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2 - bzip2 gnome3.totem-pl-parser libxslt - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite - upower libnotify evolution_data_server gnome3.libgee - gst_all_1.gstreamer gst_all_1.gst-plugins-base flac - poppler icu taglib libjpeg libtiff giflib libvorbis - exempi networkmanager libpng libexif libgsf libuuid ]; - - preConfigure = '' - substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" - ''; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; - description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/tracker/src.nix b/pkgs/desktops/gnome-3/3.20/core/tracker/src.nix deleted file mode 100644 index 0ac540f42494..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/tracker/src.nix +++ /dev/null @@ -1,11 +0,0 @@ -fetchurl: rec { - major = "1.8"; - minor = "0"; - name = "tracker-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/tracker/${major}/${name}.tar.xz"; - sha256 = "0zchaahk4w7dwanqk1vx0qgnyrlzlp81krwawfx3mv5zffik27x1"; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix b/pkgs/desktops/gnome-3/3.20/core/vino/default.nix deleted file mode 100644 index 524813957563..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, lib, makeWrapper -, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup -, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null -, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null -, zlib ? null, libjpeg ? null -, libXdamage ? null, libXfixes ? null, libXext ? null -, gnomeKeyringSupport ? false, libgnome_keyring3 ? null -, networkmanager ? null }: - -with lib; - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - buildInputs = [ - makeWrapper - pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup - ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ] - ++ optional gnomeKeyringSupport libgnome_keyring3 - ++ filter (p: p != null) [ - libsecret gnutls libgcrypt avahi zlib libjpeg - libXdamage libXfixes libXext networkmanager - ]; - - preFixup = '' - wrapProgram "$out/libexec/vino-server" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Vino; - description = "GNOME desktop sharing server"; - maintainers = with maintainers; [ lethalman domenkozar ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/vino/src.nix b/pkgs/desktops/gnome-3/3.20/core/vino/src.nix deleted file mode 100644 index 140a85d7d190..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/vino/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vino-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/vino/3.20/vino-3.20.2.tar.xz; - sha256 = "660488adc1bf577958e783d13f61dbd99c1d9c4e81d2ca063437ea81d39e4413"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.20/core/vte/2.90.nix deleted file mode 100644 index cbb52c9aaa12..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/vte/2.90.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }: - -stdenv.mkDerivation rec { - versionMajor = "0.36"; - versionMinor = "3"; - moduleName = "vte"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; - }; - - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; - - configureFlags = [ "--enable-introspection" ]; - - enableParallelBuilding = true; - - postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses" - ''; - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix b/pkgs/desktops/gnome-3/3.20/core/vte/default.nix deleted file mode 100644 index 7d2f04346410..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig -, gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls - -, selectTextPatch ? false -, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf -}: - -let baseAttrs = rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib - gnome3.gtk3 ncurses vala_0_32 libxml2 ]; - - propagatedBuildInputs = [ gnutls ]; - - preConfigure = "patchShebangs ."; - - configureFlags = [ "--enable-introspection" ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; - platforms = platforms.linux; - }; -}; - -in stdenv.mkDerivation ( baseAttrs - // stdenv.lib.optionalAttrs selectTextPatch rec { - name = "vte-ng-${version}"; - version = "0.44.1b-ng"; - src = fetchFromGitHub { - owner = "thestinger"; - repo = "vte-ng"; - rev = version; - sha256 = "0p61znma9742fd3c6b44rq7j6mhpr6gx2b9rldm3jhb62ss4vsyy"; - }; - # slightly hacky; I couldn't make it work with autoreconfHook - configureScript = "./autogen.sh"; - nativeBuildInputs = (baseAttrs.nativeBuildInputs or []) - ++ [ gtk_doc autoconf automake libtool gperf ]; - } -) - diff --git a/pkgs/desktops/gnome-3/3.20/core/vte/src.nix b/pkgs/desktops/gnome-3/3.20/core/vte/src.nix deleted file mode 100644 index 0b45aa24112d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/vte/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vte-0.44.2"; - - src = fetchurl { - url = mirror://gnome/sources/vte/0.44/vte-0.44.2.tar.xz; - sha256 = "a1ea594814bb136a3a9a6c7656b46240571f6a198825c1111007fe99194b0949"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.20/core/yelp-tools/default.nix deleted file mode 100644 index 9111802eb6a8..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/yelp-tools/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp/Tools; - description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/3.20/core/yelp-tools/src.nix deleted file mode 100644 index f03c6d1bc311..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/yelp-tools/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-tools-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz; - sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/default.nix deleted file mode 100644 index 0a3976f35a15..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, bash -, itstool, libxml2, libxslt, gnome3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "Yelp's universal stylesheets for Mallard and DocBook"; - maintainers = gnome3.maintainers; - license = [licenses.gpl2 licenses.lgpl2]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/src.nix deleted file mode 100644 index de5d68d1fab1..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-xsl-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz; - sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix deleted file mode 100644 index 4ee79bbc3dc5..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, gnome3, gdk_pixbuf, sqlite, groff -, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 -, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite - libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - librsvg gdk_pixbuf gnome3.defaultIconTheme groff - gnome3.gsettings_desktop_schemas wrapGAppsHook - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "The help viewer in Gnome"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp/src.nix b/pkgs/desktops/gnome-3/3.20/core/yelp/src.nix deleted file mode 100644 index a6cc7522c658..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/yelp/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/yelp/3.20/yelp-3.20.1.tar.xz; - sha256 = "dda0b051ad32908cb9d894d1db3ffdac69b21849b8a6a9a74d9669b017f608c2"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.20/core/zenity/default.nix deleted file mode 100644 index 8f525945a6af..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/zenity/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - preBuild = '' - mkdir -p $out/include - ''; - - buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.20/core/zenity/src.nix deleted file mode 100644 index 7b32e88a2c06..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/zenity/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "zenity-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/zenity/3.20/zenity-3.20.0.tar.xz; - sha256 = "02e8759397f813c0a620b93ebeacdab9956191c9dc0d0fcba1815c5ea3f15a48"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix deleted file mode 100644 index e935552b9f5f..000000000000 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ /dev/null @@ -1,401 +0,0 @@ -{ pkgs }: - -let - - pkgsFun = overrides: - let - self = self_ // overrides; - self_ = with self; { - - overridePackages = f: - let newself = pkgsFun (f newself self); - in newself; - - callPackage = pkgs.newScope self; - - version = "3.20"; - maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds DamienCassou ]; - - corePackages = with gnome3; [ - pkgs.desktop_file_utils pkgs.ibus - pkgs.shared_mime_info # for update-mime-database - glib # for gsettings - gtk3 # for gtk-update-icon-cache - glib_networking gvfs dconf gnome-backgrounds gnome_control_center - gnome-menus gnome_settings_daemon gnome_shell - gnome_themes_standard defaultIconTheme gnome-shell-extensions - pkgs.hicolor_icon_theme - ]; - - optionalPackages = with gnome3; [ baobab eog epiphany evince - gucharmap nautilus totem vino yelp gnome-bluetooth - gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot - gnome-system-log gnome-system-monitor - gnome_terminal gnome-user-docs bijiben evolution file-roller gedit - gnome-clocks gnome-music gnome-tweak-tool gnome-photos - nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs - gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool - gnome-getting-started-docs gnome-packagekit gnome-software - ]; - - gamesPackages = with gnome3; [ swell-foop lightsoff iagno - tali quadrapassel gnome-sudoku aisleriot five-or-more - four-in-a-row gnome-chess gnome-klotski gnome-mahjongg - gnome-mines gnome-nibbles gnome-robots gnome-tetravex - hitori gnome-taquin - ]; - - inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2 - clutter clutter-gst clutter_gtk cogl gtkvnc; - inherit (pkgs.gnome2) ORBit2; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; - libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; - orbit = ORBit2; - gnome3 = self // { recurseForDerivations = false; }; - gtk = gtk3; - gtkmm = gtkmm3; - vala = pkgs.vala_0_32; - gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - webkitgtk = webkitgtk212x; - -# Simplify the nixos module and gnome packages - defaultIconTheme = adwaita-icon-theme; - -# ISO installer -# installerIso = callPackage ./installer.nix {}; - -#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - - adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; - - baobab = callPackage ./core/baobab { }; - - caribou = callPackage ./core/caribou { }; - - dconf = callPackage ./core/dconf { }; - dconf-editor = callPackage ./core/dconf-editor { }; - - # empathy = callPackage ./core/empathy { - # webkitgtk = webkitgtk24x; - # clutter-gst = pkgs.clutter-gst; - # }; - - epiphany = callPackage ./core/epiphany { }; - - evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - - evolution_data_server = callPackage ./core/evolution-data-server { }; - - gconf = callPackage ./core/gconf { }; - - geocode_glib = callPackage ./core/geocode-glib { }; - - gcr = callPackage ./core/gcr { }; # ToDo: tests fail - - gdm = callPackage ./core/gdm { }; - - gjs = callPackage ./core/gjs { }; - - glib_networking = pkgs.glib_networking.override { - inherit gsettings_desktop_schemas; - }; - - gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; - - gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; - - gnome-contacts = callPackage ./core/gnome-contacts { }; - - gnome_control_center = callPackage ./core/gnome-control-center { }; - - gnome-calculator = callPackage ./core/gnome-calculator { }; - - gnome_common = callPackage ./core/gnome-common { }; - - gnome_desktop = callPackage ./core/gnome-desktop { }; - - gnome-dictionary = callPackage ./core/gnome-dictionary { }; - - gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; - - gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; - - gnome-menus = callPackage ./core/gnome-menus { }; - - gnome_keyring = callPackage ./core/gnome-keyring { }; - - libgnome_keyring = callPackage ./core/libgnome-keyring { }; - - libgnomekbd = callPackage ./core/libgnomekbd { }; - - folks = callPackage ./core/folks { }; - - gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; - - gnome-online-miners = callPackage ./core/gnome-online-miners { }; - - gnome_session = callPackage ./core/gnome-session { }; - - gnome_shell = callPackage ./core/gnome-shell { }; - - gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; - - gnome-screenshot = callPackage ./core/gnome-screenshot { }; - - gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; - - gnome-software = callPackage ./core/gnome-software { }; - - gnome-system-log = callPackage ./core/gnome-system-log { }; - - gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - - gnome_terminal = callPackage ./core/gnome-terminal { }; - - gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; - - gnome-user-docs = callPackage ./core/gnome-user-docs { }; - - gnome-user-share = callPackage ./core/gnome-user-share { }; - - grilo = callPackage ./core/grilo { }; - - grilo-plugins = callPackage ./core/grilo-plugins { }; - - gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; - - gsound = callPackage ./core/gsound { }; - - gtksourceview = callPackage ./core/gtksourceview { }; - - gtksourceviewmm = callPackage ./core/gtksourceviewmm { }; - - gucharmap = callPackage ./core/gucharmap { }; - - gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; - - eog = callPackage ./core/eog { }; - - libcroco = callPackage ./core/libcroco {}; - - libgee = callPackage ./core/libgee { }; - libgee_1 = callPackage ./core/libgee/libgee-1.nix { }; - - libgdata = callPackage ./core/libgdata { }; - - libgxps = callPackage ./core/libgxps { }; - - libpeas = callPackage ./core/libpeas {}; - - libgweather = callPackage ./core/libgweather { }; - - libzapojit = callPackage ./core/libzapojit { }; - - mutter = callPackage ./core/mutter { }; - - nautilus = callPackage ./core/nautilus { }; - - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { - inherit gnome3; - }; - - networkmanager_pptp = pkgs.networkmanager_pptp.override { - inherit gnome3; - }; - - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { - inherit gnome3; - }; - - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { - inherit gnome3; - }; - - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { - inherit gnome3; - }; - - networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings_desktop_schemas glib_networking; - }; - - rest = callPackage ./core/rest { }; - - sushi = callPackage ./core/sushi { }; - - totem = callPackage ./core/totem { }; - - totem-pl-parser = callPackage ./core/totem-pl-parser { }; - - tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; - - vte = callPackage ./core/vte { }; - - vte_290 = callPackage ./core/vte/2.90.nix { }; - - vte-select-text = vte.override { selectTextPatch = true; }; - - vino = callPackage ./core/vino { }; - - yelp = callPackage ./core/yelp { }; - - yelp_xsl = callPackage ./core/yelp-xsl { }; - - yelp_tools = callPackage ./core/yelp-tools { }; - - zenity = callPackage ./core/zenity { }; - - -#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - - accerciser = callPackage ./apps/accerciser { }; - - bijiben = callPackage ./apps/bijiben { - webkitgtk = webkitgtk24x; - }; - - cheese = callPackage ./apps/cheese { }; - - evolution = callPackage ./apps/evolution { - webkitgtk = webkitgtk24x; - }; - - file-roller = callPackage ./apps/file-roller { }; - - gedit = callPackage ./apps/gedit { }; - - glade = callPackage ./apps/glade { }; - - gnome-boxes = callPackage ./apps/gnome-boxes { - spice_gtk = pkgs.spice_gtk; - }; - - gnome-calendar = callPackage ./apps/gnome-calendar { }; - - gnome-characters = callPackage ./apps/gnome-characters { }; - - gnome-clocks = callPackage ./apps/gnome-clocks { }; - - gnome-documents = callPackage ./apps/gnome-documents { }; - - gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { }; - - gnome-logs = callPackage ./apps/gnome-logs { }; - - gnome-maps = callPackage ./apps/gnome-maps { }; - - gnome-music = callPackage ./apps/gnome-music { }; - - gnome-nettool = callPackage ./apps/gnome-nettool { }; - - gnome-photos = callPackage ./apps/gnome-photos { - gegl = gegl_0_3; - }; - - gnome-weather = callPackage ./apps/gnome-weather { }; - - nautilus-sendto = callPackage ./apps/nautilus-sendto { }; - - polari = callPackage ./apps/polari { }; - - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - - seahorse = callPackage ./apps/seahorse { }; - - vinagre = callPackage ./apps/vinagre { }; - -#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - - anjuta = callPackage ./devtools/anjuta { }; - - devhelp = callPackage ./devtools/devhelp { }; - - gdl = callPackage ./devtools/gdl { }; - - gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { }; - - nemiver = callPackage ./devtools/nemiver { }; - -#### Games - - aisleriot = callPackage ./games/aisleriot { }; - - five-or-more = callPackage ./games/five-or-more { }; - - four-in-a-row = callPackage ./games/four-in-a-row { }; - - gnome-chess = callPackage ./games/gnome-chess { }; - - gnome-klotski = callPackage ./games/gnome-klotski { }; - - gnome-mahjongg = callPackage ./games/gnome-mahjongg { }; - - gnome-mines = callPackage ./games/gnome-mines { }; - - gnome-nibbles = callPackage ./games/gnome-nibbles { }; - - gnome-robots = callPackage ./games/gnome-robots { }; - - gnome-sudoku = callPackage ./games/gnome-sudoku { }; - - gnome-taquin = callPackage ./games/gnome-taquin { }; - - gnome-tetravex = callPackage ./games/gnome-tetravex { }; - - hitori = callPackage ./games/hitori { }; - - iagno = callPackage ./games/iagno { }; - - lightsoff = callPackage ./games/lightsoff { }; - - swell-foop = callPackage ./games/swell-foop { }; - - tali = callPackage ./games/tali { }; - - quadrapassel = callPackage ./games/quadrapassel { }; - -#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - - california = callPackage ./misc/california { }; - - geary = callPackage ./misc/geary { - webkitgtk = webkitgtk24x; - }; - - gfbgraph = callPackage ./misc/gfbgraph { }; - - gitg = callPackage ./misc/gitg { - webkitgtk = webkitgtk24x; - }; - - gspell = callPackage ./misc/gspell { }; - - libgames-support = callPackage ./misc/libgames-support { }; - - libgda = callPackage ./misc/libgda { }; - - libgit2-glib = callPackage ./misc/libgit2-glib { }; - - libmediaart = callPackage ./misc/libmediaart { }; - - gexiv2 = callPackage ./misc/gexiv2 { }; - - gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; - - gpaste = callPackage ./misc/gpaste { }; - - pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; - - gtkhtml = callPackage ./misc/gtkhtml { }; - - pomodoro = callPackage ./misc/pomodoro { }; - - gnome-video-effects = callPackage ./misc/gnome-video-effects { }; - - gnome-packagekit = callPackage ./misc/gnome-packagekit { }; - - }; - in self; # pkgsFun - -in pkgsFun {} diff --git a/pkgs/desktops/gnome-3/3.20/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.20/desktop/rarian/default.nix deleted file mode 100644 index a1b38b21869a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/desktop/rarian/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: - -stdenv.mkDerivation rec { - name = "rarian-0.8.1"; - src = fetchurl { - url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; - sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; - }; - - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix deleted file mode 100644 index 6a50834f105e..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python2, makeWrapper }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper - gnome3.gsettings_desktop_schemas - ]; - - preFixup = '' - wrapProgram $out/bin/anjuta \ - --prefix XDG_DATA_DIRS : \ - "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Software development studio"; - homepage = http://anjuta.org/; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/3.20/devtools/anjuta/src.nix deleted file mode 100644 index 75b5eaa93425..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "anjuta-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/anjuta/3.20/anjuta-3.20.0.tar.xz; - sha256 = "a676c587a28f784ec2096775460cd29fafc3f0216c53e0821641bcd9126b6935"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix deleted file mode 100644 index f6e67be8d53a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool, gsettings_desktop_schemas }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme - gsettings_desktop_schemas - ]; - - meta = with stdenv.lib; { - homepage = https://live.gnome.org/devhelp; - description = "API documentation browser for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.20/devtools/devhelp/src.nix deleted file mode 100644 index cde66aa5d980..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "devhelp-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/devhelp/3.20/devhelp-3.20.0.tar.xz; - sha256 = "a23375c2e2b2ef6240994bc2327fcacfd42403af6d872d0cba2e16dd45ca1f1d"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/gdl/default.nix deleted file mode 100644 index 156d91b3eae7..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/gdl/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; - - meta = with stdenv.lib; { - description = "Gnome docking library"; - homepage = https://developer.gnome.org/gdl/; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/3.20/devtools/gdl/src.nix deleted file mode 100644 index f9c8802218cd..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/gdl/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gdl-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gdl/3.20/gdl-3.20.0.tar.xz; - sha256 = "53d3a3bb9b9be25b3a40c644fdbbb57a5a63ee1f5f839c2266d1cd9779360e8b"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/default.nix deleted file mode 100644 index 50960f41a312..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ intltool itstool libxml2 ]; - - meta = with stdenv.lib; { - homepage = https://github.com/GNOME/gnome-devel-docs; - description = "Developer documentation for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.fdl12; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/src.nix deleted file mode 100644 index 7822034a86a9..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-devel-docs-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-devel-docs/3.20/gnome-devel-docs-3.20.2.tar.xz; - sha256 = "b7aa49980920c6cbedfac65a2faa7d5da70a408c731be47bf924a7c85d373db1"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/bool_slot.patch b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/bool_slot.patch deleted file mode 100644 index 83423122110c..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/bool_slot.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/dbgengine/nmv-dbg-common.h 2014-07-09 10:36:05.000000000 +0200 -+++ b/src/dbgengine/nmv-dbg-common.h 2016-08-04 22:40:28.447842746 +0200 -@@ -171,7 +171,9 @@ - - bool has_slot () const - { -- return m_slot; -+ //return m_slot; -+ // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822502 -+ return static_cast (m_slot); - } - - template diff --git a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/default.nix deleted file mode 100644 index c4645b67fb90..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb, - boost, sqlite, gconf, libgtop, glibmm, gtkmm, vte, gtksourceview, - gtksourceviewmm, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop - glibmm gtkmm vte gtksourceview gtksourceviewmm ]; - - patches = [ ./bool_slot.patch ./safe_ptr.patch ]; - - meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Apps/Nemiver"; - description = "Easy to use standalone C/C++ debugger"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.juliendehos ]; - }; -} - diff --git a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/safe_ptr.patch b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/safe_ptr.patch deleted file mode 100644 index e3413b224977..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/safe_ptr.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/confmgr/nmv-gconf-mgr.cc 2014-07-08 10:24:06.000000000 +0200 -+++ b/src/confmgr/nmv-gconf-mgr.cc 2016-08-04 23:50:08.143060464 +0200 -@@ -32,6 +32,7 @@ - NEMIVER_BEGIN_NAMESPACE (nemiver) - - using nemiver::common::GCharSafePtr; -+using nemiver::common::GErrorSafePtr; - - class GConfMgr : public IConfMgr { - GConfMgr (const GConfMgr &); diff --git a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/src.nix deleted file mode 100644 index 2fcf639fe1b4..000000000000 --- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/src.nix +++ /dev/null @@ -1,11 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "nemiver-0.9.6"; - - src = fetchurl { - url = mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.tar.xz; - sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; - }; -} - diff --git a/pkgs/desktops/gnome-3/3.20/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.20/games/aisleriot/default.nix deleted file mode 100644 index e149a0b31264..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/aisleriot/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 -, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils -, guile, libcanberra_gtk3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - configureFlags = [ "--with-card-theme-formats=svg" ]; - - buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf - librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Aisleriot; - description = "A collection of patience games written in guile scheme"; - maintainers = gnome3.maintainers; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/3.20/games/aisleriot/src.nix deleted file mode 100644 index 7895db29658a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/aisleriot/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "aisleriot-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/aisleriot/3.20/aisleriot-3.20.2.tar.xz; - sha256 = "62036bdc69f8ae63a4405b4dd530a3def2958d5075b4e0a7caeb91fad789176e"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.20/games/five-or-more/default.nix deleted file mode 100644 index 50a7d2906a77..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/five-or-more/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Five_or_more; - description = "Remove colored balls from the board by forming lines"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix deleted file mode 100644 index 3bdd6e27645e..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "five-or-more-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/five-or-more/3.20/five-or-more-3.20.1.tar.xz; - sha256 = "9f6dff43b6511b12ef062f4dc4d9ab8de2579676747f0ead4802e0f166a5e85f"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/default.nix deleted file mode 100644 index 68228750cd87..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg - libxml2 gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Four-in-a-row; - description = "Make lines of the same color to win"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/src.nix deleted file mode 100644 index f87fdc577363..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "four-in-a-row-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/four-in-a-row/3.20/four-in-a-row-3.20.1.tar.xz; - sha256 = "3f3689fbbc25a91deb4af277cdc20e8db0e5aecfd17dc1376ad4b8d993ab7cf7"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-chess/default.nix deleted file mode 100644 index a96dae3c12cb..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-chess/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, librsvg, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Chess; - description = "Play the classic two-player boardgame of chess"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-chess/src.nix deleted file mode 100644 index 2c683bb5db4b..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-chess/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-chess-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-chess/3.20/gnome-chess-3.20.1.tar.xz; - sha256 = "4715349339491bd7a1072d5d362b5df76efa2067f4363c4b37d9579201d8c66d"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/default.nix deleted file mode 100644 index dc2289daff82..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libxml2, intltool, itstool, libgee, libgames-support }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Klotski; - description = "Slide blocks to solve the puzzle"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/src.nix deleted file mode 100644 index aa84ac9b763d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-klotski-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-klotski/3.20/gnome-klotski-3.20.2.tar.xz; - sha256 = "5c517534da14bb9b8c90dd76b8c7169557a6876318780677a0e451f982028493"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/default.nix deleted file mode 100644 index 43db32e88577..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Mahjongg; - description = "Disassemble a pile of tiles by removing matching pairs"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/src.nix deleted file mode 100644 index 10c022db04df..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-mahjongg-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-mahjongg/3.20/gnome-mahjongg-3.20.0.tar.xz; - sha256 = "d09bb1923636dfd05b6f3a5af8d6fe7b6daa1434e2c06188dd27c96a61cea00a"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-mines/default.nix deleted file mode 100644 index 4d703bb37a79..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-mines/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Mines; - description = "Clear hidden mines from a minefield"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix deleted file mode 100644 index 9894d5011225..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-mines-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-mines/3.20/gnome-mines-3.20.1.tar.xz; - sha256 = "5815e886d92817d4127b9e94bf63cb91e2bf371029d18efdf9f195e2400e2b3b"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/default.nix deleted file mode 100644 index cf2282188782..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool -, libxml2, libgee, libgames-support }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme - libgee libgames-support - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Nibbles; - description = "Guide a worm around a maze"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/src.nix deleted file mode 100644 index 1070aa591947..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-nibbles-3.20.2.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-nibbles/3.20/gnome-nibbles-3.20.2.1.tar.xz; - sha256 = "9253431072e3dff89cc13582c815cc9ed9d7c2d7a10321418a2e7416c1ef7e67"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-robots/default.nix deleted file mode 100644 index 9eafb166eee8..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-robots/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2, libgames-support -, libgee}: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 - libxml2 gnome3.defaultIconTheme libgames-support libgee - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Robots; - description = "Avoid the robots and make them crash into each other"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-robots/src.nix deleted file mode 100644 index 397fc74bb835..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-robots/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-robots-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-robots/3.20/gnome-robots-3.20.2.tar.xz; - sha256 = "d98f2ba5a7086e2dc3f3754819b557c12a98a0fb2492efd9912d9dd34ad9cfce"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/default.nix deleted file mode 100644 index c8ba82c7246d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook -, json_glib, qqwing, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee - json_glib qqwing itstool libxml2 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Sudoku; - description = "Test your logic skills in this number grid puzzle"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/src.nix deleted file mode 100644 index 8cc9731e3708..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/src.nix +++ /dev/null @@ -1,11 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "3.20"; - name = "gnome-sudoku-${major}.4"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${major}/${name}.tar.xz"; - sha256 = "1hw6r0yfg60ynp4gxnqm6zrsklzn0d6lb88vybdbifzrlaww8xwh"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/default.nix deleted file mode 100644 index 78eaa23e63bd..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3 - intltool itstool libxml2 gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Taquin; - description = "Move tiles so that they reach their places"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/src.nix deleted file mode 100644 index 3059e8400e03..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-taquin-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-taquin/3.20/gnome-taquin-3.20.2.tar.xz; - sha256 = "95a9c5ebc7fc87b58cd08b978acc09071da9b274934e0ec2abe9b5439554b3a2"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/default.nix deleted file mode 100644 index d6feab93dba1..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tetravex; - description = "Complete the puzzle by matching numbered tiles"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/src.nix deleted file mode 100644 index 5920c0f6bbfe..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-tetravex-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-tetravex/3.20/gnome-tetravex-3.20.0.tar.xz; - sha256 = "a1bdfa4233484566a01373b19f8c0fb126b7c5728227916a48d2ee012c3cbd62"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.20/games/hitori/default.nix deleted file mode 100644 index bd6be7d43c58..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/hitori/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool }: - -stdenv.mkDerivation rec { - name = "hitori-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz"; - sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Hitori; - description = "GTK+ application to generate and let you play games of Hitori"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/hitori/src.nix b/pkgs/desktops/gnome-3/3.20/games/hitori/src.nix deleted file mode 100644 index 7319968d551c..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/hitori/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "hitori-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/hitori/3.20/hitori-3.20.0.tar.xz; - sha256 = "877cae48144b7f6908fde55104f589788b42acaa5956d62fd32b4026fde3769d"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.20/games/iagno/default.nix deleted file mode 100644 index 1b6f08d1fd65..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/iagno/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, libxml2, dconf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Iagno; - description = "Computer version of the game Reversi, more popularly called Othello"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/iagno/src.nix b/pkgs/desktops/gnome-3/3.20/games/iagno/src.nix deleted file mode 100644 index ceeaf353f6ee..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/iagno/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "iagno-3.20.2"; - - src = fetchurl { - url = mirror://gnome/sources/iagno/3.20/iagno-3.20.2.tar.xz; - sha256 = "73f0f201ebf12b88e05cdefbaa72ccd5309bb592a9690d076285dbb800e965d2"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.20/games/lightsoff/default.nix deleted file mode 100644 index 8ec54b489721..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/lightsoff/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf - libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Lightsoff; - description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.20/games/lightsoff/src.nix deleted file mode 100644 index 6c6fc3cc8b33..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/lightsoff/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "lightsoff-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/lightsoff/3.20/lightsoff-3.20.0.tar.xz; - sha256 = "d3603891afe7ca3b3b2c509cad3e32ef6cdac3a7e80fff3b48ca72ea739852bf"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.20/games/quadrapassel/default.nix deleted file mode 100644 index f319608764d6..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/quadrapassel/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, libcanberra_gtk3 -, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libcanberra_gtk3 itstool intltool clutter - libxml2 clutter_gtk wrapGAppsHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Quadrapassel; - description = "Classic falling-block game, Tetris"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/3.20/games/quadrapassel/src.nix deleted file mode 100644 index adb9253a7caa..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/quadrapassel/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "quadrapassel-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/quadrapassel/3.20/quadrapassel-3.20.0.tar.xz; - sha256 = "e6fdd182b15aaef5af06604eb48ad883ac19977f2fcf6ebb43b41d9ed13f1eb0"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.20/games/swell-foop/default.nix deleted file mode 100644 index 3d3e424d0da8..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/swell-foop/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf -, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; - description = "Puzzle game, previously known as Same GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.20/games/swell-foop/src.nix deleted file mode 100644 index e26f8475f595..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/swell-foop/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "swell-foop-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/swell-foop/3.20/swell-foop-3.20.0.tar.xz; - sha256 = "40532a734dcae6d42a1e4692fd94e395442ff07c134acacf5fce3396c1e352a4"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/tali/default.nix b/pkgs/desktops/gnome-3/3.20/games/tali/default.nix deleted file mode 100644 index c2b1f5857124..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/tali/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, intltool, itstool, libxml2, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libxml2 itstool intltool wrapGAppsHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tali; - description = "Sort of poker with dice and less money"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/games/tali/src.nix b/pkgs/desktops/gnome-3/3.20/games/tali/src.nix deleted file mode 100644 index e589b7d80574..000000000000 --- a/pkgs/desktops/gnome-3/3.20/games/tali/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tali-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/tali/3.20/tali-3.20.0.tar.xz; - sha256 = "6437ab66672c331098e6df44ad708397b6363182d5c08c9ededf711cbf5cb818"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/installer.nix b/pkgs/desktops/gnome-3/3.20/installer.nix deleted file mode 100644 index e4d64ac9e885..000000000000 --- a/pkgs/desktops/gnome-3/3.20/installer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem -, extraModules ? [] }: - -let - - module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix; - - config = (import ../../../../nixos/lib/eval-config.nix { - inherit system; - modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules; - }).config; - -in - config.system.build.isoImage - diff --git a/pkgs/desktops/gnome-3/3.20/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.20/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch deleted file mode 100644 index c229cc96094f..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 8a94642..1ca6426 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS) - GLIB_REQUIRED=2.38.0 - GTK_REQUIRED=3.12.2 - GEE_REQUIRED=0.10.5 --ECAL_REQUIRED=3.8.5 -+ECAL_REQUIRED=3.13.90 - LIBSOUP_REQUIRED=2.44 - GDATA_REQUIRED=0.14.0 - GOA_REQUIRED=3.8.3 -diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala -index ee6a572..5009b5d 100644 ---- a/src/backing/eds/backing-eds-calendar-source.vala -+++ b/src/backing/eds/backing-eds-calendar-source.vala -@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource { - - // Invoked by EdsStore prior to making it available outside of unit - internal async void open_async(Cancellable? cancellable) throws Error { -- client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, -+ client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1, - cancellable); - - client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE); -diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi -index 6ead3ec..46fd711 100644 ---- a/vapi/libecal-1.2.vapi -+++ b/vapi/libecal-1.2.vapi -@@ -23,7 +23,7 @@ namespace E { - public bool check_save_schedules (); - public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_connect_finish")] -- public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; -+ public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error; - public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_create_object_finish")] - public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error; diff --git a/pkgs/desktops/gnome-3/3.20/misc/california/default.nix b/pkgs/desktops/gnome-3/3.20/misc/california/default.nix deleted file mode 100644 index ca0450dc7f94..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/california/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, makeWrapper -, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }: - -let - majorVersion = "0.4"; -in -stdenv.mkDerivation rec { - name = "california-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz"; - sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ makeWrapper intltool pkgconfig vala_0_32 glib gtk3 gnome3.libgee - libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server - sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ]; - - preFixup = '' - wrapProgram "$out/bin/california" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share" - ''; - - enableParallelBuilding = true; - - # Apply fedoras patch to build with evolution-data-server >3.13 - patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/California; - description = "Calendar application for GNOME 3"; - maintainers = with maintainers; [ pSub ]; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix deleted file mode 100644 index 71bb11d48534..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32 -, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra_gtk3, libsecret, gmime -, libpthreadstubs, sqlite -, gnome3, librsvg, gnome_doc_utils, webkitgtk }: - -let - majorVersion = "0.10"; -in -stdenv.mkDerivation rec { - name = "geary-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; - sha256 = "19dwpla35cch5rd0bw1v9s0cmygzv6zjs24rxvf0l14b3dd7l6a6"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils - vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr - gdk_pixbuf librsvg gnome3.defaultIconTheme ]; - - preConfigure = '' - substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' - ''; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/${name}/ - mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} - ''; - - preFixup = '' - wrapProgram "$out/bin/geary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Geary; - description = "Mail client for GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gexiv2/default.nix deleted file mode 100644 index 7cea9cd8d150..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gexiv2/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }: - -let - majorVersion = "0.10"; -in -stdenv.mkDerivation rec { - name = "gexiv2-${version}"; - version = "${majorVersion}.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988"; - }; - - preConfigure = '' - patchShebangs . - ''; - - buildInputs = [ pkgconfig glib libtool m4 ]; - propagatedBuildInputs = [ exiv2 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/gexiv2; - description = "GObject wrapper around the Exiv2 photo metadata library"; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gfbgraph/default.nix deleted file mode 100644 index e85b087fa41f..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gfbgraph/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, gnome3, libsoup, json_glib }: - -stdenv.mkDerivation rec { - name = "gfbgraph-0.2.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; - sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4"; - }; - - buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ]; - propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix deleted file mode 100644 index 27d5bc91b9f3..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib -, json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret -, dconf}: - - -# TODO: icons and theme still does not work -# use packaged gnome3.adwaita-icon-theme - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - preCheck = '' - substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" - ''; - doCheck = true; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - propagatedUserEnvPkgs = [ shared_mime_info - gnome3.gnome_themes_standard ]; - - buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas - libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview - librsvg libsecret dconf - gobjectIntrospection gnome3.adwaita-icon-theme ]; - - nativeBuildInputs = [ wrapGAppsHook ]; - - # https://bugzilla.gnome.org/show_bug.cgi?id=758240 - preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Gitg; - description = "GNOME GUI client to view git repositories"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix deleted file mode 100644 index 805380c9d603..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gitg-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gitg/3.20/gitg-3.20.1.tar.xz; - sha256 = "104420bcdd765fa2196a7b146ba1e0fa82a5686ed5ba9af40e31e88e601aa585"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/default.nix deleted file mode 100644 index ee3dd60e59ad..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit -, fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; - buildInputs = [ libxslt gnome3.gtk packagekit fontconfig - libcanberra_gtk3 libnotify dbus_glib dbus_libs ]; - - meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/software/PackageKit/; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - description = "Tools for installing software on the GNOME desktop using PackageKit"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/src.nix deleted file mode 100644 index 71de360f24f6..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-packagekit-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-packagekit/3.20/gnome-packagekit-3.20.0.tar.xz; - sha256 = "0wf5r0qrdlalbr73fpfaapq61vlya3nwygsv4wm2bxaf56v5sjmq"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch deleted file mode 100644 index 7a16d2c24e56..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch +++ /dev/null @@ -1,120 +0,0 @@ -From bdbbe312e6520ce70e91319162e85367a69ce044 Mon Sep 17 00:00:00 2001 -From: Jascha Geerds -Date: Sat, 1 Aug 2015 21:01:11 +0200 -Subject: [PATCH 1/3] Search for themes and icons in system data dirs - ---- - gtweak/tweaks/tweak_group_interface.py | 17 ++++------------- - gtweak/tweaks/tweak_group_keymouse.py | 7 ++----- - gtweak/utils.py | 17 +++++++++++++++++ - 3 files changed, 23 insertions(+), 18 deletions(-) - -Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py -=================================================================== ---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py -+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py -@@ -26,7 +26,7 @@ from gi.repository import Gtk - from gi.repository import GLib - - import gtweak --from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file -+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE - from gtweak.gshellwrapper import GnomeShellFactory - from gtweak.gsettings import GSettingsSetting -@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTwe - if gtk_ver % 2: # Want even number - gtk_ver += 1 - -- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), -- os.path.join(GLib.get_user_data_dir(), "themes"), -- os.path.join(os.path.expanduser("~"), ".themes")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.exists(os.path.join(d, "gtk-2.0")) and \ - (os.path.exists(os.path.join(d, "gtk-3.0")) or \ - os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))) -@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTw - **options) - - def _get_valid_icon_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), -- os.path.join(GLib.get_user_data_dir(), "icons"), -- os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "index.theme"))) - return valid -@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsCombo - **options) - - def _get_valid_cursor_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), -- os.path.join(GLib.get_user_data_dir(), "icons"), -- os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "cursors"))) - return valid -Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py -=================================================================== ---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py -+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py -@@ -20,7 +20,7 @@ import os.path - from gi.repository import GLib - - import gtweak --from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default -+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak - - class PrimaryPasteTweak(GetterSetterSwitchTweak): -@@ -48,10 +48,7 @@ class KeyThemeSwitcher(GSettingsComboTwe - **options) - - def _get_valid_key_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), -- os.path.join(GLib.get_user_data_dir(), "themes"), -- os.path.join(os.path.expanduser("~"), ".themes")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) - return valid -Index: gnome-tweak-tool-3.20.1/gtweak/utils.py -=================================================================== ---- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py -+++ gnome-tweak-tool-3.20.1/gtweak/utils.py -@@ -21,6 +21,7 @@ import tempfile - import shutil - import subprocess - import glob -+import itertools - - import gtweak - from gtweak.gsettings import GSettingsSetting -@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, bl - stdout, stderr = p.communicate() - return stdout, stderr, p.returncode - -+def get_resource_dirs(resource): -+ """Returns a list of all known resource dirs for a given resource. -+ -+ :param str resource: -+ Name of the resource (e.g. "themes") -+ :return: -+ A list of resource dirs -+ """ -+ dirs = [os.path.join(dir, resource) -+ for dir in itertools.chain(GLib.get_system_data_dirs(), -+ (gtweak.DATA_DIR, -+ GLib.get_user_data_dir()))] -+ dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))] -+ -+ return [dir for dir in dirs if os.path.isdir(dir)] -+ - @singleton - class AutostartManager: - diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch deleted file mode 100644 index 5ddc13949cba..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 22b948c39b32fb45066c4f5a9f99082094fea3d1 Mon Sep 17 00:00:00 2001 -From: Jascha Geerds -Date: Sat, 1 Aug 2015 21:26:57 +0200 -Subject: [PATCH 2/3] Don't show multiple entries for a single theme - ---- - gtweak/tweaks/tweak_group_interface.py | 8 ++++---- - gtweak/tweaks/tweak_group_keymouse.py | 4 ++-- - gtweak/utils.py | 16 ++++++++++++++++ - 3 files changed, 22 insertions(+), 6 deletions(-) - -Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py -=================================================================== ---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py -+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py -@@ -26,7 +26,7 @@ from gi.repository import Gtk - from gi.repository import GLib - - import gtweak --from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs -+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE - from gtweak.gshellwrapper import GnomeShellFactory - from gtweak.gsettings import GSettingsSetting -@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTwe - os.path.exists(os.path.join(d, "gtk-2.0")) and \ - (os.path.exists(os.path.join(d, "gtk-3.0")) or \ - os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))) -- return valid -+ return get_unique_resources(valid) - - class IconThemeSwitcher(GSettingsComboTweak): - def __init__(self, **options): -@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTw - valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "index.theme"))) -- return valid -+ return get_unique_resources(valid) - - class CursorThemeSwitcher(GSettingsComboTweak): - def __init__(self, **options): -@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsCombo - valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "cursors"))) -- return valid -+ return get_unique_resources(valid) - - class ShellThemeTweak(Gtk.Box, Tweak): - -Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py -=================================================================== ---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py -+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py -@@ -20,7 +20,7 @@ import os.path - from gi.repository import GLib - - import gtweak --from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs -+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak - - class PrimaryPasteTweak(GetterSetterSwitchTweak): -@@ -51,7 +51,7 @@ class KeyThemeSwitcher(GSettingsComboTwe - valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) -- return valid -+ return get_unique_resources(valid) - - TWEAK_GROUPS = [ - ListBoxTweakGroup(_("Keyboard and Mouse"), -Index: gnome-tweak-tool-3.20.1/gtweak/utils.py -=================================================================== ---- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py -+++ gnome-tweak-tool-3.20.1/gtweak/utils.py -@@ -133,6 +133,22 @@ def get_resource_dirs(resource): - - return [dir for dir in dirs if os.path.isdir(dir)] - -+def get_unique_resources(dirs): -+ """Filter out duplicated resources. -+ -+ :param list dirs: -+ List of resource dirs (e.g. /usr/share/themes/Adwaita) -+ :return: -+ List of dirs without duplicated resources -+ """ -+ unique_dirs = {} -+ for dir in dirs: -+ basename = os.path.basename(dir) -+ if basename not in unique_dirs: -+ unique_dirs[basename] = dir -+ -+ return unique_dirs -+ - @singleton - class AutostartManager: - diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch deleted file mode 100644 index b25b2d6dc4aa..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cdafa01dc90da486d0114b423e3e467f7b083d1b Mon Sep 17 00:00:00 2001 -From: Jascha Geerds -Date: Sun, 2 Aug 2015 12:01:20 +0200 -Subject: [PATCH 3/3] Create config dir if it doesn't exist - -Otherwise gnome-tweak-tool can't enable the dark theme and fails -without a clear error message. ---- - gtweak/gtksettings.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py -index bcec9f1..f39991b 100644 ---- a/gtweak/gtksettings.py -+++ b/gtweak/gtksettings.py -@@ -35,6 +35,10 @@ class GtkSettingsManager: - def _get_keyfile(self): - keyfile = None - try: -+ config_dir = os.path.dirname(self._path) -+ if not os.path.isdir(config_dir): -+ os.makedirs(config_dir) -+ - keyfile = GLib.KeyFile() - keyfile.load_from_file(self._path, 0) - except MemoryError: --- -2.7.0 - diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix deleted file mode 100644 index e6c4b8c82027..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, intltool, fetchurl, atk -, pkgconfig, gtk3, glib, libsoup -, bash, makeWrapper, itstool, libxml2, python2Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: - -let - python = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); -in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - makeFlags = [ "DESTDIR=/" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg - libnotify gnome3.gnome_shell - libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.gnome_desktop wrapGAppsHook ]; - - propagatedBuildInputs = [ python gobjectIntrospection ]; - - PYTHONPATH = "$out/${python.python.sitePackages}"; - - wrapPrefixVariables = [ "PYTHONPATH" ]; - - patches = [ - ./find_gsettings.patch - ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch - ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch - ./0003-Create-config-dir-if-it-doesn-t-exist.patch - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; - description = "A tool to customize advanced GNOME 3 options"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/find_gsettings.patch deleted file mode 100644 index 3e68c04cb3ab..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/find_gsettings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py -index a00fe19..dce74b2 100644 ---- a/gtweak/gsettings.py -+++ b/gtweak/gsettings.py -@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception): - - class _GSettingsSchema: - def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): -- if not schema_dir: -- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR - if not schema_filename: - schema_filename = schema_name + ".gschema.xml" -+ if not schema_dir: -+ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR -+ for xdg_dir in GLib.get_system_data_dirs(): -+ dir = os.path.join(xdg_dir, "glib-2.0", "schemas") -+ if os.path.exists(os.path.join(dir, schema_filename)): -+ schema_dir = dir -+ break - - schema_path = os.path.join(schema_dir, schema_filename) - if not os.path.exists(schema_path): diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/src.nix deleted file mode 100644 index 18183b8d4009..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-tweak-tool-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-tweak-tool/3.20/gnome-tweak-tool-3.20.1.tar.xz; - sha256 = "5171b2f75ceeea9455543e999a83a71e8566947f89eb9157aaff7969b7e446ba"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gnome-video-effects/default.nix deleted file mode 100644 index c0bd2fed3f2d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gnome-video-effects/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }: - -stdenv.mkDerivation rec { - name = "gnome-video-effects-${version}"; - version = "0.4.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz"; - sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil"; - }; - - buildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix deleted file mode 100644 index 2550c7e42e6c..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala_0_32, glib -, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }: - -stdenv.mkDerivation rec { - version = "${gnome3.version}.4"; - name = "gpaste-${version}"; - - src = fetchurl { - url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "08h1igdgapz7px12r7mrfcxmz68g9ijg73w69j75spg0yc6f4xax"; - }; - - buildInputs = [ intltool autoreconfHook pkgconfig vala_0_32 glib - gtk3 gnome3.gnome_control_center dbus - clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ]; - - preConfigure = "intltoolize -f"; - - configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings" - "--with-dbusservicesdir=$(out)/share/dbus-1/services" - "--with-systemduserunitdir=$(out)/etc/systemd/user" ]; - - enableParallelBuilding = true; - - preFixup = - let - libPath = stdenv.lib.makeLibraryPath - [ glib gtk3 clutter pango ]; - in - '' - for i in $out/libexec/gpaste/*; do - wrapProgram $i \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/Keruspe/GPaste; - description = "Clipboard management system with GNOME3 integration"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gspell/default.nix deleted file mode 100644 index fbb95efb27ac..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gspell/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig glib gtk3 enchant isocodes ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.20/misc/gspell/src.nix deleted file mode 100644 index 248e39151524..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gspell/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -fetchurl: rec { - major = "1.0"; - minor = "3"; - name = "gspell-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz"; - sha256 = "1m8v4rqaxjsblccc3nnirkbkzgqm90vfpzp3x08lkqriqvk0anfr"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/default.nix deleted file mode 100644 index 89703b61932b..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool -, gnome3, enchant, isocodes }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas ]; - - propagatedBuildInputs = [ enchant isocodes ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/src.nix deleted file mode 100644 index 21876ec9c399..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtkhtml-4.10.0"; - - src = fetchurl { - url = mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz; - sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/3.20/misc/libgames-support/default.nix deleted file mode 100644 index 06937c74c65a..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/libgames-support/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool }: - -let - major = "1"; - minor = "0"; -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "libgames-support-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgames-support/${version}/${name}.tar.xz"; - sha256 = "02qn009m1i07nh8wnyrrjf7kbbapk814ap5pvin5ka5sj996cyqq"; - }; - - buildInputs = [ pkgconfig glib gtk3 libgee intltool ]; - - meta = with stdenv.lib; { - description = "Small library intended for internal use by GNOME Games, but it may be used by others"; - homepage = https://github.com/GNOME/libgames-support; - license = licenses.gpl3; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.20/misc/libgda/default.nix deleted file mode 100644 index 2e5b0a4af840..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/libgda/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - configureFlags = [ - "--enable-gi-system-install=no" - ]; - - enableParallelBuilding = true; - - hardeningDisable = [ "format" ]; - - buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ]; - - meta = with stdenv.lib; { - description = "Database access library"; - homepage = http://www.gnome-db.org/; - license = [ licenses.lgpl2 licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/libgda/src.nix b/pkgs/desktops/gnome-3/3.20/misc/libgda/src.nix deleted file mode 100644 index 8812ccc8ccd9..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/libgda/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgda-5.2.4"; - - src = fetchurl { - url = mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz; - sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix deleted file mode 100644 index 6915ede4ad51..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala_0_32, libssh2 -, gtk_doc, gobjectIntrospection, libgit2, glib }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ gnome3.gnome_common libtool pkgconfig vala_0_32 libssh2 - gtk_doc gobjectIntrospection libgit2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/src.nix deleted file mode 100644 index 422fdaf1a2cf..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/src.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "0.24"; - minor = "0"; - name = "libgit2-glib-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgit2-glib/${major}/${name}.tar.xz"; - sha256 = "0ia81xlyf6qmyl89ql663piliyjmhnzrshd6q66zya0wh9lc45nn"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.20/misc/libmediaart/default.nix deleted file mode 100644 index b86480125730..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/libmediaart/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }: - -let - majorVersion = "1.9"; -in -stdenv.mkDerivation rec { - name = "libmediaart-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz"; - sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll"; - }; - - buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix deleted file mode 100644 index e3f6bca10a4d..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchFromGitHub, glib }: - -stdenv.mkDerivation rec { - version = "1.0.1"; - basename = "pidgin-im-gnome-shell-extension"; - name = "${basename}-${version}"; - - src = fetchFromGitHub { - owner = "muffinmad"; - repo = "${basename}"; - rev = "v${version}"; - sha256 = "1567s2sfqig4jw0nrn134f5vkx0yq31q044grv3xk4vpl1f3z2lr"; - }; - - buildInputs = [ glib ]; - - configurePhase = ""; - buildPhase = ""; - installPhase = '' - share_dir="$prefix/share" - extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad" - mkdir -p "$extensions_dir" - mv *.js metadata.json dbus.xml gnome-shell-extension-pidgin.pot "$extensions_dir" - - schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas" - mkdir -p "$schemas_dir" - mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */ - ${glib.dev}/bin/glib-compile-schemas "$schemas_dir" - - locale_dir="$share_dir/locale" - mkdir -p "$locale_dir" - mv locale/* $locale_dir # fix Emacs syntax highlighting: */ - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/muffinmad/pidgin-im-gnome-shell-extension; - description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ DamienCassou ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix deleted file mode 100644 index 1c7f712b12c5..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base, - glib, gobjectIntrospection, telepathy_glib -}: - -stdenv.mkDerivation rec { - version = "0.11.2"; - name = "gnome-shell-pomodoro-${version}"; - - src = fetchFromGitHub { - owner = "codito"; - repo = "gnome-pomodoro"; - rev = "${version}"; - sha256 = "0x656drq8vnvdj1x6ghnglgpa0z8yd2yj9dh5iqprwjv0z3qkw4l"; - }; - - configureScript = ''./autogen.sh''; - - buildInputs = [ - which automake113x intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib - gnome3.defaultIconTheme - ]; - - preBuild = '' - sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \ - vapi/Makefile - ''; - - preFixup = '' - wrapProgram $out/bin/gnome-pomodoro \ - --prefix XDG_DATA_DIRS : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS" - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/codito/gnome-shell-pomodoro; - description = "A time management utility for GNOME based on the pomodoro technique"; - longDescription = '' - This GNOME utility helps to manage time according to Pomodoro Technique. - It intends to improve productivity and focus by taking short breaks. - ''; - maintainers = with maintainers; [ DamienCassou jgeerds ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix index 09ea2baf197d..dbb162dc4324 100644 --- a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix +++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "epiphany-3.22.0"; + name = "epiphany-3.22.5"; src = fetchurl { - url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.0.tar.xz; - sha256 = "a645d17c10a1c266d4647306ea3e5496d3ca575d2ed8152947ed77e9eb623a27"; + url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.5.tar.xz; + sha256 = "e9c307b3f53a77c16ca698fb62fbb8d9b16773702d8163d83699bd623afa6745"; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix index 17a4514d6f82..726f47d0cde6 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns + shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk gnome3.vino udev libcanberra_gtk3 libgudev networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ]; diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch deleted file mode 100644 index ca85119e97f0..000000000000 --- a/pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch +++ /dev/null @@ -1,69 +0,0 @@ -From a91568d7c6635f4d66bb4e8ebaf2666c24980312 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk -Date: Sat, 14 May 2016 12:54:27 +0200 -Subject: [PATCH] qml import paths - ---- - applets/pager/package/contents/ui/main.qml | 2 +- - containments/desktop/package/contents/ui/FolderView.qml | 2 +- - containments/desktop/package/contents/ui/main.qml | 4 ++-- - containments/panel/contents/ui/main.qml | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml -index b8eb8a6..fad3f69 100644 ---- a/applets/pager/package/contents/ui/main.qml -+++ b/applets/pager/package/contents/ui/main.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents - import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents - import org.kde.draganddrop 2.0 - import org.kde.plasma.private.pager 2.0 --import "utils.js" as Utils -+import "../code/utils.js" as Utils - - MouseArea { - id: root -diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml -index ced3507..6073545 100644 ---- a/containments/desktop/package/contents/ui/FolderView.qml -+++ b/containments/desktop/package/contents/ui/FolderView.qml -@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.kquickcontrolsaddons 2.0 - - import org.kde.private.desktopcontainment.folder 0.1 as Folder --import "FolderTools.js" as FolderTools -+import "../code/FolderTools.js" as FolderTools - - Item { - id: main -diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml -index a438b74..b907a36 100644 ---- a/containments/desktop/package/contents/ui/main.qml -+++ b/containments/desktop/package/contents/ui/main.qml -@@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons - - import org.kde.private.desktopcontainment.desktop 0.1 as Desktop - --import "LayoutManager.js" as LayoutManager --import "FolderTools.js" as FolderTools -+import "../code/LayoutManager.js" as LayoutManager -+import "../code/FolderTools.js" as FolderTools - - DragDrop.DropArea { - id: root -diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml -index 4d71c6e..337c356 100644 ---- a/containments/panel/contents/ui/main.qml -+++ b/containments/panel/contents/ui/main.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents - import org.kde.kquickcontrolsaddons 2.0 - import org.kde.draganddrop 2.0 as DragDrop - --import "LayoutManager.js" as LayoutManager -+import "../code/LayoutManager.js" as LayoutManager - - DragDrop.DropArea { - id: root --- -2.8.0 - diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch deleted file mode 100644 index aba97b032f8a..000000000000 --- a/pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0a8e2ae5cb64c5762408df920d99459b20d52b29 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 22 Nov 2015 09:39:24 -0600 -Subject: [PATCH 3/3] tzdir - ---- - kcms/dateandtime/helper.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp -index 5171753..92b5d9e 100644 ---- a/kcms/dateandtime/helper.cpp -+++ b/kcms/dateandtime/helper.cpp -@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone ) - - val = selectedzone; - #else -- QString tz = "/usr/share/zoneinfo/" + selectedzone; -+ QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR")); -+ QString tz = tzdir + "/" + selectedzone; -+ if (tzdir.isEmpty()) { -+ // Standard Linux path -+ tz = "/usr/share/zoneinfo/" + selectedzone; -+ } - - if (QFile::exists(tz)) { // make sure the new TZ really exists - QFile::remove(QStringLiteral("/etc/localtime")); --- -2.6.3 - diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix index 8d4098ca31f2..21ceec25d53f 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix @@ -1,13 +1,14 @@ { - plasmaPackage, substituteAll, + plasmaPackage, lib, copyPathsToStore, ecm, kdoctools, attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft, libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework, - plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras, xf86inputevdev, - xf86inputsynaptics, xinput, xkeyboard_config, xorgserver, utillinux + plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras, + xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver, + utillinux }: plasmaPackage rec { @@ -22,15 +23,12 @@ plasmaPackage rec { ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative qtquickcontrols qtx11extras ksysguard ]; - patches = [ - ./0001-qt-5.5-QML-import-paths.patch - (substituteAll { - src = ./0002-hwclock.patch; - hwclock = "${utillinux}/sbin/hwclock"; - }) - ./0003-tzdir.patch - ]; + + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postPatch = '' + substituteInPlace kcms/dateandtime/helper.cpp \ + --subst-var hwclock "${utillinux}/sbin/hwclock" + sed '1i#include ' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp ''; NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ]; diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch similarity index 60% rename from pkgs/desktops/kde-5/plasma/plasma-desktop/0002-hwclock.patch rename to pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch index 17b01486d928..5623de84668f 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-desktop/0002-hwclock.patch +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch @@ -1,16 +1,7 @@ -From d0056fa6c1158408db169a7f5e6eb75691083094 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 22 Nov 2015 09:34:43 -0600 -Subject: [PATCH 2/3] hwclock - ---- - kcms/dateandtime/helper.cpp | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp -index e955f0c..5171753 100644 ---- a/kcms/dateandtime/helper.cpp -+++ b/kcms/dateandtime/helper.cpp +Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp +=================================================================== +--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp ++++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp @@ -48,10 +48,6 @@ #include #endif @@ -31,6 +22,3 @@ index e955f0c..5171753 100644 if (!hwclock.isEmpty()) { KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc")); } --- -2.6.3 - diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch new file mode 100644 index 000000000000..d5ac4b250875 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch @@ -0,0 +1,26 @@ +Index: plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp +=================================================================== +--- plasma-desktop-5.8.5.orig/kcms/keyboard/xkb_helper.cpp ++++ plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp +@@ -185,21 +185,5 @@ bool XkbHelper::initializeKeyboardLayout + + bool XkbHelper::preInitialize() + { +- // stop ibus so it does not mess with our layouts, we can remove this when we integrate IM into keyboard module +- +- QString ibusExe = QStandardPaths::findExecutable(QStringLiteral("ibus")); +- if( ibusExe.isEmpty() ) { +- return 0; +- } +- +- KProcess ibusProcess; +- ibusProcess << ibusExe << QStringLiteral("exit"); +- ibusProcess.setOutputChannelMode(KProcess::SeparateChannels); +- int res = ibusProcess.execute(); +- +- if( res == 0 ) { +- qCWarning(KCM_KEYBOARD) << "ibus successfully stopped"; +- } +- + return 0; + } diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch new file mode 100644 index 000000000000..def5b577b972 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch @@ -0,0 +1,54 @@ +Index: plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml +=================================================================== +--- plasma-desktop-5.8.5.orig/applets/pager/package/contents/ui/main.qml ++++ plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml +@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as + import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents + import org.kde.draganddrop 2.0 + import org.kde.plasma.private.pager 2.0 +-import "utils.js" as Utils ++import "../code/utils.js" as Utils + + MouseArea { + id: root +Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml +=================================================================== +--- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/FolderView.qml ++++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml +@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas + import org.kde.kquickcontrolsaddons 2.0 + + import org.kde.private.desktopcontainment.folder 0.1 as Folder +-import "FolderTools.js" as FolderTools ++import "../code/FolderTools.js" as FolderTools + + Item { + id: main +Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml +=================================================================== +--- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/main.qml ++++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml +@@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0 + + import org.kde.private.desktopcontainment.desktop 0.1 as Desktop + +-import "LayoutManager.js" as LayoutManager +-import "FolderTools.js" as FolderTools ++import "../code/LayoutManager.js" as LayoutManager ++import "../code/FolderTools.js" as FolderTools + + DragDrop.DropArea { + id: root +Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml +=================================================================== +--- plasma-desktop-5.8.5.orig/containments/panel/contents/ui/main.qml ++++ plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml +@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as + import org.kde.kquickcontrolsaddons 2.0 + import org.kde.draganddrop 2.0 as DragDrop + +-import "LayoutManager.js" as LayoutManager ++import "../code/LayoutManager.js" as LayoutManager + + DragDrop.DropArea { + id: root diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/series b/pkgs/desktops/kde-5/plasma/plasma-desktop/series new file mode 100644 index 000000000000..36778cd1c560 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/series @@ -0,0 +1,4 @@ +qml-import-paths.patch +hwclock-path.patch +tzdir.patch +ibus.patch diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch new file mode 100644 index 000000000000..97504b330fed --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch @@ -0,0 +1,18 @@ +Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp +=================================================================== +--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp ++++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp +@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& sele + + val = selectedzone; + #else +- QString tz = "/usr/share/zoneinfo/" + selectedzone; ++ QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR")); ++ QString tz = tzdir + "/" + selectedzone; ++ if (tzdir.isEmpty()) { ++ // Standard Linux path ++ tz = "/usr/share/zoneinfo/" + selectedzone; ++ } + + if (QFile::exists(tz)) { // make sure the new TZ really exists + QFile::remove(QStringLiteral("/etc/localtime")); diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 59ce006e8357..3abd5c8c82a9 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -3,11 +3,11 @@ , withContrib ? true }: let - versionPkg = "0.2.13" ; + versionPkg = "0.3.0" ; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ; - sha256 = "1hsqvdwiydks46sfjmm04rmjcx5v25xpjgnq0b96psrdbd0ky2kf" ; + sha256 = "1s4yscisn9gsr692jmh4y5mz03012pv84cm7l5n51v83wc08fks0" ; }; postInstallContrib = stdenv.lib.optionalString withContrib @@ -31,9 +31,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "01rkybkwgbpx6blv72n46ml9ii3p6kpxbpczsrpbjkqmf22b4vii"; + sha256 = "1knf03r8a5sis7n8rw54flf1lxfbr3prywxb1czcdp6hsbcd1v1d"; }; + patches = [ ./install-postiats-contrib.patch ]; + buildInputs = [ gmp ]; setupHook = with stdenv.lib; diff --git a/pkgs/development/compilers/ats2/install-postiats-contrib.patch b/pkgs/development/compilers/ats2/install-postiats-contrib.patch new file mode 100644 index 000000000000..cb280d028b52 --- /dev/null +++ b/pkgs/development/compilers/ats2/install-postiats-contrib.patch @@ -0,0 +1,19 @@ +Install the parts of the contrib that have been moved to Postiats. +diff -Naur ATS2-Postiats-0.3.0-upstream/Makefile_dist ATS2-Postiats-0.3.0/Makefile_dist +--- ATS2-Postiats-0.3.0-upstream/Makefile_dist 2017-01-20 10:23:54.000000000 -0400 ++++ ATS2-Postiats-0.3.0/Makefile_dist 2017-01-21 13:14:27.614723335 -0400 +@@ -124,12 +124,12 @@ + cd "$(abs_top_srcdir)" && \ + $(MKDIR_P) $(PATSLIBHOME2)/bin && \ + if [ ! -d $(bindir2) ] ; then $(MKDIR_P) $(bindir2) ; fi && \ +- for x in share ccomp prelude libc libats ; do \ ++ for x in share ccomp prelude libc libats contrib atscntrb ; do \ + find "$$x" -type d -exec $(MKDIR_P) $(PATSLIBHOME2)/\{} \; -print; \ + done + + install_files_0: install_dirs ; \ +- for x in share ccomp/runtime prelude libc libats ; do \ ++ for x in share ccomp/runtime prelude libc libats contrib atscntrb ; do \ + cd "$(abs_top_srcdir)" && \ + $(INSTALL) -d $(PATSLIBHOME2)/"$$x" && \ + find "$$x" -type l -exec cp -d \{} $(PATSLIBHOME2)/\{} \; -print && \ diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f019567f5f2a..90e80e21406d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1076,14 +1076,14 @@ self: super: { # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version # is hard because of transitive dependencies, so we just disable tests. - http-api-data_0_3_4 = dontCheck super.http-api-data_0_3_4; + http-api-data_0_3_5 = dontCheck super.http-api-data_0_3_5; # Fix build for latest versions of servant and servant-client. servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: { - http-api-data = self.http-api-data_0_3_4; + http-api-data = self.http-api-data_0_3_5; }); servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: { - http-api-data = self.http-api-data_0_3_4; + http-api-data = self.http-api-data_0_3_5; servant-server = self.servant-server_0_9_1_1; servant = self.servant_0_9_1_1; }); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4648208c2afb..056a98727c12 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10887,6 +10887,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_5_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.5.1"; + sha256 = "b70745335b563cd9039bb17a1e2faf7edb1b68febdd19586b28ab67c55562a8d"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + homepage = "http://github.com/JohnLato/listlike"; + description = "Generic support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListTree" = callPackage ({ mkDerivation, base, directory, filepath, List, transformers }: mkDerivation { @@ -14290,8 +14313,8 @@ self: { }: mkDerivation { pname = "RNAlien"; - version = "1.2.9"; - sha256 = "0de399df27f15301d7074ec5b1b4dcf6712bb7878573183edc300c19ee172f25"; + version = "1.3.0"; + sha256 = "43d4b160cab7a7c39e4c21744637752beb527ebcb9f12ca674c18fb84135dfab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17383,14 +17406,14 @@ self: { license = "GPL"; }) {}; - "ViennaRNAParser_1_3_1" = callPackage + "ViennaRNAParser_1_3_2" = callPackage ({ mkDerivation, base, hspec, parsec, ParsecTools, process , transformers }: mkDerivation { pname = "ViennaRNAParser"; - version = "1.3.1"; - sha256 = "a113dd5673a20802e3377ee1682c901c898e341a3cc0175e619c92eb96e49247"; + version = "1.3.2"; + sha256 = "daff4df1a477ee3df01b30cda344e889818b761748e2b9aee0b8e2f46e0fa844"; libraryHaskellDepends = [ base parsec ParsecTools process transformers ]; @@ -20564,6 +20587,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-quick" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq + , microlens, tasty, tasty-hunit, text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-quick"; + version = "0.1.1.2"; + sha256 = "e666a7f2caad674fa95774beebacb4a8edd8bb0801b30aa7ac77904221b8372c"; + libraryHaskellDepends = [ + aeson attoparsec base deepseq text unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring microlens tasty tasty-hunit text + ]; + homepage = "https://github.com/libscott/aeson-quick"; + description = "Quick JSON extractions with Aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-schema" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , directory, filepath, ghc-prim, hashable, hint, HUnit, mtl @@ -29599,6 +29641,18 @@ self: { broken = true; }) {control-invariants = null;}; + "azubi" = callPackage + ({ mkDerivation, base, filepath, options }: + mkDerivation { + pname = "azubi"; + version = "0.1.0.1"; + sha256 = "b75133db17e6dfe66593dca1e2809e096a8473463950826c31c8ac9a1497468e"; + libraryHaskellDepends = [ base filepath options ]; + homepage = "http://palovandalo.com/azubi"; + description = "A simple DevOps tool which will never \"reach\" enterprice level"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "azure-acs" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit , conduit-extra, connection, http-conduit, http-types, network @@ -31764,6 +31818,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-orphans_0_1_6_0" = callPackage + ({ mkDerivation, aeson, base, binary, case-insensitive, hashable + , QuickCheck, quickcheck-instances, scientific, tagged, tasty + , tasty-quickcheck, text, text-binary, time, unordered-containers + , vector, vector-binary-instances + }: + mkDerivation { + pname = "binary-orphans"; + version = "0.1.6.0"; + sha256 = "e0e1dc7e5f00feb225efde400988d5e0e199cc910446f05a40fecba7d55684a5"; + libraryHaskellDepends = [ + aeson base binary case-insensitive hashable scientific tagged text + text-binary time unordered-containers vector + vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary case-insensitive hashable QuickCheck + quickcheck-instances scientific tagged tasty tasty-quickcheck text + time unordered-containers vector + ]; + homepage = "https://github.com/phadej/binary-orphans#readme"; + description = "Orphan instances for binary"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-parser" = callPackage ({ mkDerivation, base-prelude, bytestring, success, text , transformers @@ -34002,14 +34082,14 @@ self: { ({ mkDerivation, base, containers, directory, filepath, tagsoup }: mkDerivation { pname = "blaze-from-html"; - version = "0.3.2.1"; - sha256 = "9ae029aee30ae8f3c4649e51b9e797ae956ebbe33f3592d07cb948fe72ff23d2"; + version = "0.4.0.1"; + sha256 = "88fcd55af8a8c4fa611ee28adc27210f7de12556a9099aa702e98f176d461a15"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers directory filepath tagsoup ]; - homepage = "http://jaspervdj.be/blaze"; + homepage = "http://jaspervdj.be/blaze-html"; description = "Tool to convert HTML to BlazeHtml code"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -35400,6 +35480,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "brick_0_15_2" = callPackage + ({ mkDerivation, base, containers, contravariant, data-default + , deepseq, microlens, microlens-mtl, microlens-th, template-haskell + , text, text-zipper, transformers, vector, vty + }: + mkDerivation { + pname = "brick"; + version = "0.15.2"; + sha256 = "7407473d133588df46c43480a2b41a50a04a7f0e63a996c6422a07592b8ca85e"; + libraryHaskellDepends = [ + base containers contravariant data-default deepseq microlens + microlens-mtl microlens-th template-haskell text text-zipper + transformers vector vty + ]; + homepage = "https://github.com/jtdaugherty/brick/"; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brick" = callPackage ({ mkDerivation, base, containers, contravariant, data-default , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm @@ -35417,7 +35517,6 @@ self: { homepage = "https://github.com/jtdaugherty/brick/"; description = "A declarative terminal user interface library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brillig" = callPackage @@ -41723,12 +41822,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "clay_0_12" = callPackage + "clay_0_12_1" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: mkDerivation { pname = "clay"; - version = "0.12"; - sha256 = "7bef7e086e7e3cd9f35c2e9b8ea7f6e7428e65090ea824cf680c645a350825e9"; + version = "0.12.1"; + sha256 = "ede3726dd63325e491fec82490929f2d084442290251f4b978293df1e42b867a"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base hspec hspec-expectations mtl text ]; homepage = "http://fvisser.nl/clay"; @@ -42280,17 +42379,17 @@ self: { "clit" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , data-default, http-client, http-client-tls, http-types, lens - , optparse-applicative, split + , optparse-applicative, split, text }: mkDerivation { pname = "clit"; - version = "0.2.0.2"; - sha256 = "f8c363812b610c79d0fe7275404fca65e073c4bcd11c53afafcffd485c4e47db"; + version = "0.2.2.3"; + sha256 = "ae1261e3bec1ff034b9fa5fea1be1592f0a32d4581d96d9b4c834554d839c1fc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson authenticate-oauth base bytestring data-default http-client - http-client-tls http-types lens optparse-applicative split + http-client-tls http-types lens optparse-applicative split text ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; @@ -65923,15 +66022,16 @@ self: { }) {}; "fltkhs" = callPackage - ({ mkDerivation, base, bytestring, c2hs, directory, filepath, mtl - , parsec, text + ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath + , mtl, parsec, text }: mkDerivation { pname = "fltkhs"; - version = "0.5.0.1"; - sha256 = "440e605c927bbd10b5b6bb17d2b608797747f6780eb7014eb29998519fd3b495"; + version = "0.5.0.2"; + sha256 = "a8f848eb6d47d1ce3e6d102ec61137737371fb68a112155696629d53f81e2cab"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring text ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base directory filepath mtl parsec ]; @@ -66621,6 +66721,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "format-numbers" = callPackage + ({ mkDerivation, base, hspec, text }: + mkDerivation { + pname = "format-numbers"; + version = "0.1.0.0"; + sha256 = "0ca4561b55c888552f7bf0eb68e97b62acedcb0d5e5e1cc4afd94402d01231a6"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec text ]; + homepage = "https://github.com/agrafix/format-numbers#readme"; + description = "Various number formatting functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "format-status" = callPackage ({ mkDerivation, base, data-concurrent-queue, old-locale, stm, text , time @@ -69116,6 +69229,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {genders = null;}; + "gendocs" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, safe, text + }: + mkDerivation { + pname = "gendocs"; + version = "0.1.0.0"; + sha256 = "5ed453b7811e8b43ff5d660acbf6f75e6022a63c546ca282b2ea9b3474e762f0"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring safe text + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/seanhess/gendocs#readme"; + description = "Library for generating interface documentation from types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "general-prelude" = callPackage ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath }: @@ -69667,17 +69796,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity_0_3_0_0" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, validity }: + mkDerivation { + pname = "genvalidity"; + version = "0.3.0.0"; + sha256 = "22c279c1409fbb0b9c9d709873c0639f555c34c8919cd481e2eb6fcab729ccff"; + revision = "1"; + editedCabalFile = "fbaf3c842ce3316d3fef10d69dcf9a0279aa0d35be0f420da4749c6cdca1528a"; + libraryHaskellDepends = [ base QuickCheck validity ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Testing utilities for the validity library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-containers" = callPackage - ({ mkDerivation, base, containers, genvalidity, QuickCheck - , validity, validity-containers + ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec + , hspec, QuickCheck, validity, validity-containers }: mkDerivation { pname = "genvalidity-containers"; - version = "0.1.0.2"; - sha256 = "f26522673e67c3780662bbce48734a4e955d6fbc5dd7e8c701866180cbf7b8bb"; + version = "0.2.0.0"; + sha256 = "79cccb5ac44193287e65aaf751617e213e71b012cc96e31e42428cdfd9c63ce1"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity validity-containers ]; + testHaskellDepends = [ + base containers genvalidity genvalidity-hspec hspec + ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for containers"; license = stdenv.lib.licenses.mit; @@ -69703,14 +69851,83 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-hspec_0_3_0_0" = callPackage + ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck + , validity + }: + mkDerivation { + pname = "genvalidity-hspec"; + version = "0.3.0.0"; + sha256 = "0d25376307b9bbbf8a7d438f0e9252e86f1f3227c356a2979f002ebb711d612d"; + revision = "1"; + editedCabalFile = "cd36781a3c2aa0a77ed801ae246560f8e04901bfae7cf88139fa68eb3c5e0e25"; + libraryHaskellDepends = [ + base genvalidity hspec QuickCheck validity + ]; + testHaskellDepends = [ base doctest genvalidity hspec ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard spec's for GenValidity instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "genvalidity-hspec-aeson" = callPackage + ({ mkDerivation, aeson, base, deepseq, doctest, genvalidity + , genvalidity-hspec, hspec, QuickCheck + }: + mkDerivation { + pname = "genvalidity-hspec-aeson"; + version = "0.0.0.0"; + sha256 = "c33756346e6435553f938caa6ed0886852495ebc2cd458badd35d87d76fd00de"; + libraryHaskellDepends = [ + aeson base deepseq genvalidity genvalidity-hspec hspec QuickCheck + ]; + testHaskellDepends = [ base doctest genvalidity hspec ]; + homepage = "http://cs-syd.eu"; + description = "Standard spec's for aeson-related instances"; + license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-hspec-cereal" = callPackage + ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity + , genvalidity-hspec, hspec, QuickCheck + }: + mkDerivation { + pname = "genvalidity-hspec-cereal"; + version = "0.0.0.0"; + sha256 = "1cbb1d37aed02b8aa75092b0ff7065bdd0238a02fd735a2b1e548be9e11e48de"; + libraryHaskellDepends = [ + base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck + ]; + testHaskellDepends = [ base doctest genvalidity hspec ]; + homepage = "http://cs-syd.eu"; + description = "Standard spec's for cereal-related instances"; + license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-path" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, path + , validity-path + }: + mkDerivation { + pname = "genvalidity-path"; + version = "0.1.0.0"; + sha256 = "0b955a1e244c9fa2915212447b75ec862c3677a43e8b2654e368568ef6244b38"; + libraryHaskellDepends = [ base genvalidity path validity-path ]; + testHaskellDepends = [ base genvalidity-hspec hspec path ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for Path"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-text" = callPackage ({ mkDerivation, array, base, genvalidity, hspec, QuickCheck, text , validity, validity-text }: mkDerivation { pname = "genvalidity-text"; - version = "0.1.0.1"; - sha256 = "1906c0df7b65355f38ce1c13b1e1094a5f9d6da2c4c432ceee74523154814b54"; + version = "0.2.0.0"; + sha256 = "93f5a28f1dcb08bbfd65c58764ee73df2cd49b74150b5e4657313048ab08bf0b"; libraryHaskellDepends = [ array base genvalidity QuickCheck text validity validity-text ]; @@ -77507,6 +77724,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "graflog" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, mtl, test-fixture + , text, text-conversions + }: + mkDerivation { + pname = "graflog"; + version = "1.0.0"; + sha256 = "fcc205034be28055c3f6550e09a94bec4561530926151d7710001b53293c17c0"; + libraryHaskellDepends = [ + aeson base bytestring text text-conversions + ]; + testHaskellDepends = [ base hspec mtl test-fixture ]; + homepage = "https://github.com/m-arnold/graflog#readme"; + description = "Monadic correlated log events"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "grammar-combinators" = callPackage ({ mkDerivation, base, containers, enumerable, fgl, graphviz , MaybeT, mtl, multirec, parsec, template-haskell, text @@ -79843,6 +80077,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "habit" = callPackage + ({ mkDerivation, base, containers, cryptonite, http-client + , http-client-tls, monad-control, monad-logger, persistent + , persistent-mysql, persistent-postgresql, persistent-sqlite + , persistent-template, pipes, resourcet, telegram-api, text + , transformers, transformers-base + }: + mkDerivation { + pname = "habit"; + version = "0.2.1.2"; + sha256 = "d15b24cf6c949469fecaa0e3da8faab350626b260c1dfbce915ba1be4c5e4bea"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers cryptonite http-client http-client-tls + monad-control monad-logger persistent persistent-mysql + persistent-postgresql persistent-sqlite persistent-template pipes + resourcet telegram-api text transformers transformers-base + ]; + executableHaskellDepends = [ base text ]; + homepage = "https://github.com/airalab/habit#readme"; + description = "Haskell message bot framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hable" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -81382,8 +81641,8 @@ self: { }: mkDerivation { pname = "hakyll-agda"; - version = "0.1.10"; - sha256 = "0b9f9ead899ca7fc33b75c8f1838d219143357b892b5132e559e65c1efa14198"; + version = "0.1.10.1"; + sha256 = "83fa165cc9e485f8a84a73ff754e7315efdad7fb5c5a27c7798c89002d1a0c4d"; libraryHaskellDepends = [ Agda base containers directory filepath hakyll mtl pandoc transformers xhtml @@ -83473,6 +83732,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hashflare" = callPackage + ({ mkDerivation, base, containers, simple-money }: + mkDerivation { + pname = "hashflare"; + version = "0.1.0.0"; + sha256 = "2a58cbb78bf8263dc80d384264ba969edb91d4685e87c01b62a48d12fb60e82b"; + revision = "2"; + editedCabalFile = "accd8a66c743cbd6580182c1a85916dd6422d67a1587b7e2927849cd53e38f9a"; + libraryHaskellDepends = [ base containers simple-money ]; + description = "A library for working with HashFlare.io contracts and hashrates"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "hashids" = callPackage ({ mkDerivation, base, bytestring, containers, split }: mkDerivation { @@ -91493,8 +91765,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.1"; - sha256 = "2a059c50a02a360b5fa501fcb4a29ad5197b763a5e38572405a3c3a380cf6ea3"; + version = "1.1.1"; + sha256 = "fea7b5bee2611dee3fac71bfdfcbd5bf80ec7396a45c67e804e880c6d6729d2d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99032,7 +99304,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-api-data_0_3_4" = callPackage + "http-api-data_0_3_5" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , doctest, filepath, hashable, hspec, HUnit, QuickCheck , quickcheck-instances, text, time, time-locale-compat @@ -99040,8 +99312,8 @@ self: { }: mkDerivation { pname = "http-api-data"; - version = "0.3.4"; - sha256 = "aaf5faa89d51e93e4d238fd43c5ad12bf798b948bd13b9304d7104ff05166bc3"; + version = "0.3.5"; + sha256 = "3711ac5f97afe8e89d1f8959138de8f2b3afd8ec30f9c6f3eebbfb2caa2fbc45"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base bytestring containers hashable text time time-locale-compat @@ -104390,7 +104662,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "inline-c_0_5_6_0" = callPackage + "inline-c_0_5_6_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring , containers, cryptohash, directory, filepath, hashable, hspec, mtl , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix @@ -104398,8 +104670,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.5.6.0"; - sha256 = "ea9ae36f9716f714d8a6b9d758c1f839862e5ced38c265d9fd7e65051d04d554"; + version = "0.5.6.1"; + sha256 = "2daf717e6fc0046ccb6563557825fe26fcdc327c55b9771aa7b4c51473e6eb4e"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring containers cryptohash directory filepath hashable mtl parsec parsers QuickCheck @@ -105182,8 +105454,8 @@ self: { }: mkDerivation { pname = "intro"; - version = "0.1.0.3"; - sha256 = "ad0f8df58a00d0e4c905e73e5c7f97efc9efa495bd8ebc77ecd3d104653e183d"; + version = "0.1.0.4"; + sha256 = "a8475b8a72bbd9ef8b712defc8206c3eac6dbb3917d52a57e4175b363acf1f84"; libraryHaskellDepends = [ base bifunctors binary bytestring containers deepseq dlist extra hashable mtl safe string-conversions tagged text transformers @@ -110599,18 +110871,14 @@ self: { }) {}; "labels" = callPackage - ({ mkDerivation, base, bytestring, cassava, template-haskell - , unordered-containers - }: + ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "labels"; - version = "0.1.0"; - sha256 = "cdd74a8e902b00fa74ee20bf895f39616b3325ba72197dd87e80299947bec8ca"; - libraryHaskellDepends = [ - base bytestring cassava template-haskell unordered-containers - ]; + version = "0.1.2"; + sha256 = "d124f63d08ef1f80bff8094ce89261b84afada48bc1e851ed007ae4e257d2486"; + libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/chrisdone/labels#readme"; - description = "Declare and access tuple fields with labels"; + description = "Anonymous records via named tuples"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -118664,8 +118932,8 @@ self: { }: mkDerivation { pname = "machines-directory"; - version = "0.2.0.9"; - sha256 = "38e1e5874431f8cad71b3067bc16258e3dfa13b09bf9d8698d6e28d5e0fabf24"; + version = "0.2.0.10"; + sha256 = "2ee750f86d1658635095c35e94799d06a921e641bf4daa55676fd06e8e9a98a4"; libraryHaskellDepends = [ base directory filepath machines machines-io transformers ]; @@ -118809,8 +119077,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "0.1.0.1"; - sha256 = "b0df75127de969328701adb376673409c82b37c1f3c92b2b0d84b5de2be80ae6"; + version = "0.1.0.2"; + sha256 = "8ce44a28bff7b1c22554719aa94adb529482745a2ddc0efd5e06bff4f77ad53c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124519,6 +124787,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , hspec, HUnit, QuickCheck, semigroups, split, text, transformers + , unordered-containers, vector, vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.1.1"; + sha256 = "3afa27672db118c215dca1233d7c0cdb9c3ba7f6e4fb4d56e9c75deebb3dde57"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -135462,18 +135753,18 @@ self: { ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , bytestring, containers, directory, filepath, highlighting-kate , mtl, optparse-applicative, pandoc, terminal-size, text, time - , yaml + , unordered-containers, yaml }: mkDerivation { pname = "patat"; - version = "0.4.6.0"; - sha256 = "166d22f0e1cc2c3e965b84556c07a8ce51537b36aa5ff07d7fd4893a5bcdfd01"; + version = "0.4.7.0"; + sha256 = "f0e1dafb87d6a09c9cc3dae0dfab740c7b387327c913e2512a4aae9feb5d4f3c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base bytestring containers directory filepath highlighting-kate mtl optparse-applicative - pandoc terminal-size text time yaml + pandoc terminal-size text time unordered-containers yaml ]; homepage = "http://github.com/jaspervdj/patat"; description = "Terminal-based presentations using Pandoc"; @@ -138100,6 +138391,8 @@ self: { pname = "pipes-aeson"; version = "0.4.1.7"; sha256 = "c7cfb199fe3160e3b87f70017050dec94451a4cbc56d3956c91ca007ce5cb8cd"; + revision = "1"; + editedCabalFile = "7ce776e074de974988cd06b5b26062b4f5f1647c07fc2ecdd2992c482c0d286d"; libraryHaskellDepends = [ aeson attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring pipes-parse transformers @@ -138139,6 +138432,8 @@ self: { pname = "pipes-attoparsec"; version = "0.5.1.4"; sha256 = "fab0a84f9f81e6ae06eae85fd895f0cb8c698723cab7f33addaf5d14cd553507"; + revision = "1"; + editedCabalFile = "c90218d8e50e98ed17267f3f96a6e0382fd20c6143892470a6eeb6eda4f34edd"; libraryHaskellDepends = [ attoparsec base bytestring pipes pipes-parse text transformers ]; @@ -138277,17 +138572,15 @@ self: { }) {}; "pipes-category" = callPackage - ({ mkDerivation, base, lens, mtl, pipes, pipes-extras, transformers + ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-extras + , transformers }: mkDerivation { pname = "pipes-category"; - version = "0.1.0.0"; - sha256 = "eb8c49adca4d6787232d36e045fb8c415f195afa5f75e0846bfbef1e67456329"; - isLibrary = true; - isExecutable = true; + version = "0.2.0.0"; + sha256 = "bc8d268cc35a14ec5ef317e2dfd6551d76269e706477bccc03b7d884be779bf7"; libraryHaskellDepends = [ base lens mtl pipes pipes-extras ]; - executableHaskellDepends = [ base pipes transformers ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec pipes transformers ]; homepage = "https://github.com/louispan/pipes-category#readme"; description = "Allows instances for Category, Arrow and ArrowChoice for Pipes"; license = stdenv.lib.licenses.bsd3; @@ -138595,6 +138888,8 @@ self: { pname = "pipes-interleave"; version = "1.1.0"; sha256 = "bd083ec1cc9f35ee393763b18581835d8124b358480ae91c6473308af642d8c4"; + revision = "1"; + editedCabalFile = "d198f42613a501edcdd6f66ad1991b0ba0a2de01453b001e95b0627f87a5853c"; libraryHaskellDepends = [ base containers heaps pipes ]; homepage = "http://github.com/bgamari/pipes-interleave"; description = "Interleave and merge streams of elements"; @@ -138661,6 +138956,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-misc" = callPackage + ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-category + , pipes-concurrency, semigroups, stm, transformers + }: + mkDerivation { + pname = "pipes-misc"; + version = "0.2.0.0"; + sha256 = "d8c56177820ec3d4f7532f98f98026b2e8c9b618572d8fcd97fc4b7446c4e992"; + libraryHaskellDepends = [ + base lens mtl pipes pipes-category pipes-concurrency semigroups stm + transformers + ]; + testHaskellDepends = [ base hspec lens pipes transformers ]; + homepage = "https://github.com/louispan/pipes-misc#readme"; + description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-mongodb" = callPackage ({ mkDerivation, base, monad-control, mongoDB, pipes, text }: mkDerivation { @@ -138683,6 +138996,8 @@ self: { pname = "pipes-network"; version = "0.6.4.1"; sha256 = "a8624aec78e2d2a814956d6759a8d3e18811a82d245480f0404fe408f951a0af"; + revision = "1"; + editedCabalFile = "304e9345c02354da6a7a559e335531bffcd3e6c333b36ccc3c5d4123f5f7f144"; libraryHaskellDepends = [ base bytestring network network-simple pipes pipes-safe transformers @@ -141169,49 +141484,43 @@ self: { }) {}; "postgrest" = callPackage - ({ mkDerivation, aeson, async, base, base64-string, bytestring - , bytestring-tree-builder, case-insensitive, cassava, containers - , contravariant, errors, hasql, hasql-pool, hasql-transaction - , heredoc, hspec, hspec-wai, hspec-wai-json, HTTP, http-types - , interpolatedstring-perl6, jwt, microlens, microlens-aeson - , monad-control, mtl, optparse-applicative, parsec - , postgresql-binary, process, Ranged-sets, regex-tdfa, safe - , scientific, string-conversions, text, time, transformers + ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async + , auto-update, base, base64-bytestring, bytestring + , case-insensitive, cassava, configurator, containers + , contravariant, either, hasql, hasql-pool, hasql-transaction + , heredoc, hjsonpointer, hjsonschema, hspec, hspec-wai + , hspec-wai-json, HTTP, http-types, insert-ordered-containers + , interpolatedstring-perl6, jwt, lens, lens-aeson, monad-control + , network-uri, optparse-applicative, parsec, process, protolude + , Ranged-sets, regex-tdfa, safe, scientific, swagger2, text, time , transformers-base, unix, unordered-containers, vector, wai , wai-cors, wai-extra, wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.3.2.0"; - sha256 = "671b5458b373c1bf78508661eaecad6e39f4baaaa997d26ce074b100f6657184"; + version = "0.4.0.0"; + sha256 = "781c074cb47aa26d8d5de520113b23bad9be729057f87375f11a8abc2bb3489b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring case-insensitive cassava containers - contravariant errors hasql hasql-pool hasql-transaction HTTP - http-types interpolatedstring-perl6 jwt microlens microlens-aeson - mtl optparse-applicative parsec Ranged-sets regex-tdfa safe - scientific string-conversions text time unordered-containers vector - wai wai-cors wai-extra wai-middleware-static warp + aeson ansi-wl-pprint base bytestring case-insensitive cassava + configurator containers contravariant either hasql hasql-pool + hasql-transaction heredoc HTTP http-types insert-ordered-containers + interpolatedstring-perl6 jwt lens lens-aeson network-uri + optparse-applicative parsec protolude Ranged-sets regex-tdfa safe + scientific swagger2 text time unordered-containers vector wai + wai-cors wai-extra wai-middleware-static ]; executableHaskellDepends = [ - aeson base bytestring bytestring-tree-builder case-insensitive - cassava containers contravariant errors hasql hasql-pool - hasql-transaction HTTP http-types interpolatedstring-perl6 jwt - microlens microlens-aeson mtl optparse-applicative parsec - postgresql-binary Ranged-sets regex-tdfa safe scientific - string-conversions text time transformers unix unordered-containers - vector wai wai-cors wai-extra wai-middleware-static warp + auto-update base base64-bytestring bytestring hasql hasql-pool + protolude text time unix warp ]; testHaskellDepends = [ - aeson async base base64-string bytestring case-insensitive cassava - containers contravariant errors hasql hasql-pool hasql-transaction - heredoc hspec hspec-wai hspec-wai-json HTTP http-types - interpolatedstring-perl6 jwt microlens microlens-aeson - monad-control mtl optparse-applicative parsec process Ranged-sets - regex-tdfa safe scientific string-conversions text time - transformers transformers-base unordered-containers vector wai - wai-cors wai-extra wai-middleware-static warp + aeson aeson-qq async auto-update base base64-bytestring bytestring + case-insensitive cassava containers contravariant hasql hasql-pool + heredoc hjsonpointer hjsonschema hspec hspec-wai hspec-wai-json + http-types lens lens-aeson monad-control process protolude + regex-tdfa time transformers-base wai wai-extra ]; homepage = "https://github.com/begriffs/postgrest"; description = "REST API for any Postgres database"; @@ -141499,8 +141808,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.18"; - sha256 = "9b88a25950cda8f7335ce9132b84afc21a14b052ba09709e315e7201c26ffb06"; + version = "0.0.19"; + sha256 = "7946241c38661d637d83ad4a5bb624636c9b81770458a5c640be97523e1775d1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152731,8 +153040,8 @@ self: { }: mkDerivation { pname = "roundtrip"; - version = "0.2.0.3"; - sha256 = "11f24fceb9bf3a9c419ed0b8242e3ef2b743861e4ad47b88216f2647ad43f6e0"; + version = "0.2.0.5"; + sha256 = "caf5b343ba025da9d61190d6a9b55f1c1a02bdb5313ed9489ff969cb9c3f6581"; libraryHaskellDepends = [ base containers pretty safe template-haskell text xml-types ]; @@ -156914,6 +157223,8 @@ self: { pname = "servant"; version = "0.9.1.1"; sha256 = "fb3372f676ab07dfab1695ccd0e23d98c948318f4b4d5ae827a6fa5284c4e5fa"; + revision = "1"; + editedCabalFile = "a9be93ef6e6464dc76f4572fe372095b9e77fdbaf92966569b5a50ee4829de4d"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive http-api-data http-media http-types mmorph mtl network-uri @@ -157249,6 +157560,8 @@ self: { pname = "servant-client"; version = "0.9.1.1"; sha256 = "6e085faa1a8ecab076ffdec61b97b6e7c8fff7eb18a9a4cf3538c26b7b99c724"; + revision = "1"; + editedCabalFile = "d3ac72d1b11dd6ebf86076237d8ffab3b87e8b6f04d2af1b28a2c5506faa82c5"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring exceptions http-api-data http-client http-client-tls http-media @@ -157906,6 +158219,8 @@ self: { pname = "servant-server"; version = "0.9.1.1"; sha256 = "1e0683557ece1f7a8a7b11e5c7cd1fd042783777157d95a67e28a0518c91bdd1"; + revision = "1"; + editedCabalFile = "0fd5137ad4ab43f5a6fde1a944eb23ce6d75c42fb909e4a82b579ab1c3739771"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158056,6 +158371,8 @@ self: { pname = "servant-swagger-ui"; version = "0.2.1.2.2.8"; sha256 = "21a25df5c3527a859a14ae2edf12116d8634e7be1587357f4545f31fc5acb3a4"; + revision = "1"; + editedCabalFile = "3ad40d23f60d1d80d877914691e7e4adbbd129cc62f411494f144f19b9d82ac8"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -159012,8 +159329,8 @@ self: { ({ mkDerivation, base, basic-prelude, directory, shake }: mkDerivation { pname = "shakers"; - version = "0.0.15"; - sha256 = "056d96901beef17cdb4f7fd45777b096ef64c77944ecd0cef195ae0da499b645"; + version = "0.0.16"; + sha256 = "d6f7d889b2030acbc12a233d1666828559c5c6d35ec688b9fc62ebed86eafeef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base basic-prelude directory shake ]; @@ -160333,15 +160650,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "simple-log_0_5_0" = callPackage + "simple-log_0_5_1" = callPackage ({ mkDerivation, async, base, containers, deepseq, directory , exceptions, filepath, mtl, SafeSemaphore, text, time , transformers }: mkDerivation { pname = "simple-log"; - version = "0.5.0"; - sha256 = "b46bdde8b3177b187339b741da3400c6b6a3f790f00bfd1ddf0bda34e301da9d"; + version = "0.5.1"; + sha256 = "d1b7cd207877886538332e10b80ae39815e418474c5431b80bc9aa10df2edbf6"; libraryHaskellDepends = [ async base containers deepseq directory exceptions filepath mtl SafeSemaphore text time transformers @@ -160382,8 +160699,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "simple-money"; - version = "0.1.0.1"; - sha256 = "482631afc85ad0f176886a7c39093937ebd048b0a2396e9a3661ab7bb2700701"; + version = "0.2.0.1"; + sha256 = "8ebb01c9704377dcc0a945218ff9038fcda3ecf36ecd7f26265e407ba6c5112e"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/nbrk/simple-money"; description = "Simple library to handle and interexchange money"; @@ -167697,15 +168014,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_3_1" = callPackage + "stratosphere_0_4_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.3.1"; - sha256 = "dc72586e7cc78d9be49afc9ae99a9713933fd10fa524d55e22ce9ee34e399130"; + version = "0.4.0"; + sha256 = "27c7b48ff3f78231711eab021b4a54b82b3b58e0dfa43e02b8c41a8be9c4527d"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring hashable lens template-haskell text unordered-containers @@ -171902,8 +172219,8 @@ self: { }: mkDerivation { pname = "tasty-discover"; - version = "1.0.1"; - sha256 = "d64eb1d6f2d21de2e55fc21cb666423a35d79c4732cc7a0931d6995bbd58adbd"; + version = "1.1.0"; + sha256 = "023568259c04b596fdd6c8030667b08d2a17f50cbc2cd514595ddd635ca8a3c5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172534,8 +172851,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.5.1.2"; - sha256 = "f13c9ce45a3d3a7bf52f4fadd8e1410ba64e3015ace00a6f82b2d4adf7e2410c"; + version = "0.5.2.0"; + sha256 = "17df43de078fb793454c13b8a1226525f8e1c189ef2162f147817f60229a8c32"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client http-media http-types mime-types mtl servant servant-client string-conversions @@ -183491,18 +183808,55 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_3_1_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "validity"; + version = "0.3.1.1"; + sha256 = "c5ba39b30af35e275467bf016d9df71f3368abaaeb0d47c0cbbdbf78de627b0c"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "validity-bytestring" = callPackage + ({ mkDerivation, base, bytestring, validity }: + mkDerivation { + pname = "validity-bytestring"; + version = "0.1.0.0"; + sha256 = "1322e47ffd6e192b9b322799c8fd8218e3de07274b5263cbd503f280f1a5d9a3"; + libraryHaskellDepends = [ base bytestring validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for bytestring"; + license = stdenv.lib.licenses.mit; + }) {}; + "validity-containers" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; - version = "0.1.0.1"; - sha256 = "ae626d963b2caca9f385cf65eb793fb41441ec93a4d8e937c24dc44a64a88829"; + version = "0.1.0.2"; + sha256 = "22f2084de274b01e0d0dc42fc609b651b979e899123b84a8702a2fca61468cdd"; libraryHaskellDepends = [ base containers validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for containers"; license = stdenv.lib.licenses.mit; }) {}; + "validity-path" = callPackage + ({ mkDerivation, base, filepath, path, validity }: + mkDerivation { + pname = "validity-path"; + version = "0.1.0.0"; + sha256 = "cb93616b60ba80dc051474f8dd0a67c605d4388a316561b29bf0d56117fb32e0"; + libraryHaskellDepends = [ base filepath path validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for Path"; + license = stdenv.lib.licenses.mit; + }) {}; + "validity-text" = callPackage ({ mkDerivation, base, text, validity }: mkDerivation { @@ -184547,6 +184901,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof" = callPackage + ({ mkDerivation, base, brick, containers, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0"; + sha256 = "6e518c06c289d01e82a8c7a360e0467ffba419781d4f394c7b8c608bc9303445"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers ghc-prof lens scientific text vector + vector-algorithms vty + ]; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -187401,8 +187773,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.5.2.0"; - sha256 = "cabc70b3db50df42644d0806def72838b5d7f20bcc6ddefec48e42acda417c4e"; + version = "0.5.2.1"; + sha256 = "816e5e766e16b3c6aee00eb70a6e967582a782ddca557533afca68a01a8bd2b9"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptonite http-client http-client-tls memory template-haskell text @@ -189890,8 +190262,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty, xml }: mkDerivation { pname = "xcb-types"; - version = "0.7.1"; - sha256 = "5927e720e4dee26b1bf8a24fb07e47e6a22f9d78fc87aab8d752f207c1566782"; + version = "0.8.0"; + sha256 = "6db5df1acf5c52cf18df0084ff325e665d37eba3eb8ca40ffc2b9a52b220d50b"; libraryHaskellDepends = [ base containers mtl pretty xml ]; homepage = "http://community.haskell.org/~aslatter/code/xcb-types"; description = "Parses XML files used by the XCB project"; @@ -189900,23 +190272,24 @@ self: { "xcffib" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , directory, filemanip, filepath, HUnit, language-python, mtl - , optparse-applicative, split, test-framework, test-framework-hunit - , xcb-types + , directory, either, filemanip, filepath, HUnit, language-python + , mtl, optparse-applicative, semigroups, split, test-framework + , test-framework-hunit, xcb-types }: mkDerivation { pname = "xcffib"; - version = "0.4.2"; - sha256 = "ccaafda9d2e55fb079e5f2bcac74264a0c3c97f6488b49f8a81eae9a66e556b2"; + version = "0.5.0"; + sha256 = "e12cfb879cc022f80b3d05ab0dcbf080005b2d27eb0a07ea56d4481c3afb0879"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring containers filemanip filepath + attoparsec base bytestring containers either filemanip filepath language-python mtl split xcb-types ]; executableHaskellDepends = [ - attoparsec base bytestring containers directory filemanip filepath - language-python mtl optparse-applicative split xcb-types + attoparsec base bytestring containers directory either filemanip + filepath language-python mtl optparse-applicative semigroups split + xcb-types ]; testHaskellDepends = [ base filepath HUnit language-python test-framework diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index a883080f58e7..b4a9282e1851 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.7"; + version = "2.4.8"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1mgvpqxc99057szfhhjfirmf3xyhs0vmgb0jzy47wr2jh84xd3a3"; + sha256 = "1zcdkarz9mbx9k5sl69nbphjjcy0xd15zjicjnhp2wq32zm6b2k6"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix index f077533ecfe4..eab103726742 100644 --- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix +++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix @@ -53,4 +53,4 @@ in attrs // { fi ${postShellHook} ''; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index f94d7051d0d9..c25b0642637c 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { homepage = "http://www.libsdl.org/"; license = licenses.zlib; platforms = platforms.all; - maintainers = with maintainers; [ page ]; + maintainers = with maintainers; [ cpages ]; }; } diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 3c4fe70c19d4..90c27083d770 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "cpp-hocon-${version}"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { - sha256 = "0v2mnak6fh13dkl25lfvw1la2dfjqrh3lq1d40r3a52m56vwflrg"; + sha256 = "1abalk0sjfg4yfz148hdknsbnl2xwjb8li7lqc64d07ifxhcqr87"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/jsoncpp/1.6.5/default.nix b/pkgs/development/libraries/jsoncpp/1.6.5/default.nix index 53df8d6e7cfc..00dffdbc3ce3 100644 --- a/pkgs/development/libraries/jsoncpp/1.6.5/default.nix +++ b/pkgs/development/libraries/jsoncpp/1.6.5/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { inherit version; homepage = https://github.com/open-source-parsers/jsoncpp; description = "A simple API to manipulate JSON data in C++"; - maintainers = with stdenv.lib.maintainers; [ ttuegel page ]; + maintainers = with stdenv.lib.maintainers; [ ttuegel cpages ]; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.mit; branch = "1.6"; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index bc62a04808ff..ea092a336375 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { - sha256 = "18nidasykbwdd9qzwc8pnzhczy6acr3rsxwvv2v3j5gq3nbsk2mc"; + sha256 = "0kjk3xq7v6bqq35ymj9vr9xz5kpcka51ms6489pm48adyaf53hs7"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index 989670bc0594..8951017a4b5c 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "121s73pgbqsnmy6xblbrkj9y44c5zzzpf2hcmh6zvcvg4dk26gzx"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; # Writing the version to a .dist-version file is required for the get-version # shell script because fetchgit removes the .git directory. @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { echo '${version}' > .dist-version; ''; - autoreconfPhase = "./autogen"; - meta = with stdenv.lib; { homepage = "https://www.hadrons.org/software/${pname}/"; description = "Message Digest functions from BSD systems"; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 82bf9a486791..559caf8928b8 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fixedPoint ? false, withCustomModes ? true }: +{ stdenv, fetchurl, fetchpatch +, fixedPoint ? false, withCustomModes ? true }: let version = "1.1.3"; @@ -11,6 +12,13 @@ stdenv.mkDerivation rec { sha256 = "0cxnd7pjxbgh6l3cbzsw29phpr5cq28fikfhjlp1hc3y5s0gxdjq"; }; + patches = [ + (fetchpatch { # CVE-2017-0381 + url = "https://github.com/xiph/opus/commit/79e8f527b0344b0897a65be35e77f7885bd99409.patch"; + sha256 = "0clm4ixqkaj0a6i5rhaqfv3nnxyk33b2b8xlm7vyfd0y8kbh996q"; + }) + ]; + outputs = [ "out" "dev" ]; configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point" diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index 86f5029e9a59..654bdd2e61f9 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { repositories.git = https://github.com/divVerent/s2tc.git; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.page ]; + maintainers = [ stdenv.lib.maintainers.cpages ]; }; } diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 498263458b50..b7c456df85c4 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, version, src +{ stdenv, lib, version, src , autoreconfHook, zlib, gtest , ... }: @@ -21,6 +21,26 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook zlib ]; + # The generated C++ code uses static initializers which mutate a global data + # structure. This causes problems for an executable when: + # + # 1) it dynamically links to two libs, both of which contain generated C++ for + # the same proto file, and + # 2) the two aforementioned libs both dynamically link to libprotobuf. + # + # One solution is to statically link libprotobuf, that way the global + # variables are not shared; in fact, this is necessary for the python Mesos + # binding to not crash, as the python lib contains two C extensions which + # both refer to the same proto schema. + # + # See: https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684 + # https://github.com/google/protobuf/issues/1489 + dontDisableStatic = true; + configureFlags = [ + "CFLAGS=-fPIC" + "CXXFLAGS=-fPIC" + ]; + doCheck = true; meta = { diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index 74b89fbe48c1..09909f6546a4 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "udunits-2.2.21"; + name = "udunits-2.2.23"; src = fetchurl { url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz"; - sha256 = "0z8sglqc3d409cylqln53jrv97rw7npyh929y2xdvbc40kzzaxcv"; + sha256 = "0ya93jrv8qzfkdj77grl4dpyb0ap4jccmqx3rkkgaggnklhjfwkr"; }; nativeBuildInputs = [ bison flex file ]; diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index ad8c76b4e6ed..b78bbda5d5e7 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.0. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! {pkgs ? import { inherit system; @@ -6,11 +6,11 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages-v4.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 57bd88bd2a19..1c21b47b92c9 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.0. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! {pkgs ? import { inherit system; @@ -6,11 +6,11 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages-v6.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 389ccae2fe52..bd1de3e9f93e 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -1,9 +1,9 @@ # This file originates from node2nix -{stdenv, nodejs, utillinux, runCommand, writeTextFile}: +{stdenv, nodejs, python2, utillinux, runCommand, writeTextFile}: let - inherit (nodejs) python; + python = if nodejs ? python then nodejs.python else python2; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise tarWrapper = runCommand "tarWrapper" {} '' diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 20197d1833eb..8f5d178e7346 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.0. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -76,13 +76,13 @@ let sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; }; }; - "resolve-1.1.7" = { + "resolve-1.2.0" = { name = "resolve"; packageName = "resolve"; - version = "1.1.7"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz"; + sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c"; }; }; "global-paths-0.1.2" = { @@ -274,13 +274,13 @@ let sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe"; }; }; - "global-prefix-0.1.4" = { + "global-prefix-0.1.5" = { name = "global-prefix"; packageName = "global-prefix"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz"; - sha1 = "05158db1cde2dd491b455e290eb3ab8bfc45c6e1"; + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz"; + sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"; }; }; "is-windows-0.2.0" = { @@ -292,6 +292,15 @@ let sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; }; }; + "homedir-polyfill-1.0.1" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; + sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + }; + }; "ini-1.3.4" = { name = "ini"; packageName = "ini"; @@ -301,15 +310,6 @@ let sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; }; }; - "osenv-0.1.3" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz"; - sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; - }; - }; "which-1.2.12" = { name = "which"; packageName = "which"; @@ -319,22 +319,13 @@ let sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; }; }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; + "parse-passwd-1.0.0" = { + name = "parse-passwd"; + packageName = "parse-passwd"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; "isexe-1.1.2" = { @@ -409,13 +400,13 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-cdn-0.2.1" = { + "azure-arm-cdn-1.0.0" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; - version = "0.2.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-0.2.1.tgz"; - sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a"; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz"; + sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85"; }; }; "azure-arm-commerce-0.2.0" = { @@ -427,13 +418,31 @@ let sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; }; }; - "azure-arm-compute-0.19.0" = { + "azure-arm-compute-0.19.1" = { name = "azure-arm-compute"; packageName = "azure-arm-compute"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.0.tgz"; - sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e"; + url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz"; + sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd"; + }; + }; + "azure-arm-datalake-analytics-1.0.1-preview" = { + name = "azure-arm-datalake-analytics"; + packageName = "azure-arm-datalake-analytics"; + version = "1.0.1-preview"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.1-preview.tgz"; + sha1 = "75461904000427e12ce11d634d74c052c86de994"; + }; + }; + "azure-arm-datalake-store-1.0.1-preview" = { + name = "azure-arm-datalake-store"; + packageName = "azure-arm-datalake-store"; + version = "1.0.1-preview"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.1-preview.tgz"; + sha1 = "bd07cbeb5eb355a00b7bed69e198a1a968115dd5"; }; }; "azure-arm-hdinsight-0.2.2" = { @@ -535,24 +544,6 @@ let sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02"; }; }; - "azure-arm-datalake-analytics-0.4.3" = { - name = "azure-arm-datalake-analytics"; - packageName = "azure-arm-datalake-analytics"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-0.4.3.tgz"; - sha1 = "10c81e59d3064289a42ab37fea805a334333ed91"; - }; - }; - "azure-arm-datalake-store-0.4.2" = { - name = "azure-arm-datalake-store"; - packageName = "azure-arm-datalake-store"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-0.4.2.tgz"; - sha1 = "479f4a28986c9737b8fef14090c0c7ccc33cb123"; - }; - }; "azure-arm-devtestlabs-0.1.0" = { name = "azure-arm-devtestlabs"; packageName = "azure-arm-devtestlabs"; @@ -643,13 +634,13 @@ let sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; }; }; - "azure-arm-resource-1.4.5-preview" = { + "azure-arm-resource-1.6.1-preview" = { name = "azure-arm-resource"; packageName = "azure-arm-resource"; - version = "1.4.5-preview"; + version = "1.6.1-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.5-preview.tgz"; - sha1 = "166934783752607e9a4128ea0ad715b9b7a9015f"; + url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz"; + sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; }; }; "azure-arm-storage-0.13.1-preview" = { @@ -742,13 +733,13 @@ let sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e"; }; }; - "applicationinsights-0.15.12" = { + "applicationinsights-0.16.0" = { name = "applicationinsights"; packageName = "applicationinsights"; - version = "0.15.12"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.15.12.tgz"; - sha1 = "d03f282da9424f33729eb7da8279e8e8a20dc7fc"; + url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz"; + sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3"; }; }; "caller-id-0.1.0" = { @@ -868,13 +859,13 @@ let sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a"; }; }; - "moment-2.17.0" = { + "moment-2.17.1" = { name = "moment"; packageName = "moment"; - version = "2.17.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz"; - sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f"; + url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; + sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; }; }; "ms-rest-1.15.2" = { @@ -904,15 +895,6 @@ let sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; }; }; - "node-uuid-1.2.0" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz"; - sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b"; - }; - }; "omelette-0.1.0" = { name = "omelette"; packageName = "omelette"; @@ -1039,6 +1021,15 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; + "uuid-3.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; + sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; + }; + }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -1120,13 +1111,13 @@ let sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; }; }; - "xmldom-0.1.22" = { + "xmldom-0.1.27" = { name = "xmldom"; packageName = "xmldom"; - version = "0.1.22"; + version = "0.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz"; - sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"; + sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; }; }; "xpath.js-1.0.7" = { @@ -1147,13 +1138,13 @@ let sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb"; }; }; - "jwa-1.1.4" = { + "jwa-1.1.5" = { name = "jwa"; packageName = "jwa"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz"; - sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e"; + url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz"; + sha1 = "a0552ce0220742cd52e153774a32905c30e756e5"; }; }; "safe-buffer-5.0.1" = { @@ -1174,22 +1165,13 @@ let sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; }; }; - "ecdsa-sig-formatter-1.0.7" = { + "ecdsa-sig-formatter-1.0.9" = { name = "ecdsa-sig-formatter"; packageName = "ecdsa-sig-formatter"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz"; - sha1 = "3137e976a1d6232517e2513e04e32f79bcbdf126"; - }; - }; - "base64-url-1.3.3" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; - sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz"; + sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1"; }; }; "xml2js-0.2.7" = { @@ -1831,13 +1813,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.13" = { + "mime-types-2.1.14" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.13"; + version = "2.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz"; - sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; + sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; }; }; "oauth-sign-0.8.2" = { @@ -1903,13 +1885,13 @@ let sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; }; }; - "lodash-4.17.2" = { + "lodash-4.17.4" = { name = "lodash"; packageName = "lodash"; - version = "4.17.2"; + version = "4.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz"; - sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; + sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; }; }; "chalk-1.1.3" = { @@ -1993,13 +1975,13 @@ let sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; }; }; - "ansi-regex-2.0.0" = { + "ansi-regex-2.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; - sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; "graceful-readlink-1.0.1" = { @@ -2029,13 +2011,13 @@ let sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; }; }; - "jsonpointer-4.0.0" = { + "jsonpointer-4.0.1" = { name = "jsonpointer"; packageName = "jsonpointer"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz"; - sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5"; + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; + sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; }; }; "xtend-4.0.1" = { @@ -2119,13 +2101,13 @@ let sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; }; }; - "sshpk-1.10.1" = { + "sshpk-1.10.2" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz"; - sha1 = "30e1a5d329244974a1af61511339d595af6638b0"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"; + sha1 = "d5a804ce22695515638e798dbe23273de070a5fa"; }; }; "extsprintf-1.0.2" = { @@ -2173,13 +2155,13 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "dashdash-1.14.0" = { + "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"; - sha1 = "29e486c5418bf0f356034a993d51686a33e84141"; + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; "getpass-0.1.6" = { @@ -2200,13 +2182,13 @@ let sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; }; }; - "tweetnacl-0.14.3" = { + "tweetnacl-0.14.5" = { name = "tweetnacl"; packageName = "tweetnacl"; - version = "0.14.3"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; - sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; "jodid25519-1.0.2" = { @@ -2236,13 +2218,13 @@ let sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; }; }; - "mime-db-1.25.0" = { + "mime-db-1.26.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz"; - sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; + sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; }; }; "punycode-1.4.1" = { @@ -2299,13 +2281,13 @@ let sha1 = "0c989774f2870c69378aa665648cdc60f343aa53"; }; }; - "concat-stream-1.5.2" = { + "concat-stream-1.6.0" = { name = "concat-stream"; packageName = "concat-stream"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; - sha1 = "708978624d856af41a5a741defdd261da752c266"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; + sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; }; }; "http-response-object-1.1.0" = { @@ -2335,6 +2317,24 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; + "readable-stream-2.2.2" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; + sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; + }; + }; + "buffer-shims-1.0.0" = { + name = "buffer-shims"; + packageName = "buffer-shims"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; + sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + }; + }; "http-basic-2.5.1" = { name = "http-basic"; packageName = "http-basic"; @@ -2371,6 +2371,15 @@ let sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; }; }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; "async-1.0.0" = { name = "async"; packageName = "async"; @@ -2398,13 +2407,13 @@ let sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; }; }; - "mute-stream-0.0.6" = { + "mute-stream-0.0.7" = { name = "mute-stream"; packageName = "mute-stream"; - version = "0.0.6"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; - sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; }; }; "argparse-1.0.4" = { @@ -2695,15 +2704,6 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "readable-stream-2.2.2" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; - sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; - }; - }; "stream-shift-1.0.0" = { name = "stream-shift"; packageName = "stream-shift"; @@ -2722,15 +2722,6 @@ let sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; }; }; - "buffer-shims-1.0.0" = { - name = "buffer-shims"; - packageName = "buffer-shims"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; - sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; - }; - }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -2785,13 +2776,13 @@ let sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; }; }; - "object-assign-4.1.0" = { + "object-assign-4.1.1" = { name = "object-assign"; packageName = "object-assign"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; - sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; "read-pkg-up-1.0.1" = { @@ -2839,13 +2830,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "signal-exit-3.0.1" = { + "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; - sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; "array-find-index-1.0.2" = { @@ -3136,13 +3127,13 @@ let sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "debug-2.3.3" = { + "debug-2.6.0" = { name = "debug"; packageName = "debug"; - version = "2.3.3"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; - sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; + sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; }; }; "ms-0.7.2" = { @@ -3154,6 +3145,15 @@ let sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; "rimraf-2.2.8" = { name = "rimraf"; packageName = "rimraf"; @@ -3163,22 +3163,22 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "JSONStream-1.2.1" = { + "JSONStream-1.3.0" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; - sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; - }; - }; - "assert-1.3.0" = { - name = "assert"; - packageName = "assert"; version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; - sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz"; + sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5"; + }; + }; + "assert-1.4.1" = { + name = "assert"; + packageName = "assert"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; + sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; }; }; "browser-pack-6.0.2" = { @@ -3226,6 +3226,15 @@ let sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4"; }; }; + "concat-stream-1.5.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; + }; + }; "console-browserify-1.1.0" = { name = "console-browserify"; packageName = "console-browserify"; @@ -3298,15 +3307,6 @@ let sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; }; }; - "glob-5.0.15" = { - name = "glob"; - packageName = "glob"; - version = "5.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; - sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; - }; - }; "has-1.0.1" = { name = "has"; packageName = "has"; @@ -3442,13 +3442,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.5.0" = { + "stream-http-2.6.3" = { name = "stream-http"; packageName = "stream-http"; - version = "2.5.0"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz"; - sha1 = "585eee513217ed98fe199817e7313b6f772a6802"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz"; + sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"; }; }; "subarg-1.0.0" = { @@ -3469,13 +3469,13 @@ let sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710"; }; }; - "through2-2.0.1" = { + "through2-2.0.3" = { name = "through2"; packageName = "through2"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz"; - sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9"; + url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; + sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; }; }; "timers-browserify-1.4.2" = { @@ -3523,6 +3523,15 @@ let sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; }; }; + "jsonparse-1.3.0" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz"; + sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8"; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -3586,6 +3595,15 @@ let sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; }; }; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -3820,13 +3838,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "asn1.js-4.9.0" = { + "asn1.js-4.9.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.9.0"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz"; - sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz"; + sha1 = "48ba240b45a9280e94748990ba597d216617fd40"; }; }; "ripemd160-1.0.1" = { @@ -3991,13 +4009,13 @@ let sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; }; }; - "builtin-status-codes-2.0.0" = { + "builtin-status-codes-3.0.0" = { name = "builtin-status-codes"; packageName = "builtin-status-codes"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz"; - sha1 = "6f22003baacf003ccd287afe6872151fddc58579"; + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; "to-arraybuffer-1.0.1" = { @@ -4063,13 +4081,13 @@ let sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395"; }; }; - "castv2-client-1.1.2" = { + "castv2-client-1.2.0" = { name = "castv2-client"; packageName = "castv2-client"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.1.2.tgz"; - sha1 = "7865eac9181cd1f419fdcee448b5793706f853ad"; + url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz"; + sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544"; }; }; "chalk-1.0.0" = { @@ -4468,13 +4486,13 @@ let sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc"; }; }; - "numeral-1.5.5" = { + "numeral-1.5.6" = { name = "numeral"; packageName = "numeral"; - version = "1.5.5"; + version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz"; - sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208"; + url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz"; + sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; }; }; "open-0.0.5" = { @@ -4540,13 +4558,13 @@ let sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; }; }; - "mdns-js-0.5.1" = { + "mdns-js-0.5.3" = { name = "mdns-js"; packageName = "mdns-js"; - version = "0.5.1"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz"; - sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec"; + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.3.tgz"; + sha1 = "add2958d399319b6d8f2dde29bebac5e845e8b6d"; }; }; "plist-2.0.1" = { @@ -4693,22 +4711,22 @@ let sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8"; }; }; - "parse-torrent-file-4.0.0" = { + "parse-torrent-file-4.0.1" = { name = "parse-torrent-file"; packageName = "parse-torrent-file"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.0.tgz"; - sha1 = "106df57e0e509bafa6756e544d88205e52be33a6"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz"; + sha1 = "4580c5ebb3f6e607baa02ef0ace51f627859e699"; }; }; - "simple-get-2.3.0" = { + "simple-get-2.4.0" = { name = "simple-get"; packageName = "simple-get"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.3.0.tgz"; - sha1 = "c5fdfcce1e516ad4b2ce7b7c2bd2d710502d8ac9"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz"; + sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2"; }; }; "thirty-two-1.0.2" = { @@ -4729,31 +4747,31 @@ let sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; }; }; - "bencode-0.10.0" = { + "bencode-0.11.0" = { name = "bencode"; packageName = "bencode"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-0.10.0.tgz"; - sha1 = "717b36fc61c4e9cb3755f0a9f90996ee5b46f0d0"; + url = "https://registry.npmjs.org/bencode/-/bencode-0.11.0.tgz"; + sha1 = "7ea65d4ce00300393a43a92d5640b6fb0204dc64"; }; }; - "simple-sha1-2.0.8" = { + "simple-sha1-2.1.0" = { name = "simple-sha1"; packageName = "simple-sha1"; - version = "2.0.8"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.8.tgz"; - sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f"; + url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz"; + sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3"; }; }; - "rusha-0.8.4" = { + "rusha-0.8.5" = { name = "rusha"; packageName = "rusha"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz"; - sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.5.tgz"; + sha1 = "a30ae9bd5a4e80fbc96fbe7a13232b944be24f84"; }; }; "simple-concat-1.0.0" = { @@ -4918,13 +4936,13 @@ let sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; }; }; - "random-access-file-1.3.1" = { + "random-access-file-1.4.0" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.3.1.tgz"; - sha1 = "5302a65a7ff2b83c50e18d79bf4cd619b520ac8d"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz"; + sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767"; }; }; "run-parallel-1.1.6" = { @@ -5143,13 +5161,13 @@ let sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; - "k-rpc-socket-1.6.0" = { + "k-rpc-socket-1.6.1" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.0.tgz"; - sha1 = "28c3909cf1547aaa47d5cd924034d55720f7ba64"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz"; + sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e"; }; }; "bencode-0.8.0" = { @@ -5188,22 +5206,22 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "simple-peer-6.0.7" = { + "simple-peer-6.2.1" = { name = "simple-peer"; packageName = "simple-peer"; - version = "6.0.7"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.7.tgz"; - sha1 = "ccc5133b7e75e154ab17b9ccdbec91e970cc2278"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz"; + sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb"; }; }; - "simple-websocket-4.1.0" = { + "simple-websocket-4.2.0" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.1.0.tgz"; - sha1 = "2b1e887e7737ae1452458ead0d0a79722901877f"; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz"; + sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf"; }; }; "string2compact-1.2.2" = { @@ -5530,13 +5548,13 @@ let sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c"; }; }; - "exit-on-epipe-0.1.0" = { + "exit-on-epipe-1.0.0" = { name = "exit-on-epipe"; packageName = "exit-on-epipe"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz"; - sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697"; + url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.0.tgz"; + sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc"; }; }; "xmlbuilder-4.2.1" = { @@ -5566,13 +5584,13 @@ let sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33"; }; }; - "insight-0.8.3" = { + "insight-0.8.4" = { name = "insight"; packageName = "insight"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz"; - sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d"; + url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; + sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; }; }; "nopt-3.0.1" = { @@ -5647,6 +5665,24 @@ let sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; }; }; + "glob-5.0.15" = { + name = "glob"; + packageName = "glob"; + version = "5.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; + sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + }; + }; + "osenv-0.1.4" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; + sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; + }; + }; "plist-1.2.0" = { name = "plist"; packageName = "plist"; @@ -5755,13 +5791,13 @@ let sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980"; }; }; - "cordova-serve-1.0.0" = { + "cordova-serve-1.0.1" = { name = "cordova-serve"; packageName = "cordova-serve"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.0.tgz"; - sha1 = "7fa1c40183d2b82adb792f9cb9e0d554a23eed85"; + url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.1.tgz"; + sha1 = "895c7fb4bbe630fa1c89feaf6d74779cbff66da7"; }; }; "dep-graph-1.1.0" = { @@ -5935,13 +5971,13 @@ let sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26"; }; }; - "shelljs-0.7.5" = { + "shelljs-0.7.6" = { name = "shelljs"; packageName = "shelljs"; - version = "0.7.5"; + version = "0.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz"; - sha1 = "2eef7a50a21e1ccf37da00df767ec69e30ad0675"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz"; + sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad"; }; }; "interpret-1.0.1" = { @@ -5980,6 +6016,15 @@ let sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; }; }; + "assert-1.3.0" = { + name = "assert"; + packageName = "assert"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; + sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; + }; + }; "compression-1.6.2" = { name = "compression"; packageName = "compression"; @@ -6214,13 +6259,13 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-1.1.2" = { + "proxy-addr-1.1.3" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz"; - sha1 = "b4cc5f22610d9535824c123aef9d3cf73c40ba37"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz"; + sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074"; }; }; "qs-6.2.0" = { @@ -6295,15 +6340,6 @@ let sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; }; }; - "ipaddr.js-1.1.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz"; - sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230"; - }; - }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -6601,22 +6637,22 @@ let sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; }; }; - "lockfile-1.0.2" = { + "lockfile-1.0.3" = { name = "lockfile"; packageName = "lockfile"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz"; - sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83"; + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz"; + sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79"; }; }; - "lru-cache-4.0.1" = { + "lru-cache-4.0.2" = { name = "lru-cache"; packageName = "lru-cache"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz"; - sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"; + sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; }; }; "node-gyp-3.4.0" = { @@ -6727,13 +6763,13 @@ let sha1 = "d0def882952b8de3f67eba5e91199661271f41f4"; }; }; - "retry-0.10.0" = { + "retry-0.10.1" = { name = "retry"; packageName = "retry"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz"; - sha1 = "649e15ca408422d98318161935e7f7d652d435dd"; + url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"; + sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; }; }; "sha-2.0.1" = { @@ -7294,13 +7330,13 @@ let sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; - "write-file-atomic-1.2.0" = { + "write-file-atomic-1.3.1" = { name = "write-file-atomic"; packageName = "write-file-atomic"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; - sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz"; + sha1 = "7d45ba32316328dd1ec7d90f60ebc0d845bb759a"; }; }; "xdg-basedir-2.0.0" = { @@ -7447,15 +7483,6 @@ let sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; }; - "uuid-3.0.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; - sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; - }; - }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -7582,13 +7609,22 @@ let sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; }; }; - "parserlib-1.0.0" = { + "clone-2.1.0" = { + name = "clone"; + packageName = "clone"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz"; + sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6"; + }; + }; + "parserlib-1.1.1" = { name = "parserlib"; packageName = "parserlib"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz"; - sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f"; + url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz"; + sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4"; }; }; "bluebird-2.9.9" = { @@ -7988,13 +8024,13 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "nan-2.4.0" = { + "nan-2.5.0" = { name = "nan"; packageName = "nan"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; - sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; + sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; }; }; "jsonparse-0.0.6" = { @@ -8351,22 +8387,22 @@ let sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce"; }; }; - "ndjson-1.4.3" = { + "ndjson-1.5.0" = { name = "ndjson"; packageName = "ndjson"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ndjson/-/ndjson-1.4.3.tgz"; - sha1 = "7aa026fe3ab38a7da1a2b4ad07b1008e733eb239"; + url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz"; + sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "pump-1.0.1" = { + "pump-1.0.2" = { name = "pump"; packageName = "pump"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz"; - sha1 = "f1f1409fb9bd1085bbdb576b43b84ec4b5eadc1a"; + url = "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz"; + sha1 = "3b3ee6512f94f0e575538c17995f9f16990a5d51"; }; }; "pumpify-1.3.5" = { @@ -8702,6 +8738,15 @@ let sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3"; }; }; + "split2-2.1.1" = { + name = "split2"; + packageName = "split2"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz"; + sha1 = "7a1f551e176a90ecd3345f7246a0cfe175ef4fd0"; + }; + }; "murl-0.4.1" = { name = "murl"; packageName = "murl"; @@ -8720,31 +8765,40 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; - "JSONStream-1.1.4" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "1.1.4"; + "bl-1.2.0" = { + name = "bl"; + packageName = "bl"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; - sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + url = "https://registry.npmjs.org/bl/-/bl-1.2.0.tgz"; + sha1 = "1397e7ec42c5f5dc387470c500e34a9f6be9ea98"; }; }; - "async-2.0.1" = { - name = "async"; - packageName = "async"; - version = "2.0.1"; + "awscred-1.2.0" = { + name = "awscred"; + packageName = "awscred"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz"; - sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; + url = "https://registry.npmjs.org/awscred/-/awscred-1.2.0.tgz"; + sha1 = "9ba714a0d2feb625b848f15c62746c07aebdc3b5"; }; }; - "got-6.6.3" = { + "clipboardy-0.1.2" = { + name = "clipboardy"; + packageName = "clipboardy"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-0.1.2.tgz"; + sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc"; + }; + }; + "got-6.7.1" = { name = "got"; packageName = "got"; - version = "6.6.3"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz"; - sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec"; + url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; }; }; "lodash.debounce-4.0.8" = { @@ -8765,13 +8819,76 @@ let sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; }; }; - "mem-0.1.1" = { + "mem-1.1.0" = { name = "mem"; packageName = "mem"; - version = "0.1.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; - sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + }; + }; + "execa-0.5.1" = { + name = "execa"; + packageName = "execa"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz"; + sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36"; + }; + }; + "cross-spawn-4.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; "create-error-class-3.0.2" = { @@ -8792,13 +8909,13 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "get-stream-2.3.1" = { + "get-stream-3.0.0" = { name = "get-stream"; packageName = "get-stream"; - version = "2.3.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; - sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; }; }; "is-retry-allowed-1.1.0" = { @@ -8810,22 +8927,13 @@ let sha1 = "11a060568b67339444033d0125a61a20d564fb34"; }; }; - "node-status-codes-2.0.1" = { - name = "node-status-codes"; - packageName = "node-status-codes"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz"; - sha1 = "298067659cb68a2b4670abbefde02a3819981f5b"; - }; - }; - "timed-out-3.0.0" = { + "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; - version = "3.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz"; - sha1 = "ff88de96030ce960eabd42487db61d3add229273"; + url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; }; }; "url-parse-lax-1.0.0" = { @@ -8846,13 +8954,22 @@ let sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; }; }; - "babel-code-frame-6.16.0" = { + "mimic-fn-1.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; + sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; + }; + }; + "babel-code-frame-6.22.0" = { name = "babel-code-frame"; packageName = "babel-code-frame"; - version = "6.16.0"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz"; - sha1 = "f90e60da0862909d3ce098733b5d3987c97cb8de"; + url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz"; + sha1 = "027620bee567a88c32561574e7fd0801d33118e4"; }; }; "doctrine-1.5.0" = { @@ -9017,6 +9134,15 @@ let sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; }; }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; "table-3.8.3" = { name = "table"; packageName = "table"; @@ -9026,13 +9152,13 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "js-tokens-2.0.0" = { + "js-tokens-3.0.0" = { name = "js-tokens"; packageName = "js-tokens"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz"; - sha1 = "79903f5563ee778cc1162e6dcf1a0027c97f9cb5"; + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.0.tgz"; + sha1 = "a2f2a969caae142fb3cd56228358c89366957bd1"; }; }; "es6-map-0.1.4" = { @@ -9089,13 +9215,13 @@ let sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; }; }; - "acorn-4.0.3" = { + "acorn-4.0.4" = { name = "acorn"; packageName = "acorn"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz"; - sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz"; + sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a"; }; }; "acorn-jsx-3.0.1" = { @@ -9107,13 +9233,13 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; - "flat-cache-1.2.1" = { + "flat-cache-1.2.2" = { name = "flat-cache"; packageName = "flat-cache"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.1.tgz"; - sha1 = "6c837d6225a7de5659323740b36d5361f71691ff"; + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz"; + sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96"; }; }; "circular-json-0.3.1" = { @@ -9287,13 +9413,13 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; - "fast-levenshtein-2.0.5" = { + "fast-levenshtein-2.0.6" = { name = "fast-levenshtein"; packageName = "fast-levenshtein"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz"; - sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2"; + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; "caller-path-0.1.0" = { @@ -9323,22 +9449,22 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.9.0" = { + "ajv-4.10.4" = { name = "ajv"; packageName = "ajv"; - version = "4.9.0"; + version = "4.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz"; - sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz"; + sha1 = "c0974dd00b3464984892d6010aa9c2c945933254"; }; }; - "ajv-keywords-1.1.1" = { + "ajv-keywords-1.5.0" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "1.1.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz"; - sha1 = "02550bc605a3e576041565628af972e06c549d50"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz"; + sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c"; }; }; "slice-ansi-0.0.4" = { @@ -9449,13 +9575,13 @@ let sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d"; }; }; - "prettyjson-1.2.0" = { + "prettyjson-1.2.1" = { name = "prettyjson"; packageName = "prettyjson"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz"; - sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf"; + url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz"; + sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289"; }; }; "shush-1.0.0" = { @@ -9593,13 +9719,13 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "fsevents-1.0.15" = { + "fsevents-1.0.17" = { name = "fsevents"; packageName = "fsevents"; - version = "1.0.15"; + version = "1.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz"; - sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz"; + sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558"; }; }; "micromatch-2.3.11" = { @@ -9665,13 +9791,13 @@ let sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; - "kind-of-3.0.4" = { + "kind-of-3.1.0" = { name = "kind-of"; packageName = "kind-of"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"; - sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74"; + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; + sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; }; }; "normalize-path-2.0.1" = { @@ -9773,13 +9899,13 @@ let sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; }; }; - "randomatic-1.1.5" = { + "randomatic-1.1.6" = { name = "randomatic"; packageName = "randomatic"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz"; - sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b"; + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz"; + sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"; }; }; "repeat-string-1.6.1" = { @@ -9863,13 +9989,13 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "binary-extensions-1.7.0" = { + "binary-extensions-1.8.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz"; - sha1 = "6c1610db163abfb34edfe42fa423343a1e01185d"; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz"; + sha1 = "48ec8d16df4377eae5fa5884682480af4d95c774"; }; }; "set-immediate-shim-1.0.1" = { @@ -9881,22 +10007,22 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; - "node-pre-gyp-0.6.31" = { + "node-pre-gyp-0.6.32" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.31"; + version = "0.6.32"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz"; - sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; + sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; }; }; - "npmlog-4.0.1" = { + "npmlog-4.0.2" = { name = "npmlog"; packageName = "npmlog"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz"; - sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz"; + sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f"; }; }; "tar-pack-3.3.0" = { @@ -9917,13 +10043,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "gauge-2.7.1" = { + "gauge-2.7.2" = { name = "gauge"; packageName = "gauge"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz"; - sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz"; + sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774"; }; }; "set-blocking-2.0.0" = { @@ -10080,13 +10206,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.11.1" = { + "coffee-script-1.12.2" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.11.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz"; - sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; + sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; }; }; "jade-1.11.0" = { @@ -10125,13 +10251,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.21" = { + "clean-css-3.4.24" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.21"; + version = "3.4.24"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz"; - sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.24.tgz"; + sha1 = "89f5a5e9da37ae02394fe049a41388abbe72c3b5"; }; }; "commander-2.6.0" = { @@ -10170,13 +10296,13 @@ let sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }; }; - "uglify-js-2.7.4" = { + "uglify-js-2.7.5" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.4"; + version = "2.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz"; - sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; + sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; }; }; "void-elements-2.0.1" = { @@ -10413,13 +10539,13 @@ let sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; }; }; - "gulp-util-3.0.7" = { + "gulp-util-3.0.8" = { name = "gulp-util"; packageName = "gulp-util"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz"; - sha1 = "78925c4b8f8b49005ac01a011c557e6218941cbb"; + url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"; + sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; "liftoff-2.3.0" = { @@ -10494,22 +10620,22 @@ let sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; - "dateformat-1.0.12" = { + "dateformat-2.0.0" = { name = "dateformat"; packageName = "dateformat"; - version = "1.0.12"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; - sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; + url = "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz"; + sha1 = "2743e3abb5c3fc2462e527dca445e04e9f4dee17"; }; }; - "fancy-log-1.2.0" = { + "fancy-log-1.3.0" = { name = "fancy-log"; packageName = "fancy-log"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz"; - sha1 = "d5a51b53e9ab22ca07d558f2b67ae55fdb5fcbd8"; + url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz"; + sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948"; }; }; "gulplog-1.0.0" = { @@ -10899,13 +11025,13 @@ let sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5"; }; }; - "is-unc-path-0.1.1" = { + "is-unc-path-0.1.2" = { name = "is-unc-path"; packageName = "is-unc-path"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.1.tgz"; - sha1 = "ab2533d77ad733561124c3dc0f5cd8b90054c86b"; + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz"; + sha1 = "6ab053a72573c10250ff416a3814c35178af39b9"; }; }; "unc-path-regex-0.1.2" = { @@ -11313,13 +11439,13 @@ let sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7"; }; }; - "supports-color-3.1.2" = { + "supports-color-3.2.3" = { name = "supports-color"; packageName = "supports-color"; - version = "3.1.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; - sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"; + sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; }; }; "estraverse-1.9.3" = { @@ -11367,22 +11493,22 @@ let sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; - "bluebird-3.4.6" = { + "bluebird-3.4.7" = { name = "bluebird"; packageName = "bluebird"; - version = "3.4.6"; + version = "3.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"; - sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz"; + sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; }; }; - "body-parser-1.15.2" = { + "body-parser-1.16.0" = { name = "body-parser"; packageName = "body-parser"; - version = "1.15.2"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz"; - sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz"; + sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b"; }; }; "combine-lists-1.0.1" = { @@ -11439,22 +11565,22 @@ let sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; }; }; - "http-proxy-1.15.2" = { + "http-proxy-1.16.2" = { name = "http-proxy"; packageName = "http-proxy"; - version = "1.15.2"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz"; - sha1 = "642fdcaffe52d3448d2bda3b0079e9409064da31"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz"; + sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; }; }; - "isbinaryfile-3.0.1" = { + "isbinaryfile-3.0.2" = { name = "isbinaryfile"; packageName = "isbinaryfile"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.1.tgz"; - sha1 = "6e99573675372e841a0520c036b41513d783e79e"; + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz"; + sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621"; }; }; "log4js-0.6.38" = { @@ -11475,13 +11601,13 @@ let sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; }; }; - "socket.io-1.4.7" = { + "socket.io-1.7.2" = { name = "socket.io"; packageName = "socket.io"; - version = "1.4.7"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz"; - sha1 = "92b7f7cb88c5797d4daee279fe8075dbe6d3fa1c"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz"; + sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71"; }; }; "tmp-0.0.28" = { @@ -11493,13 +11619,13 @@ let sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; }; }; - "useragent-2.1.9" = { + "useragent-2.1.11" = { name = "useragent"; packageName = "useragent"; - version = "2.1.9"; + version = "2.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz"; - sha1 = "4dba2bc4dad1875777ab15de3ff8098b475000b7"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz"; + sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29"; }; }; "bytes-2.4.0" = { @@ -11511,22 +11637,22 @@ let sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; }; }; - "iconv-lite-0.4.13" = { + "iconv-lite-0.4.15" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.4.13"; + version = "0.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; - sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; + sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; }; }; - "raw-body-2.1.7" = { + "raw-body-2.2.0" = { name = "raw-body"; packageName = "raw-body"; - version = "2.1.7"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; - sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz"; + sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; }; }; "custom-event-1.0.1" = { @@ -11610,40 +11736,22 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "engine.io-1.6.10" = { + "debug-2.3.3" = { + name = "debug"; + packageName = "debug"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; + }; + }; + "engine.io-1.8.2" = { name = "engine.io"; packageName = "engine.io"; - version = "1.6.10"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz"; - sha1 = "f87d84e1bd21d1a2ec7f8deef0c62054acdfb27a"; - }; - }; - "socket.io-parser-2.2.6" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz"; - sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99"; - }; - }; - "socket.io-client-1.4.6" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz"; - sha1 = "49b0ba537efd15b8297c84016e642e1c7c752c3d"; - }; - }; - "socket.io-adapter-0.4.0" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz"; - sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz"; + sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e"; }; }; "has-binary-0.1.7" = { @@ -11655,49 +11763,67 @@ let sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; }; }; - "base64id-0.1.0" = { + "object-assign-4.1.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; + sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + }; + }; + "socket.io-adapter-0.5.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; + sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; + }; + }; + "socket.io-client-1.7.2" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz"; + sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644"; + }; + }; + "socket.io-parser-2.3.1" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; + sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; + }; + }; + "base64id-1.0.0" = { name = "base64id"; packageName = "base64id"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; - sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; + url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz"; + sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; }; }; - "ws-1.0.1" = { - name = "ws"; - packageName = "ws"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz"; - sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9"; - }; - }; - "engine.io-parser-1.2.4" = { + "engine.io-parser-1.3.2" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "1.2.4"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz"; - sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42"; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz"; + sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; }; }; - "accepts-1.1.4" = { - name = "accepts"; - packageName = "accepts"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz"; - sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a"; - }; - }; - "after-0.8.1" = { + "after-0.8.2" = { name = "after"; packageName = "after"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz"; - sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; + url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; + sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; }; }; "arraybuffer.slice-0.0.6" = { @@ -11709,13 +11835,13 @@ let sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; }; }; - "base64-arraybuffer-0.1.2" = { + "base64-arraybuffer-0.1.5" = { name = "base64-arraybuffer"; packageName = "base64-arraybuffer"; - version = "0.1.2"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; - sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; + sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; }; }; "blob-0.0.4" = { @@ -11727,103 +11853,13 @@ let sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; }; }; - "has-binary-0.1.6" = { - name = "has-binary"; - packageName = "has-binary"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz"; - sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10"; - }; - }; - "utf8-2.1.0" = { - name = "utf8"; - packageName = "utf8"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz"; - sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5"; - }; - }; - "negotiator-0.4.9" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.4.9"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"; - sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f"; - }; - }; - "json3-3.3.2" = { - name = "json3"; - packageName = "json3"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; - }; - }; - "benchmark-1.0.0" = { - name = "benchmark"; - packageName = "benchmark"; + "wtf-8-1.0.0" = { + name = "wtf-8"; + packageName = "wtf-8"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"; - sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73"; - }; - }; - "engine.io-client-1.6.9" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz"; - sha1 = "1d6ad48048a5083c95096943b29d36efdb212401"; - }; - }; - "component-bind-1.0.0" = { - name = "component-bind"; - packageName = "component-bind"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; - sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; - }; - }; - "component-emitter-1.2.0" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz"; - sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe"; - }; - }; - "object-component-0.0.3" = { - name = "object-component"; - packageName = "object-component"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; - sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; - }; - }; - "parseuri-0.0.4" = { - name = "parseuri"; - packageName = "parseuri"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz"; - sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350"; - }; - }; - "to-array-0.1.4" = { - name = "to-array"; - packageName = "to-array"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; - sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; + url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; + sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; }; }; "backo2-1.0.2" = { @@ -11835,40 +11871,58 @@ let sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; }; }; - "has-cors-1.1.0" = { - name = "has-cors"; - packageName = "has-cors"; - version = "1.1.0"; + "component-bind-1.0.0" = { + name = "component-bind"; + packageName = "component-bind"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; + url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; + sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; }; }; - "xmlhttprequest-ssl-1.5.1" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.1"; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz"; - sha1 = "3b7741fea4a86675976e908d296d4445961faa67"; + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; }; }; - "parsejson-0.0.1" = { - name = "parsejson"; - packageName = "parsejson"; - version = "0.0.1"; + "engine.io-client-1.8.2" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; - sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz"; + sha1 = "c38767547f2a7d184f5752f6f0ad501006703766"; }; }; - "parseqs-0.0.2" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.2"; + "object-component-0.0.3" = { + name = "object-component"; + packageName = "object-component"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; - sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; + url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; + sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; + }; + }; + "parseuri-0.0.5" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; + sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; + }; + }; + "to-array-0.1.4" = { + name = "to-array"; + packageName = "to-array"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; + sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; }; }; "component-inherit-0.0.3" = { @@ -11880,6 +11934,42 @@ let sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; }; }; + "has-cors-1.1.0" = { + name = "has-cors"; + packageName = "has-cors"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; + sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; + }; + }; + "parsejson-0.0.3" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; + sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; + }; + }; + "parseqs-0.0.5" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + }; + }; + "xmlhttprequest-ssl-1.5.3" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; + sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; + }; + }; "yeast-0.1.2" = { name = "yeast"; packageName = "yeast"; @@ -11907,22 +11997,13 @@ let sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; }; }; - "socket.io-parser-2.2.2" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz"; - sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417"; - }; - }; - "json3-3.2.6" = { + "json3-3.3.2" = { name = "json3"; packageName = "json3"; - version = "3.2.6"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; - sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; + url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; + sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; }; }; "lru-cache-2.2.4" = { @@ -12222,6 +12303,24 @@ let sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; }; }; + "raw-body-2.1.7" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; + sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; + }; + }; + "iconv-lite-0.4.13" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; + sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; + }; + }; "csrf-3.0.4" = { name = "csrf"; packageName = "csrf"; @@ -12231,6 +12330,15 @@ let sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; }; }; + "base64-url-1.3.3" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; + sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; + }; + }; "rndm-1.2.0" = { name = "rndm"; packageName = "rndm"; @@ -12375,22 +12483,22 @@ let sha1 = "a7de988a211f9cf4687377130ea74df32730c918"; }; }; - "oauth-0.9.14" = { + "oauth-0.9.15" = { name = "oauth"; packageName = "oauth"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { - url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz"; - sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz"; + sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1"; }; }; - "passport-oauth2-1.3.0" = { + "passport-oauth2-1.4.0" = { name = "passport-oauth2"; packageName = "passport-oauth2"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz"; - sha1 = "d72b4bd62eeb807a4089ff3071a22c26c382dc0c"; + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz"; + sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad"; }; }; "uid2-0.0.3" = { @@ -12456,22 +12564,22 @@ let sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; }; }; - "lodash.isequal-4.4.0" = { + "lodash.isequal-4.5.0" = { name = "lodash.isequal"; packageName = "lodash.isequal"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.4.0.tgz"; - sha1 = "6295768e98e14dc15ce8d362ef6340db82852031"; + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; - "merge-stream-1.0.0" = { + "merge-stream-1.0.1" = { name = "merge-stream"; packageName = "merge-stream"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz"; - sha1 = "9cfd156fef35421e2b5403ce11dc6eb1962b026e"; + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz"; + sha1 = "4041202d508a342ba00174008df0c251b8c135e1"; }; }; "strip-bom-stream-1.0.0" = { @@ -12501,13 +12609,13 @@ let sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; }; }; - "glob-parent-3.0.1" = { + "glob-parent-3.1.0" = { name = "glob-parent"; packageName = "glob-parent"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.1.tgz"; - sha1 = "60021327cc963ddc3b5f085764f500479ecd82ff"; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; "ordered-read-streams-0.3.0" = { @@ -12555,13 +12663,13 @@ let sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; }; }; - "is-extglob-2.1.0" = { + "is-extglob-2.1.1" = { name = "is-extglob"; packageName = "is-extglob"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz"; - sha1 = "33411a482b046bf95e6b0cb27ee2711af4cf15ad"; + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; "extend-shallow-2.0.1" = { @@ -12717,15 +12825,6 @@ let sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9"; }; }; - "semver-5.0.3" = { - name = "semver"; - packageName = "semver"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; - }; - }; "npm-registry-client-7.1.2" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -12951,15 +13050,6 @@ let sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; }; }; - "after-0.8.2" = { - name = "after"; - packageName = "after"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; - sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; - }; - }; "yargs-1.3.3" = { name = "yargs"; packageName = "yargs"; @@ -13032,13 +13122,13 @@ let sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; }; }; - "wrap-ansi-2.0.0" = { + "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz"; - sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f"; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; }; }; "lcid-1.0.0" = { @@ -13167,13 +13257,22 @@ let sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; }; - "bcryptjs-2.3.0" = { + "bcryptjs-2.4.0" = { name = "bcryptjs"; packageName = "bcryptjs"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz"; - sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec"; + url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz"; + sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678"; + }; + }; + "body-parser-1.15.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz"; + sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; }; }; "cheerio-0.22.0" = { @@ -13185,15 +13284,6 @@ let sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; }; }; - "clone-2.0.0" = { - name = "clone"; - packageName = "clone"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.0.0.tgz"; - sha1 = "df65d3ca142e4a4a47db33da3468d088a16fc76e"; - }; - }; "cookie-parser-1.4.3" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -13203,31 +13293,31 @@ let sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; }; }; - "cron-1.1.1" = { + "cron-1.2.1" = { name = "cron"; packageName = "cron"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.1.1.tgz"; - sha1 = "02719d4ef480dfc8ee24d81a3603460ba39013ce"; + url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz"; + sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; }; }; - "follow-redirects-0.2.0" = { + "follow-redirects-1.2.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "0.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.2.0.tgz"; - sha1 = "e0229d7a388bb5ff7b29f44fc1e1b62e921272df"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz"; + sha1 = "796c716970df4fb0096165393545040f61b00f59"; }; }; - "fs-extra-0.30.0" = { + "fs-extra-1.0.0" = { name = "fs-extra"; packageName = "fs-extra"; - version = "0.30.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"; - sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; + sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; }; }; "fs.notify-0.0.4" = { @@ -13248,31 +13338,40 @@ let sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; }; }; - "mqtt-1.14.1" = { + "jsonata-1.0.10" = { + name = "jsonata"; + packageName = "jsonata"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz"; + sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96"; + }; + }; + "mqtt-2.2.1" = { name = "mqtt"; packageName = "mqtt"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-1.14.1.tgz"; - sha1 = "7e376987153d01793e946d26d46122ebf0c03554"; - }; - }; - "mustache-2.2.1" = { - name = "mustache"; - packageName = "mustache"; version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-2.2.1.tgz"; - sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876"; + url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz"; + sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852"; }; }; - "oauth2orize-1.5.0" = { + "mustache-2.3.0" = { + name = "mustache"; + packageName = "mustache"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz"; + sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0"; + }; + }; + "oauth2orize-1.7.0" = { name = "oauth2orize"; packageName = "oauth2orize"; - version = "1.5.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.5.0.tgz"; - sha1 = "e352ff4f1b5bf08f0ee94a09757f8f640eb8e0a6"; + url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz"; + sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc"; }; }; "passport-http-bearer-1.0.1" = { @@ -13293,22 +13392,13 @@ let sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba"; }; }; - "sentiment-1.0.6" = { + "sentiment-2.1.0" = { name = "sentiment"; packageName = "sentiment"; - version = "1.0.6"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sentiment/-/sentiment-1.0.6.tgz"; - sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1"; - }; - }; - "uglify-js-2.7.3" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz"; - sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868"; + url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz"; + sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; }; }; "when-3.7.7" = { @@ -13320,15 +13410,6 @@ let sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; }; }; - "ws-0.8.1" = { - name = "ws"; - packageName = "ws"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-0.8.1.tgz"; - sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759"; - }; - }; "node-red-node-feedparser-0.1.7" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; @@ -13338,13 +13419,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.12" = { + "node-red-node-email-0.1.15" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.12"; + version = "0.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz"; - sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz"; + sha1 = "7a528596d3b693a077b1ee293300299855537142"; }; }; "node-red-node-twitter-0.1.9" = { @@ -13365,22 +13446,13 @@ let sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539"; }; }; - "node-red-node-serialport-0.4.1" = { - name = "node-red-node-serialport"; - packageName = "node-red-node-serialport"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz"; - sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c"; - }; - }; - "bcrypt-0.8.7" = { + "bcrypt-1.0.2" = { name = "bcrypt"; packageName = "bcrypt"; - version = "0.8.7"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz"; - sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz"; + sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736"; }; }; "css-select-1.2.0" = { @@ -13527,13 +13599,13 @@ let sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "moment-timezone-0.5.9" = { + "moment-timezone-0.5.11" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.9"; + version = "0.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz"; - sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz"; + sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f"; }; }; "retry-0.6.1" = { @@ -13599,22 +13671,13 @@ let sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a"; }; }; - "mqtt-connection-2.1.1" = { - name = "mqtt-connection"; - packageName = "mqtt-connection"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-2.1.1.tgz"; - sha1 = "7b2e985a74e196619430bebd35da162c34c4e56a"; - }; - }; - "mqtt-packet-3.4.7" = { + "mqtt-packet-5.2.1" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "3.4.7"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.7.tgz"; - sha1 = "be8c267be7f0bf6a2a2d4f6de28307b6e0940e5f"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz"; + sha1 = "876e35ed616a8e348ac0283b4922039872458b58"; }; }; "reinterval-1.1.0" = { @@ -13626,15 +13689,6 @@ let sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; }; }; - "split2-2.1.0" = { - name = "split2"; - packageName = "split2"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-2.1.0.tgz"; - sha1 = "7382c148cb622c4b28af7c727f9673730b73f474"; - }; - }; "websocket-stream-3.3.3" = { name = "websocket-stream"; packageName = "websocket-stream"; @@ -13662,60 +13716,6 @@ let sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; }; }; - "reduplexer-1.1.0" = { - name = "reduplexer"; - packageName = "reduplexer"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/reduplexer/-/reduplexer-1.1.0.tgz"; - sha1 = "7dfed18a679e749c1d7ad36de01acb515f08e140"; - }; - }; - "lodash.assign-4.0.1" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.1.tgz"; - sha1 = "8e7ff0206897a99dca32fc8123309f5c4c2c731e"; - }; - }; - "lodash.keys-4.2.0" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz"; - sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"; - }; - }; - "lodash.rest-4.0.5" = { - name = "lodash.rest"; - packageName = "lodash.rest"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.5.tgz"; - sha1 = "954ef75049262038c96d1fc98b28fdaf9f0772aa"; - }; - }; - "bufferutil-1.2.1" = { - name = "bufferutil"; - packageName = "bufferutil"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz"; - sha1 = "37be5d36e1e06492221e68d474b1ac58e510cbd7"; - }; - }; - "utf-8-validate-1.2.1" = { - name = "utf-8-validate"; - packageName = "utf-8-validate"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz"; - sha1 = "44cb7c6eead73d6b40448f71f745904357b9f72c"; - }; - }; "feedparser-1.1.3" = { name = "feedparser"; packageName = "feedparser"; @@ -13779,13 +13779,13 @@ let sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3"; }; }; - "imap-0.8.18" = { + "imap-0.8.19" = { name = "imap"; packageName = "imap"; - version = "0.8.18"; + version = "0.8.19"; src = fetchurl { - url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz"; - sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f"; + url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz"; + sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5"; }; }; "libmime-1.2.0" = { @@ -13833,15 +13833,6 @@ let sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398"; }; }; - "iconv-lite-0.4.15" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; - sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; - }; - }; "libbase64-0.1.0" = { name = "libbase64"; packageName = "libbase64"; @@ -13950,58 +13941,13 @@ let sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; }; }; - "serialport-4.0.6" = { - name = "serialport"; - packageName = "serialport"; - version = "4.0.6"; + "oauth-0.9.14" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz"; - sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae"; - }; - }; - "lie-3.1.0" = { - name = "lie"; - packageName = "lie"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz"; - sha1 = "65e0139eaef9ae791a1f5c8c53692c8d3b4718f4"; - }; - }; - "object.assign-4.0.4" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz"; - sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc"; - }; - }; - "immediate-3.0.6" = { - name = "immediate"; - packageName = "immediate"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"; - sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; - }; - }; - "define-properties-1.1.2" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; - sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; - }; - }; - "nan-2.3.5" = { - name = "nan"; - packageName = "nan"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; - sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz"; + sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; }; }; "mongoose-3.6.7" = { @@ -14382,6 +14328,15 @@ let sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d"; }; }; + "base64id-0.1.0" = { + name = "base64id"; + packageName = "base64id"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; + sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; + }; + }; "redis-0.7.3" = { name = "redis"; packageName = "redis"; @@ -14463,13 +14418,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-3.12.0" = { + "mailcomposer-4.0.1" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "3.12.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz"; - sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; + sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; }; }; "simplesmtp-0.3.35" = { @@ -14481,22 +14436,22 @@ let sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; }; - "buildmail-3.10.0" = { + "buildmail-4.0.1" = { name = "buildmail"; packageName = "buildmail"; - version = "3.10.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz"; - sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz"; + sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72"; }; }; - "libmime-2.1.0" = { + "libmime-3.0.0" = { name = "libmime"; packageName = "libmime"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz"; - sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd"; + url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz"; + sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; }; }; "addressparser-1.0.1" = { @@ -14553,6 +14508,15 @@ let sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528"; }; }; + "nan-2.3.5" = { + name = "nan"; + packageName = "nan"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; + sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + }; + }; "argparse-0.1.16" = { name = "argparse"; packageName = "argparse"; @@ -14580,6 +14544,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "JSONStream-1.2.1" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; + sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; + }; + }; "fstream-npm-1.2.0" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -14643,6 +14616,15 @@ let sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; }; }; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + }; "npm-install-checks-3.0.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -14652,13 +14634,13 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "npm-registry-client-7.3.0" = { + "npm-registry-client-7.4.5" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.3.0"; + version = "7.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz"; - sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz"; + sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df"; }; }; "opener-1.4.2" = { @@ -14688,15 +14670,6 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; - "request-2.78.0" = { - name = "request"; - packageName = "request"; - version = "2.78.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; - sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; - }; - }; "sorted-union-stream-2.1.3" = { name = "sorted-union-stream"; packageName = "sorted-union-stream"; @@ -14715,6 +14688,15 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; + "write-file-atomic-1.2.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; + sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; + }; + }; "lodash._baseindexof-3.1.0" = { name = "lodash._baseindexof"; packageName = "lodash._baseindexof"; @@ -15057,13 +15039,13 @@ let sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d"; }; }; - "update-notifier-1.0.2" = { + "update-notifier-1.0.3" = { name = "update-notifier"; packageName = "update-notifier"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz"; - sha1 = "27c90519196dc15015be02a34ea52986feab8877"; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz"; + sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a"; }; }; "request-2.75.0" = { @@ -15210,6 +15192,15 @@ let sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; }; }; + "timed-out-3.1.3" = { + name = "timed-out"; + packageName = "timed-out"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; + sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; + }; + }; "unzip-response-1.0.2" = { name = "unzip-response"; packageName = "unzip-response"; @@ -15330,13 +15321,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.1.11" = { + "service-runner-2.1.13" = { name = "service-runner"; packageName = "service-runner"; - version = "2.1.11"; + version = "2.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz"; - sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz"; + sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb"; }; }; "simplediff-0.1.1" = { @@ -15366,13 +15357,13 @@ let sha1 = "07e30ad79531844179b642d2d8399435182c8727"; }; }; - "busboy-0.2.13" = { + "busboy-0.2.14" = { name = "busboy"; packageName = "busboy"; - version = "0.2.13"; + version = "0.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz"; - sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6"; + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; + sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; }; }; "dicer-0.2.5" = { @@ -15393,6 +15384,24 @@ let sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }; }; + "object.assign-4.0.4" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz"; + sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc"; + }; + }; + "define-properties-1.1.2" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; + sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; + }; + }; "gelfling-0.2.0" = { name = "gelfling"; packageName = "gelfling"; @@ -15691,13 +15700,13 @@ let sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; - "network-address-1.1.0" = { + "network-address-1.1.2" = { name = "network-address"; packageName = "network-address"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/network-address/-/network-address-1.1.0.tgz"; - sha1 = "74d577b0dea652284659079fc8d7010b72f01092"; + url = "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz"; + sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; "airplay-protocol-2.0.2" = { @@ -15817,13 +15826,13 @@ let sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; }; }; - "array-flatten-2.1.0" = { + "array-flatten-2.1.1" = { name = "array-flatten"; packageName = "array-flatten"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.0.tgz"; - sha1 = "26a692c83881fc68dac3ec5d1f0c1b49bf2304d9"; + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz"; + sha1 = "426bb9da84090c1838d812c8150af20a8331e296"; }; }; "dns-equal-1.0.0" = { @@ -15880,13 +15889,22 @@ let sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; }; }; - "run-async-2.2.0" = { + "mute-stream-0.0.6" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; + sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; + }; + }; + "run-async-2.3.0" = { name = "run-async"; packageName = "run-async"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz"; - sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9"; + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; "rx-4.1.0" = { @@ -15943,15 +15961,6 @@ let sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad"; }; }; - "socket.io-1.6.0" = { - name = "socket.io"; - packageName = "socket.io"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz"; - sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1"; - }; - }; "torrent-stream-0.18.1" = { name = "torrent-stream"; packageName = "torrent-stream"; @@ -16321,123 +16330,6 @@ let sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; }; }; - "engine.io-1.8.0" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz"; - sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa"; - }; - }; - "socket.io-adapter-0.5.0" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; - sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; - }; - }; - "socket.io-client-1.6.0" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz"; - sha1 = "5b668f4f771304dfeed179064708386fa6717853"; - }; - }; - "socket.io-parser-2.3.1" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; - sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; - }; - }; - "engine.io-parser-1.3.1" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz"; - sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf"; - }; - }; - "base64-arraybuffer-0.1.5" = { - name = "base64-arraybuffer"; - packageName = "base64-arraybuffer"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; - sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; - }; - }; - "wtf-8-1.0.0" = { - name = "wtf-8"; - packageName = "wtf-8"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; - sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; - }; - }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; - }; - }; - "engine.io-client-1.8.0" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz"; - sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c"; - }; - }; - "parseuri-0.0.5" = { - name = "parseuri"; - packageName = "parseuri"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; - sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; - }; - }; - "parsejson-0.0.3" = { - name = "parsejson"; - packageName = "parsejson"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; - sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; - }; - }; - "parseqs-0.0.5" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; - sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; - }; - }; - "xmlhttprequest-ssl-1.5.3" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; - sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; - }; - }; "bittorrent-dht-3.2.6" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; @@ -16717,31 +16609,31 @@ let sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"; }; }; - "recast-0.11.17" = { + "recast-0.11.20" = { name = "recast"; packageName = "recast"; - version = "0.11.17"; + version = "0.11.20"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz"; - sha1 = "67e829df49ef8ea822381cc516d305411e60bad8"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz"; + sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3"; }; }; - "ast-types-0.9.2" = { + "ast-types-0.9.4" = { name = "ast-types"; packageName = "ast-types"; - version = "0.9.2"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.2.tgz"; - sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz"; + sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b"; }; }; - "esprima-3.1.1" = { + "esprima-3.1.3" = { name = "esprima"; packageName = "esprima"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz"; - sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06"; + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; }; }; "base62-0.1.1" = { @@ -16927,11 +16819,11 @@ let "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = { name = "oauth"; packageName = "oauth"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { - name = "oauth-0.9.14.tar.gz"; + name = "oauth-0.9.15.tar.gz"; url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; - sha256 = "abd0d7be4fb10804e5a38ee66a4db5fc36d2ed045be52e7c8b7e19e4c9e16bd8"; + sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; "connect-2.3.9" = { @@ -17213,13 +17105,13 @@ let sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; }; }; - "sanitize-html-1.13.0" = { + "sanitize-html-1.14.1" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.13.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz"; - sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631"; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz"; + sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8"; }; }; "linkify-it-1.2.4" = { @@ -17366,6 +17258,15 @@ let sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2"; }; }; + "formidable-1.1.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; + sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -17438,13 +17339,13 @@ let sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; - "csv-parse-1.1.7" = { + "csv-parse-1.1.10" = { name = "csv-parse"; packageName = "csv-parse"; - version = "1.1.7"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.7.tgz"; - sha1 = "6e4678f7967013ac823929a4303a3ce177115abc"; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.10.tgz"; + sha1 = "767340d0d1f26d05434c798b7132222c669189de"; }; }; "stream-transform-0.1.1" = { @@ -17636,13 +17537,13 @@ let sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2"; }; }; - "clap-1.1.1" = { + "clap-1.1.2" = { name = "clap"; packageName = "clap"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz"; - sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d"; + url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz"; + sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed"; }; }; "async-2.1.2" = { @@ -17699,6 +17600,15 @@ let sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4"; }; }; + "request-2.78.0" = { + name = "request"; + packageName = "request"; + version = "2.78.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; + sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; + }; + }; "sprintf-0.1.5" = { name = "sprintf"; packageName = "sprintf"; @@ -17798,6 +17708,15 @@ let sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; }; }; + "xmldom-0.1.22" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.1.22"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz"; + sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; + }; + }; "qs-6.0.2" = { name = "qs"; packageName = "qs"; @@ -17807,31 +17726,22 @@ let sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; }; }; - "bluebird-3.3.5" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.3.5.tgz"; - sha1 = "5ee747f1c7bd967658b683936430aee753955a34"; - }; - }; - "blueimp-md5-2.3.1" = { + "blueimp-md5-2.6.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.3.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz"; - sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a"; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.6.0.tgz"; + sha1 = "c96dd67f57db522da9a0c49b464ca44e20c04e0f"; }; }; - "color-0.11.4" = { + "color-1.0.3" = { name = "color"; packageName = "color"; - version = "0.11.4"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz"; - sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764"; + url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz"; + sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d"; }; }; "crossroads-0.12.2" = { @@ -17843,31 +17753,22 @@ let sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2"; }; }; - "diff2html-1.2.0" = { + "diff2html-2.0.12" = { name = "diff2html"; packageName = "diff2html"; - version = "1.2.0"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-1.2.0.tgz"; - sha1 = "8b54af41c180befd9cb1caa130a3d76081ae4a07"; + url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.12.tgz"; + sha1 = "20eda2f1ffd14027716485c938e3fe21dc379455"; }; }; - "express-4.13.4" = { - name = "express"; - packageName = "express"; - version = "4.13.4"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.13.4.tgz"; - sha1 = "3c0b76f3c77590c8345739061ec0bd3ba067ec24"; - }; - }; - "express-session-1.13.0" = { + "express-session-1.14.2" = { name = "express-session"; packageName = "express-session"; - version = "1.13.0"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.13.0.tgz"; - sha1 = "8ac3b5c0188b48382851d88207b8e7746efb4011"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz"; + sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275"; }; }; "forever-monitor-1.1.0" = { @@ -17915,31 +17816,13 @@ let sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0"; }; }; - "lodash-4.12.0" = { - name = "lodash"; - packageName = "lodash"; - version = "4.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz"; - sha1 = "2bd6dc46a040f59e686c972ed21d93dc59053258"; - }; - }; - "moment-2.13.0" = { - name = "moment"; - packageName = "moment"; - version = "2.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz"; - sha1 = "24162d99521e6d40f99ae6939e806d2139eaac52"; - }; - }; - "npm-3.9.6" = { + "npm-4.1.2" = { name = "npm"; packageName = "npm"; - version = "3.9.6"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.9.6.tgz"; - sha1 = "0ef1d272a069ad95bdca8b2dfe6fcd82f4b461d7"; + url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz"; + sha1 = "daaa77d631947135b36528c304573243f5cd2e07"; }; }; "octicons-3.5.0" = { @@ -17960,13 +17843,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-0.11.0" = { + "raven-1.1.1" = { name = "raven"; packageName = "raven"; - version = "0.11.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-0.11.0.tgz"; - sha1 = "32981138a93e4c8ad08cfc17e46b85b453dc107b"; + url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz"; + sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42"; }; }; "signals-1.0.0" = { @@ -17987,49 +17870,40 @@ let sha1 = "e0767014167825957de7e125c29b0fa89796ea03"; }; }; - "socket.io-1.4.8" = { - name = "socket.io"; - packageName = "socket.io"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz"; - sha1 = "e576f330cd0bed64e55b3fd26df991141884867b"; - }; - }; - "winston-2.2.0" = { + "winston-2.3.1" = { name = "winston"; packageName = "winston"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.2.0.tgz"; - sha1 = "2c853dd87ab552a8e8485d72cbbf9a2286f029b7"; + url = "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz"; + sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "yargs-4.7.1" = { + "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; - version = "4.7.1"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-4.7.1.tgz"; - sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; - "color-convert-1.8.2" = { + "color-convert-1.9.0" = { name = "color-convert"; packageName = "color-convert"; - version = "1.8.2"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz"; - sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; + sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; }; }; - "color-string-0.3.0" = { + "color-string-1.4.0" = { name = "color-string"; packageName = "color-string"; - version = "0.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz"; - sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991"; + url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz"; + sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898"; }; }; "color-name-1.1.1" = { @@ -18041,58 +17915,58 @@ let sha1 = "4b1415304cf50028ea81643643bd82ea05803689"; }; }; - "diff-2.2.3" = { + "simple-swizzle-0.2.2" = { + name = "simple-swizzle"; + packageName = "simple-swizzle"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + }; + }; + "is-arrayish-0.3.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz"; + sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; + }; + }; + "diff-3.2.0" = { name = "diff"; packageName = "diff"; - version = "2.2.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz"; - sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; + url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; + sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; }; }; - "cookie-0.1.5" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.5"; + "hogan.js-3.0.2" = { + name = "hogan.js"; + packageName = "hogan.js"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.5.tgz"; - sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c"; + url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz"; + sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; }; }; - "finalhandler-0.4.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.4.1"; + "whatwg-fetch-2.0.2" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; - sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz"; + sha1 = "fe294d1d89e36c5be8b3195057f2e4bc74fc980e"; }; }; - "send-0.13.1" = { - name = "send"; - packageName = "send"; - version = "0.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.13.1.tgz"; - sha1 = "a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7"; - }; - }; - "cookie-0.2.3" = { - name = "cookie"; - packageName = "cookie"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.2.3.tgz"; - sha1 = "1a59536af68537a21178a01346f87cb059d2ae5c"; - }; - }; - "crc-3.4.0" = { + "crc-3.4.1" = { name = "crc"; packageName = "crc"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz"; - sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz"; + sha1 = "65d5830b1a2569557cfb324c0e679998521473ee"; }; }; "broadway-0.2.10" = { @@ -18203,13 +18077,13 @@ let sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b"; }; }; - "typechecker-4.4.0" = { + "typechecker-4.4.1" = { name = "typechecker"; packageName = "typechecker"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz"; - sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc"; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz"; + sha1 = "f97b95f51b038417212d677d45a373ee7bced7e6"; }; }; "underscore-1.5.2" = { @@ -18221,103 +18095,13 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "lodash.clonedeep-4.3.2" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; - sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; - }; - }; - "lodash.union-4.4.0" = { - name = "lodash.union"; - packageName = "lodash.union"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; - sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; - }; - }; - "lodash.uniq-4.3.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; - sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; - }; - }; - "lodash.without-4.2.0" = { - name = "lodash.without"; - packageName = "lodash.without"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; - sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; - }; - }; - "node-gyp-3.3.1" = { + "node-gyp-3.5.0" = { name = "node-gyp"; packageName = "node-gyp"; - version = "3.3.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz"; - sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0"; - }; - }; - "request-2.72.0" = { - name = "request"; - packageName = "request"; - version = "2.72.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz"; - sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1"; - }; - }; - "retry-0.9.0" = { - name = "retry"; - packageName = "retry"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; - sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; - }; - }; - "lodash._baseclone-4.5.7" = { - name = "lodash._baseclone"; - packageName = "lodash._baseclone"; - version = "4.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; - sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; - }; - }; - "lodash._baseflatten-4.2.1" = { - name = "lodash._baseflatten"; - packageName = "lodash._baseflatten"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; - sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; - }; - }; - "lodash._basedifference-4.5.0" = { - name = "lodash._basedifference"; - packageName = "lodash._basedifference"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; - sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; - }; - }; - "qs-6.1.0" = { - name = "qs"; - packageName = "qs"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"; - sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26"; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; + sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; }; }; "lsmod-1.0.0" = { @@ -18329,13 +18113,13 @@ let sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b"; }; }; - "stack-trace-0.0.7" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.7"; + "uuid-3.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz"; - sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; + sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; "eve-0.4.2" = { @@ -18347,67 +18131,13 @@ let sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; }; }; - "engine.io-1.6.11" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.6.11"; + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.11.tgz"; - sha1 = "2533a97a65876c40ffcf95397b7ef9b495c423fe"; - }; - }; - "socket.io-client-1.4.8" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.8.tgz"; - sha1 = "481b241e73df140ea1a4fb03486a85ad097f5558"; - }; - }; - "ws-1.1.0" = { - name = "ws"; - packageName = "ws"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.0.tgz"; - sha1 = "c1d6fd1515d3ceff1f0ae2759bf5fd77030aad1d"; - }; - }; - "engine.io-client-1.6.11" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.6.11"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.11.tgz"; - sha1 = "7d250d8fa1c218119ecde51390458a57d5171376"; - }; - }; - "pkg-conf-1.1.3" = { - name = "pkg-conf"; - packageName = "pkg-conf"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-1.1.3.tgz"; - sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; - }; - }; - "set-blocking-1.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-1.0.0.tgz"; - sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5"; - }; - }; - "symbol-0.2.3" = { - name = "symbol"; - packageName = "symbol"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol/-/symbol-0.2.3.tgz"; - sha1 = "3b9873b8a901e47c6efe21526a3ac372ef28bbc7"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; }; }; "kew-0.1.7" = { @@ -18491,13 +18221,13 @@ let sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; }; }; - "node-libs-browser-0.6.0" = { + "node-libs-browser-0.7.0" = { name = "node-libs-browser"; packageName = "node-libs-browser"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.6.0.tgz"; - sha1 = "244806d44d319e048bc8607b5cc4eaf9a29d2e3c"; + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz"; + sha1 = "3e272c0819e308935e26674408d7af0e1491b83b"; }; }; "tapable-0.1.10" = { @@ -18518,13 +18248,13 @@ let sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b"; }; }; - "webpack-core-0.6.8" = { + "webpack-core-0.6.9" = { name = "webpack-core"; packageName = "webpack-core"; - version = "0.6.8"; + version = "0.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz"; - sha1 = "edf9135de00a6a3c26dd0f14b208af0aa4af8d0a"; + url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz"; + sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; }; }; "memory-fs-0.2.0" = { @@ -18554,76 +18284,40 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "json5-0.5.0" = { + "json5-0.5.1" = { name = "json5"; packageName = "json5"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz"; - sha1 = "9b20715b026cbe3778fd769edccd822d8332a5b2"; + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; - "assert-1.4.1" = { - name = "assert"; - packageName = "assert"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; - }; - }; - "constants-browserify-0.0.1" = { - name = "constants-browserify"; - packageName = "constants-browserify"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"; - sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2"; - }; - }; - "crypto-browserify-3.2.8" = { + "crypto-browserify-3.3.0" = { name = "crypto-browserify"; packageName = "crypto-browserify"; - version = "3.2.8"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz"; - sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189"; + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz"; + sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"; }; }; - "http-browserify-1.7.0" = { - name = "http-browserify"; - packageName = "http-browserify"; - version = "1.7.0"; + "os-browserify-0.2.1" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz"; - sha1 = "33795ade72df88acfbfd36773cefeda764735b20"; + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz"; + sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"; }; }; - "https-browserify-0.0.0" = { - name = "https-browserify"; - packageName = "https-browserify"; - version = "0.0.0"; + "timers-browserify-2.0.2" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"; - sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd"; - }; - }; - "stream-browserify-1.0.0" = { - name = "stream-browserify"; - packageName = "stream-browserify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"; - sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193"; - }; - }; - "url-0.10.3" = { - name = "url"; - packageName = "url"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz"; - sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz"; + sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86"; }; }; "pbkdf2-compat-2.0.1" = { @@ -18653,40 +18347,49 @@ let sha1 = "17ddeddc5f722fb66501658895461977867315ba"; }; }; - "Base64-0.2.1" = { - name = "Base64"; - packageName = "Base64"; - version = "0.2.1"; + "browserify-aes-0.4.0" = { + name = "browserify-aes"; + packageName = "browserify-aes"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"; - sha1 = "ba3a4230708e186705065e66babdd4c35cf60028"; + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz"; + sha1 = "067149b668df31c4b58533e02d01e806d8608e2c"; }; }; - "source-list-map-0.1.6" = { + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + }; + "source-list-map-0.1.8" = { name = "source-list-map"; packageName = "source-list-map"; - version = "0.1.6"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz"; - sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f"; + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz"; + sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106"; }; }; - "babel-runtime-6.18.0" = { + "babel-runtime-6.22.0" = { name = "babel-runtime"; packageName = "babel-runtime"; - version = "6.18.0"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz"; - sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078"; + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz"; + sha1 = "1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"; }; }; - "death-1.0.0" = { + "death-1.1.0" = { name = "death"; packageName = "death"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz"; - sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de"; + url = "https://registry.npmjs.org/death/-/death-1.1.0.tgz"; + sha1 = "01aa9c401edd92750514470b8266390c66c67318"; }; }; "detect-indent-4.0.0" = { @@ -18698,6 +18401,15 @@ let sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; }; }; + "diff-2.2.3" = { + name = "diff"; + packageName = "diff"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz"; + sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; + }; + }; "invariant-2.2.2" = { name = "invariant"; packageName = "invariant"; @@ -18725,13 +18437,13 @@ let sha1 = "74c45744439550da185801912829f61d22071bc1"; }; }; - "node-emoji-1.4.1" = { + "node-emoji-1.5.1" = { name = "node-emoji"; packageName = "node-emoji"; - version = "1.4.1"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz"; - sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc"; + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.5.1.tgz"; + sha1 = "fd918e412769bf8c448051238233840b2aff16a1"; }; }; "object-path-0.11.3" = { @@ -18743,13 +18455,13 @@ let sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554"; }; }; - "proper-lockfile-1.2.0" = { + "proper-lockfile-2.0.0" = { name = "proper-lockfile"; packageName = "proper-lockfile"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz"; - sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34"; + url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.0.tgz"; + sha1 = "b21f5e79bcbb6b4e23eeeced15cfc7f63e8a2e55"; }; }; "request-capture-har-1.1.4" = { @@ -18770,22 +18482,22 @@ let sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e"; }; }; - "regenerator-runtime-0.9.6" = { + "regenerator-runtime-0.10.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.9.6"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz"; - sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz"; + sha1 = "257f41961ce44558b18f7814af48c17559f9faeb"; }; }; - "loose-envify-1.3.0" = { + "loose-envify-1.3.1" = { name = "loose-envify"; packageName = "loose-envify"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz"; - sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8"; + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; + sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; }; }; "ci-info-1.0.0" = { @@ -18806,25 +18518,16 @@ let sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; }; }; - "err-code-1.1.1" = { - name = "err-code"; - packageName = "err-code"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz"; - sha1 = "739d71b6851f24d050ea18c79a5b722420771d59"; - }; - }; }; in { alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.4.tgz"; - sha1 = "8f85b28758ed0e7a251a635cd2e6a73ce92e9dde"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz"; + sha1 = "78be031931f4b9012f6085e1544069c56dcba233"; }; dependencies = [ sources."colors-0.6.0-1" @@ -18866,21 +18569,20 @@ in sources."uglify-to-browserify-1.0.2" ]; }) - sources."resolve-1.1.7" + sources."resolve-1.2.0" (sources."global-paths-0.1.2" // { dependencies = [ sources."array-unique-0.2.1" (sources."global-modules-0.2.3" // { dependencies = [ - (sources."global-prefix-0.1.4" // { + (sources."global-prefix-0.1.5" // { dependencies = [ - sources."ini-1.3.4" - (sources."osenv-0.1.3" // { + (sources."homedir-polyfill-1.0.1" // { dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" + sources."parse-passwd-1.0.0" ]; }) + sources."ini-1.3.4" (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" @@ -18926,10 +18628,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.7"; + version = "0.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz"; - sha1 = "48e59f6be202122c0d71153efab4f924065da586"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz"; + sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -18938,21 +18640,17 @@ in (sources."jws-3.1.4" // { dependencies = [ sources."base64url-2.0.0" - (sources."jwa-1.1.4" // { + (sources."jwa-1.1.5" // { dependencies = [ sources."buffer-equal-constant-time-1.0.1" - (sources."ecdsa-sig-formatter-1.0.7" // { - dependencies = [ - sources."base64-url-1.3.3" - ]; - }) + sources."ecdsa-sig-formatter-1.0.9" ]; }) sources."safe-buffer-5.0.1" ]; }) sources."node-uuid-1.4.7" - sources."xmldom-0.1.22" + sources."xmldom-0.1.27" sources."xpath.js-1.0.7" ]; }) @@ -18971,9 +18669,11 @@ in ]; }) sources."azure-arm-authorization-2.0.0" - sources."azure-arm-cdn-0.2.1" + sources."azure-arm-cdn-1.0.0" sources."azure-arm-commerce-0.2.0" - sources."azure-arm-compute-0.19.0" + sources."azure-arm-compute-0.19.1" + sources."azure-arm-datalake-analytics-1.0.1-preview" + sources."azure-arm-datalake-store-1.0.1-preview" sources."azure-arm-hdinsight-0.2.2" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" @@ -18985,8 +18685,6 @@ in sources."azure-arm-dns-0.11.1" sources."azure-arm-website-0.11.4" sources."azure-arm-rediscache-0.2.1" - sources."azure-arm-datalake-analytics-0.4.3" - sources."azure-arm-datalake-store-0.4.2" sources."azure-arm-devtestlabs-0.1.0" sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" @@ -19001,7 +18699,7 @@ in ]; }) sources."azure-asm-network-0.13.0" - sources."azure-arm-resource-1.4.5-preview" + sources."azure-arm-resource-1.6.1-preview" sources."azure-arm-storage-0.13.1-preview" sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" @@ -19043,7 +18741,7 @@ in sources."azure-arm-batch-0.3.0" sources."azure-batch-0.5.2" sources."azure-servicefabric-0.1.4" - sources."applicationinsights-0.15.12" + sources."applicationinsights-0.16.0" (sources."caller-id-0.1.0" // { dependencies = [ sources."stack-trace-0.0.9" @@ -19099,7 +18797,7 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.17.0" + sources."moment-2.17.1" (sources."ms-rest-1.15.2" // { dependencies = [ sources."duplexer-0.1.1" @@ -19113,7 +18811,6 @@ in ]; }) sources."node-forge-0.6.23" - sources."node-uuid-1.2.0" sources."omelette-0.1.0" (sources."openssl-wrapper-0.2.1" // { dependencies = [ @@ -19220,7 +18917,7 @@ in dependencies = [ (sources."async-2.1.4" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) ]; @@ -19233,12 +18930,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -19257,7 +18954,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -19286,14 +18983,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -19304,9 +19001,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."node-uuid-1.4.7" @@ -19341,12 +19038,13 @@ in sources."streamline-streams-0.1.5" (sources."sync-request-3.0.0" // { dependencies = [ - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -19379,6 +19077,7 @@ in sources."os-homedir-1.0.2" ]; }) + sources."uuid-3.0.1" sources."validator-5.2.0" (sources."winston-2.1.1" // { dependencies = [ @@ -19399,7 +19098,7 @@ in sources."xmlbuilder-0.4.3" (sources."read-1.0.7" // { dependencies = [ - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" ]; }) ]; @@ -19524,7 +19223,7 @@ in sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" ]; }) sources."map-obj-1.0.1" @@ -19549,7 +19248,7 @@ in }) ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" (sources."read-pkg-up-1.0.1" // { dependencies = [ (sources."find-up-1.1.2" // { @@ -19691,7 +19390,7 @@ in (sources."promised-temp-0.1.0" // { dependencies = [ sources."q-1.4.1" - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -19748,19 +19447,19 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "13.1.1"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.1.1.tgz"; - sha1 = "72a2310e2f706ed87db929cf0ee73a5e195d9bb0"; + url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; + sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; }; dependencies = [ - (sources."JSONStream-1.2.1" // { + (sources."JSONStream-1.3.0" // { dependencies = [ - sources."jsonparse-1.2.0" + sources."jsonparse-1.3.0" sources."through-2.3.8" ]; }) - sources."assert-1.3.0" + sources."assert-1.4.1" (sources."browser-pack-6.0.2" // { dependencies = [ (sources."combine-source-map-0.7.2" // { @@ -19774,7 +19473,11 @@ in sources."umd-3.0.1" ]; }) - sources."browser-resolve-1.11.2" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) (sources."browserify-zlib-0.1.4" // { dependencies = [ sources."pako-0.2.9" @@ -19842,7 +19545,7 @@ in }) (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.9.0" // { + (sources."asn1.js-4.9.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -19894,7 +19597,7 @@ in sources."browserify-rsa-4.0.1" (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.9.0" // { + (sources."asn1.js-4.9.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -19918,8 +19621,9 @@ in sources."domain-browser-1.1.7" sources."duplexer2-0.1.4" sources."events-1.1.1" - (sources."glob-5.0.15" // { + (sources."glob-7.1.1" // { dependencies = [ + sources."fs.realpath-1.0.0" (sources."inflight-1.0.6" // { dependencies = [ sources."wrappy-1.0.2" @@ -20009,7 +19713,7 @@ in sources."util-deprecate-1.0.2" ]; }) - sources."resolve-1.1.7" + sources."resolve-1.2.0" (sources."shasum-1.0.2" // { dependencies = [ (sources."json-stable-stringify-0.0.1" // { @@ -20029,9 +19733,9 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.5.0" // { + (sources."stream-http-2.6.3" // { dependencies = [ - sources."builtin-status-codes-2.0.0" + sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" ]; }) @@ -20046,18 +19750,7 @@ in sources."acorn-2.7.0" ]; }) - (sources."through2-2.0.1" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."tty-browserify-0.0.0" (sources."url-0.11.0" // { @@ -20096,7 +19789,7 @@ in }; dependencies = [ sources."array-loop-1.0.0" - (sources."castv2-client-1.1.2" // { + (sources."castv2-client-1.2.0" // { dependencies = [ (sources."castv2-0.1.9" // { dependencies = [ @@ -20165,7 +19858,7 @@ in ]; }) sources."debounced-seeker-1.0.0" - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -20193,7 +19886,7 @@ in sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" ]; }) sources."map-obj-1.0.1" @@ -20218,7 +19911,7 @@ in }) ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" (sources."read-pkg-up-1.0.1" // { dependencies = [ (sources."find-up-1.1.2" // { @@ -20307,7 +20000,7 @@ in dependencies = [ (sources."airplay-js-0.2.16" // { dependencies = [ - (sources."mdns-js-0.5.1" // { + (sources."mdns-js-0.5.3" // { dependencies = [ (sources."dns-js-0.2.1" // { dependencies = [ @@ -20321,7 +20014,7 @@ in dependencies = [ sources."base64-js-1.1.2" sources."xmlbuilder-8.2.2" - sources."xmldom-0.1.22" + sources."xmldom-0.1.27" ]; }) ]; @@ -20334,7 +20027,7 @@ in (sources."figures-1.7.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" ]; }) sources."lodash-3.10.1" @@ -20349,7 +20042,7 @@ in ]; }) sources."network-address-0.0.5" - sources."numeral-1.5.5" + sources."numeral-1.5.6" sources."open-0.0.5" (sources."optimist-0.6.1" // { dependencies = [ @@ -20367,18 +20060,18 @@ in sources."uniq-1.0.1" ]; }) - (sources."parse-torrent-file-4.0.0" // { + (sources."parse-torrent-file-4.0.1" // { dependencies = [ - sources."bencode-0.10.0" - (sources."simple-sha1-2.0.8" // { + sources."bencode-0.11.0" + (sources."simple-sha1-2.1.0" // { dependencies = [ - sources."rusha-0.8.4" + sources."rusha-0.8.5" ]; }) sources."uniq-1.0.1" ]; }) - (sources."simple-get-2.3.0" // { + (sources."simple-get-2.4.0" // { dependencies = [ (sources."once-1.4.0" // { dependencies = [ @@ -20433,7 +20126,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."random-access-file-1.3.1" // { + (sources."random-access-file-1.4.0" // { dependencies = [ sources."inherits-2.0.3" ]; @@ -20462,9 +20155,9 @@ in (sources."parse-torrent-file-2.1.4" // { dependencies = [ sources."bencode-0.7.0" - (sources."simple-sha1-2.0.8" // { + (sources."simple-sha1-2.1.0" // { dependencies = [ - sources."rusha-0.8.4" + sources."rusha-0.8.5" ]; }) ]; @@ -20550,9 +20243,9 @@ in sources."randombytes-2.0.3" ]; }) - (sources."k-rpc-socket-1.6.0" // { + (sources."k-rpc-socket-1.6.1" // { dependencies = [ - sources."bencode-0.10.0" + sources."bencode-0.11.0" ]; }) ]; @@ -20577,13 +20270,13 @@ in }) sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-get-2.3.0" // { + (sources."simple-get-2.4.0" // { dependencies = [ sources."simple-concat-1.0.0" sources."unzip-response-2.0.1" ]; }) - (sources."simple-peer-6.0.7" // { + (sources."simple-peer-6.2.1" // { dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" @@ -20599,7 +20292,7 @@ in }) ]; }) - (sources."simple-websocket-4.1.0" // { + (sources."simple-websocket-4.2.0" // { dependencies = [ (sources."readable-stream-2.2.2" // { dependencies = [ @@ -20682,9 +20375,9 @@ in (sources."parse-torrent-file-2.1.4" // { dependencies = [ sources."bencode-0.7.0" - (sources."simple-sha1-2.0.8" // { + (sources."simple-sha1-2.1.0" // { dependencies = [ - sources."rusha-0.8.4" + sources."rusha-0.8.5" ]; }) ]; @@ -20730,12 +20423,13 @@ in (sources."codepage-1.4.0" // { dependencies = [ sources."voc-0.5.0" - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -20745,7 +20439,7 @@ in }) ]; }) - sources."exit-on-epipe-0.1.0" + sources."exit-on-epipe-1.0.0" (sources."commander-2.9.0" // { dependencies = [ sources."graceful-readlink-1.0.1" @@ -20762,7 +20456,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) ]; @@ -20780,10 +20474,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.11.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz"; - sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; + sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; }; buildInputs = globalBuildInputs; meta = { @@ -20842,7 +20536,7 @@ in }) ]; }) - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -20856,7 +20550,7 @@ in sources."lodash-3.10.1" ]; }) - sources."xmldom-0.1.22" + sources."xmldom-0.1.27" sources."util-deprecate-1.0.2" ]; }) @@ -20891,7 +20585,7 @@ in sources."dependency-ls-1.0.0" sources."is-url-1.2.2" sources."q-1.4.1" - (sources."shelljs-0.7.5" // { + (sources."shelljs-0.7.6" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -20923,7 +20617,7 @@ in sources."interpret-1.0.1" (sources."rechoir-0.6.2" // { dependencies = [ - sources."resolve-1.1.7" + sources."resolve-1.2.0" ]; }) ]; @@ -20939,9 +20633,9 @@ in dependencies = [ (sources."browserify-13.1.0" // { dependencies = [ - (sources."JSONStream-1.2.1" // { + (sources."JSONStream-1.3.0" // { dependencies = [ - sources."jsonparse-1.2.0" + sources."jsonparse-1.3.0" sources."through-2.3.8" ]; }) @@ -20959,7 +20653,11 @@ in sources."umd-3.0.1" ]; }) - sources."browser-resolve-1.11.2" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) (sources."browserify-zlib-0.1.4" // { dependencies = [ sources."pako-0.2.9" @@ -21026,7 +20724,7 @@ in }) (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.9.0" // { + (sources."asn1.js-4.9.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -21078,7 +20776,7 @@ in sources."browserify-rsa-4.0.1" (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.9.0" // { + (sources."asn1.js-4.9.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -21169,7 +20867,7 @@ in sources."util-deprecate-1.0.2" ]; }) - sources."resolve-1.1.7" + sources."resolve-1.2.0" (sources."shasum-1.0.2" // { dependencies = [ (sources."json-stable-stringify-0.0.1" // { @@ -21189,9 +20887,9 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.5.0" // { + (sources."stream-http-2.6.3" // { dependencies = [ - sources."builtin-status-codes-2.0.0" + sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" ]; }) @@ -21206,18 +20904,7 @@ in sources."acorn-2.7.0" ]; }) - (sources."through2-2.0.1" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."tty-browserify-0.0.0" (sources."url-0.11.0" // { @@ -21242,7 +20929,7 @@ in ]; }) sources."cordova-registry-mapper-1.1.15" - (sources."cordova-serve-1.0.0" // { + (sources."cordova-serve-1.0.1" // { dependencies = [ (sources."chalk-1.1.3" // { dependencies = [ @@ -21250,12 +20937,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -21265,9 +20952,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.6.1" @@ -21276,7 +20963,7 @@ in sources."bytes-2.3.0" (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) (sources."debug-2.2.0" // { @@ -21292,9 +20979,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.6.1" @@ -21330,10 +21017,10 @@ in }) sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - (sources."proxy-addr-1.1.2" // { + (sources."proxy-addr-1.1.3" // { dependencies = [ sources."forwarded-0.1.0" - sources."ipaddr.js-1.1.1" + sources."ipaddr.js-1.2.0" ]; }) sources."qs-6.2.0" @@ -21356,9 +21043,9 @@ in (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -21443,7 +21130,7 @@ in sources."promzard-0.3.0" (sources."read-1.0.7" // { dependencies = [ - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" ]; }) (sources."read-package-json-2.0.4" // { @@ -21550,8 +21237,8 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - sources."lockfile-1.0.2" - (sources."lru-cache-4.0.1" // { + sources."lockfile-1.0.3" + (sources."lru-cache-4.0.2" // { dependencies = [ sources."pseudomap-1.0.2" sources."yallist-2.0.0" @@ -21578,7 +21265,7 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -21614,11 +21301,12 @@ in sources."npm-package-arg-4.1.1" (sources."npm-registry-client-7.2.1" // { dependencies = [ - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -21649,7 +21337,7 @@ in ]; }) sources."once-1.4.0" - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -21658,7 +21346,7 @@ in sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" ]; }) (sources."read-installed-4.0.3" // { @@ -21722,7 +21410,7 @@ in dependencies = [ (sources."async-2.1.4" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) ]; @@ -21750,7 +21438,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -21779,14 +21467,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -21797,9 +21485,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."node-uuid-1.4.7" @@ -21814,7 +21502,7 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.10.0" + sources."retry-0.10.1" sources."rimraf-2.5.4" sources."semver-5.1.1" sources."sha-2.0.1" @@ -21844,7 +21532,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-1.1.4" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."imurmurhash-0.1.4" ]; }) @@ -21857,7 +21545,7 @@ in sources."lodash-3.10.1" ]; }) - sources."xmldom-0.1.22" + sources."xmldom-0.1.27" sources."util-deprecate-1.0.2" ]; }) @@ -21987,7 +21675,7 @@ in }) ]; }) - (sources."insight-0.8.3" // { + (sources."insight-0.8.4" // { dependencies = [ sources."async-1.5.2" (sources."chalk-1.1.3" // { @@ -21996,12 +21684,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -22016,13 +21704,13 @@ in ]; }) sources."os-tmpdir-1.0.2" - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" ]; }) sources."uuid-2.0.3" - (sources."write-file-atomic-1.2.0" // { + (sources."write-file-atomic-1.3.1" // { dependencies = [ sources."imurmurhash-0.1.4" sources."slide-1.1.6" @@ -22038,7 +21726,7 @@ in (sources."inquirer-0.10.1" // { dependencies = [ sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" (sources."cli-cursor-1.0.2" // { dependencies = [ (sources."restore-cursor-1.0.1" // { @@ -22086,8 +21774,7 @@ in sources."lodash._getnative-3.9.1" ]; }) - sources."node-uuid-1.4.7" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" (sources."os-name-1.0.3" // { dependencies = [ (sources."osx-release-1.1.0" // { @@ -22134,7 +21821,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -22163,14 +21850,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -22181,16 +21868,15 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" ]; }) (sources."tough-cookie-2.3.2" // { @@ -22198,6 +21884,7 @@ in sources."punycode-1.4.1" ]; }) + sources."uuid-3.0.1" ]; }) (sources."nopt-3.0.1" // { @@ -22215,12 +21902,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -22234,15 +21921,15 @@ in sources."minimist-0.0.8" ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" sources."os-tmpdir-1.0.2" - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" ]; }) sources."uuid-2.0.3" - (sources."write-file-atomic-1.2.0" // { + (sources."write-file-atomic-1.3.1" // { dependencies = [ sources."imurmurhash-0.1.4" sources."slide-1.1.6" @@ -22355,7 +22042,7 @@ in dependencies = [ (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) ]; @@ -22373,14 +22060,14 @@ in csslint = nodeEnv.buildNodePackage { name = "csslint"; packageName = "csslint"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/csslint-1.0.4.tgz"; - sha1 = "0d3907933cc3f04b56960496d573387fbe9bb1e7"; + url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz"; + sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9"; }; dependencies = [ - sources."clone-1.0.2" - sources."parserlib-1.0.0" + sources."clone-2.1.0" + sources."parserlib-1.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -22416,9 +22103,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.5.3" @@ -22483,7 +22170,7 @@ in (sources."hiredis-0.4.1" // { dependencies = [ sources."bindings-1.2.1" - sources."nan-2.4.0" + sources."nan-2.5.0" ]; }) (sources."json-rpc2-0.8.1" // { @@ -22602,7 +22289,7 @@ in sources."component-emitter-1.1.2" sources."methods-1.0.1" sources."cookiejar-2.0.1" - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -22824,12 +22511,29 @@ in sources."minimist-0.0.8" ]; }) - (sources."ndjson-1.4.3" // { + (sources."ndjson-1.5.0" // { dependencies = [ + sources."json-stringify-safe-5.0.1" sources."minimist-1.2.0" + sources."split2-2.1.1" + (sources."through2-2.0.3" // { + dependencies = [ + (sources."readable-stream-2.2.2" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."inherits-2.0.3" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) ]; }) - (sources."pump-1.0.1" // { + (sources."pump-1.0.2" // { dependencies = [ (sources."once-1.4.0" // { dependencies = [ @@ -22899,20 +22603,7 @@ in }) (sources."tar-stream-1.5.2" // { dependencies = [ - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."bl-1.2.0" (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -22952,24 +22643,25 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "2.4.2"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-2.4.2.tgz"; - sha1 = "757c98aea05ee8714f0de2a33224c4136414633e"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz"; + sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4"; }; dependencies = [ - (sources."JSONStream-1.1.4" // { + (sources."JSONStream-1.3.0" // { dependencies = [ - sources."jsonparse-1.2.0" + sources."jsonparse-1.3.0" sources."through-2.3.8" ]; }) - (sources."async-2.0.1" // { + (sources."async-2.1.4" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) sources."aws4-1.5.0" + sources."awscred-1.2.0" (sources."optimist-0.6.1" // { dependencies = [ sources."wordwrap-0.0.3" @@ -23000,12 +22692,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -23024,7 +22716,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -23053,14 +22745,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -23071,9 +22763,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -23085,7 +22777,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) ]; @@ -23100,10 +22792,10 @@ in emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; - version = "0.3.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz"; - sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c"; + url = "https://registry.npmjs.org/emoj/-/emoj-1.0.0.tgz"; + sha1 = "3cccbeec420e2b45f73b923e880c220392c055bd"; }; dependencies = [ (sources."chalk-1.1.3" // { @@ -23112,13 +22804,55 @@ in sources."escape-string-regexp-1.0.5" (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" ]; }) - (sources."got-6.6.3" // { + (sources."clipboardy-0.1.2" // { + dependencies = [ + (sources."execa-0.5.1" // { + dependencies = [ + (sources."cross-spawn-4.0.2" // { + dependencies = [ + (sources."lru-cache-4.0.2" // { + dependencies = [ + sources."pseudomap-1.0.2" + sources."yallist-2.0.0" + ]; + }) + (sources."which-1.2.12" // { + dependencies = [ + sources."isexe-1.1.2" + ]; + }) + ]; + }) + (sources."get-stream-2.3.1" // { + dependencies = [ + sources."object-assign-4.1.1" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + sources."is-stream-1.1.0" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) + sources."p-finally-1.0.0" + sources."signal-exit-3.0.2" + sources."strip-eof-1.0.0" + ]; + }) + ]; + }) + (sources."got-6.7.1" // { dependencies = [ (sources."create-error-class-3.0.2" // { dependencies = [ @@ -23126,22 +22860,13 @@ in ]; }) sources."duplexer3-0.1.4" - (sources."get-stream-2.3.1" // { - dependencies = [ - sources."object-assign-4.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) + sources."get-stream-3.0.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" sources."lowercase-keys-1.0.0" - sources."node-status-codes-2.0.1" - sources."timed-out-3.0.0" + sources."safe-buffer-5.0.1" + sources."timed-out-4.0.1" sources."unzip-response-2.0.1" (sources."url-parse-lax-1.0.0" // { dependencies = [ @@ -23152,7 +22877,7 @@ in }) (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."lodash.debounce-4.0.8" @@ -23171,7 +22896,11 @@ in }) ]; }) - sources."mem-0.1.1" + (sources."mem-1.1.0" // { + dependencies = [ + sources."mimic-fn-1.1.0" + ]; + }) (sources."meow-3.7.0" // { dependencies = [ (sources."camelcase-keys-2.1.0" // { @@ -23187,7 +22916,7 @@ in sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" ]; }) sources."map-obj-1.0.1" @@ -23213,7 +22942,7 @@ in }) ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" (sources."read-pkg-up-1.0.1" // { dependencies = [ (sources."find-up-1.1.2" // { @@ -23305,15 +23034,15 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.10.2"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz"; - sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz"; + sha1 = "564d2646b5efded85df96985332edd91a23bff25"; }; dependencies = [ - (sources."babel-code-frame-6.16.0" // { + (sources."babel-code-frame-6.22.0" // { dependencies = [ - sources."js-tokens-2.0.0" + sources."js-tokens-3.0.0" ]; }) (sources."chalk-1.1.3" // { @@ -23322,23 +23051,24 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" ]; }) - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -23348,7 +23078,7 @@ in }) ]; }) - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -23381,14 +23111,14 @@ in (sources."esrecurse-4.1.0" // { dependencies = [ sources."estraverse-4.1.1" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" ]; }) ]; }) (sources."espree-3.3.2" // { dependencies = [ - sources."acorn-4.0.3" + sources."acorn-4.0.4" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -23400,7 +23130,7 @@ in sources."esutils-2.0.2" (sources."file-entry-cache-2.0.0" // { dependencies = [ - (sources."flat-cache-1.2.1" // { + (sources."flat-cache-1.2.2" // { dependencies = [ sources."circular-json-0.3.1" (sources."del-2.2.2" // { @@ -23434,7 +23164,7 @@ in sources."write-0.2.1" ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" ]; }) (sources."glob-7.1.1" // { @@ -23470,7 +23200,7 @@ in (sources."inquirer-0.12.0" // { dependencies = [ sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" (sources."cli-cursor-1.0.2" // { dependencies = [ (sources."restore-cursor-1.0.1" // { @@ -23485,7 +23215,7 @@ in (sources."figures-1.7.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" ]; }) (sources."readline2-1.0.1" // { @@ -23531,7 +23261,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -23561,7 +23291,7 @@ in sources."type-check-0.3.2" ]; }) - sources."lodash-4.17.2" + sources."lodash-4.17.4" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -23574,7 +23304,7 @@ in sources."deep-is-0.1.3" sources."wordwrap-1.0.0" sources."type-check-0.3.2" - sources."fast-levenshtein-2.0.5" + sources."fast-levenshtein-2.0.6" ]; }) sources."path-is-inside-1.0.2" @@ -23590,33 +23320,33 @@ in sources."resolve-from-1.0.1" ]; }) - (sources."shelljs-0.7.5" // { + (sources."shelljs-0.7.6" // { dependencies = [ sources."interpret-1.0.1" (sources."rechoir-0.6.2" // { dependencies = [ - sources."resolve-1.1.7" + sources."resolve-1.2.0" ]; }) ]; }) sources."strip-bom-3.0.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" (sources."table-3.8.3" // { dependencies = [ - (sources."ajv-4.9.0" // { + (sources."ajv-4.10.4" // { dependencies = [ sources."co-4.6.0" ]; }) - sources."ajv-keywords-1.1.1" + sources."ajv-keywords-1.5.0" sources."slice-ansi-0.0.4" (sources."string-width-2.0.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) ]; @@ -23641,10 +23371,10 @@ in emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz"; - sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6"; + url = "https://registry.npmjs.org/emojione/-/emojione-2.2.7.tgz"; + sha1 = "46457cf6b9b2f8da13ae8a2e4e547de06ee15e96"; }; buildInputs = globalBuildInputs; meta = { @@ -23733,7 +23463,7 @@ in sources."pkginfo-0.4.0" (sources."read-1.0.7" // { dependencies = [ - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" ]; }) sources."revalidator-0.1.8" @@ -23788,7 +23518,7 @@ in sources."isarray-1.0.0" ]; }) - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" ]; }) @@ -23806,7 +23536,7 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -23843,7 +23573,7 @@ in sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ - sources."binary-extensions-1.7.0" + sources."binary-extensions-1.8.0" ]; }) (sources."is-glob-2.0.1" // { @@ -23867,10 +23597,10 @@ in sources."set-immediate-shim-1.0.1" ]; }) - (sources."fsevents-1.0.15" // { + (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.4.0" - (sources."node-pre-gyp-0.6.31" // { + sources."nan-2.5.0" + (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -23882,7 +23612,7 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -23900,13 +23630,13 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { + (sources."gauge-2.7.2" // { dependencies = [ sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -23919,7 +23649,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -23961,12 +23691,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -23985,7 +23715,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -24014,14 +23744,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -24032,9 +23762,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -24046,7 +23776,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) (sources."rimraf-2.5.4" // { @@ -24167,7 +23897,7 @@ in ]; }) sources."path-is-absolute-1.0.1" - (sources."prettyjson-1.2.0" // { + (sources."prettyjson-1.2.1" // { dependencies = [ sources."colors-1.1.2" sources."minimist-1.2.0" @@ -24258,10 +23988,10 @@ in git-run = nodeEnv.buildNodePackage { name = "git-run"; packageName = "git-run"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/git-run/-/git-run-0.5.2.tgz"; - sha1 = "1edbc7163389067dd9f2c46ab3acff07889f8333"; + url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz"; + sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c"; }; dependencies = [ (sources."minilog-2.0.8" // { @@ -24344,11 +24074,11 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.11.1" + sources."coffee-script-1.12.2" (sources."jade-1.11.0" // { dependencies = [ sources."character-parser-1.2.1" - (sources."clean-css-3.4.21" // { + (sources."clean-css-3.4.24" // { dependencies = [ (sources."commander-2.8.1" // { dependencies = [ @@ -24412,7 +24142,7 @@ in }) ]; }) - (sources."uglify-js-2.7.4" // { + (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" sources."source-map-0.5.6" @@ -24426,7 +24156,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -24442,7 +24172,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -24487,14 +24217,14 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) ]; }) (sources."msgpack-1.0.2" // { dependencies = [ - sources."nan-2.4.0" + sources."nan-2.5.0" ]; }) ]; @@ -24521,144 +24251,25 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" ]; }) sources."deprecated-0.0.1" - (sources."gulp-util-3.0.7" // { + (sources."gulp-util-3.0.8" // { dependencies = [ sources."array-differ-1.0.0" sources."array-uniq-1.0.3" sources."beeper-1.1.1" - (sources."dateformat-1.0.12" // { - dependencies = [ - sources."get-stdin-4.0.1" - (sources."meow-3.7.0" // { - dependencies = [ - (sources."camelcase-keys-2.1.0" // { - dependencies = [ - sources."camelcase-2.1.1" - ]; - }) - sources."decamelize-1.2.0" - (sources."loud-rejection-1.6.0" // { - dependencies = [ - (sources."currently-unhandled-0.4.1" // { - dependencies = [ - sources."array-find-index-1.0.2" - ]; - }) - sources."signal-exit-3.0.1" - ]; - }) - sources."map-obj-1.0.1" - (sources."normalize-package-data-2.3.5" // { - dependencies = [ - sources."hosted-git-info-2.1.5" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - (sources."validate-npm-package-license-3.0.1" // { - dependencies = [ - (sources."spdx-correct-1.0.2" // { - dependencies = [ - sources."spdx-license-ids-1.2.2" - ]; - }) - sources."spdx-expression-parse-1.0.4" - ]; - }) - ]; - }) - sources."object-assign-4.1.0" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - (sources."find-up-1.1.2" // { - dependencies = [ - sources."path-exists-2.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."read-pkg-1.1.0" // { - dependencies = [ - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.0" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) - ]; - }) - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."redent-1.0.0" // { - dependencies = [ - (sources."indent-string-2.1.0" // { - dependencies = [ - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - ]; - }) - sources."strip-indent-1.0.1" - ]; - }) - sources."trim-newlines-1.0.0" - ]; - }) - ]; - }) - (sources."fancy-log-1.2.0" // { + sources."dateformat-2.0.0" + (sources."fancy-log-1.3.0" // { dependencies = [ sources."time-stamp-1.0.1" ]; @@ -24720,13 +24331,14 @@ in }) sources."object-assign-3.0.0" sources."replace-ext-0.0.1" - (sources."through2-2.0.1" // { + (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -24779,7 +24391,7 @@ in sources."isarray-1.0.0" ]; }) - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" ]; }) @@ -24797,7 +24409,7 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -24840,15 +24452,14 @@ in }) (sources."global-modules-0.2.3" // { dependencies = [ - (sources."global-prefix-0.1.4" // { + (sources."global-prefix-0.1.5" // { dependencies = [ - sources."ini-1.3.4" - (sources."osenv-0.1.3" // { + (sources."homedir-polyfill-1.0.1" // { dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" + sources."parse-passwd-1.0.0" ]; }) + sources."ini-1.3.4" (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" @@ -24879,7 +24490,7 @@ in dependencies = [ (sources."is-relative-0.2.1" // { dependencies = [ - (sources."is-unc-path-0.1.1" // { + (sources."is-unc-path-0.1.2" // { dependencies = [ sources."unc-path-regex-0.1.2" ]; @@ -24904,7 +24515,7 @@ in sources."lodash.isstring-4.0.1" sources."lodash.mapvalues-4.6.0" sources."rechoir-0.6.2" - sources."resolve-1.1.7" + sources."resolve-1.2.0" ]; }) sources."minimist-1.2.0" @@ -25224,7 +24835,7 @@ in sources."deep-is-0.1.3" sources."type-check-0.3.2" sources."levn-0.3.0" - sources."fast-levenshtein-2.0.5" + sources."fast-levenshtein-2.0.6" ]; }) (sources."source-map-0.2.0" // { @@ -25269,7 +24880,7 @@ in sources."amdefine-1.0.1" ]; }) - (sources."uglify-js-2.7.4" // { + (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" sources."source-map-0.5.6" @@ -25283,7 +24894,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -25299,7 +24910,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -25342,7 +24953,7 @@ in ]; }) sources."resolve-1.1.7" - (sources."supports-color-3.1.2" // { + (sources."supports-color-3.2.3" // { dependencies = [ sources."has-flag-1.0.0" ]; @@ -25521,20 +25132,20 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz"; - sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f"; + url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz"; + sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b"; }; dependencies = [ - sources."bluebird-3.4.6" - (sources."body-parser-1.15.2" // { + sources."bluebird-3.4.7" + (sources."body-parser-1.16.0" // { dependencies = [ sources."bytes-2.4.0" sources."content-type-1.0.2" - (sources."debug-2.2.0" // { + (sources."debug-2.6.0" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."depd-1.1.0" @@ -25545,14 +25156,14 @@ in sources."statuses-1.3.1" ]; }) - sources."iconv-lite-0.4.13" + sources."iconv-lite-0.4.15" (sources."on-finished-2.3.0" // { dependencies = [ sources."ee-first-1.1.1" ]; }) - sources."qs-6.2.0" - (sources."raw-body-2.1.7" // { + sources."qs-6.2.1" + (sources."raw-body-2.2.0" // { dependencies = [ sources."unpipe-1.0.0" ]; @@ -25560,9 +25171,9 @@ in (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -25594,7 +25205,7 @@ in sources."isarray-1.0.0" ]; }) - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" ]; }) @@ -25612,7 +25223,7 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -25649,7 +25260,7 @@ in sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ - sources."binary-extensions-1.7.0" + sources."binary-extensions-1.8.0" ]; }) (sources."is-glob-2.0.1" // { @@ -25673,10 +25284,10 @@ in sources."set-immediate-shim-1.0.1" ]; }) - (sources."fsevents-1.0.15" // { + (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.4.0" - (sources."node-pre-gyp-0.6.31" // { + sources."nan-2.5.0" + (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -25688,7 +25299,7 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -25706,13 +25317,13 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { + (sources."gauge-2.7.2" // { dependencies = [ sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -25725,7 +25336,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -25767,12 +25378,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -25791,7 +25402,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -25820,14 +25431,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -25838,9 +25449,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -25852,7 +25463,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) sources."semver-5.3.0" @@ -25898,7 +25509,7 @@ in sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) (sources."connect-3.5.0" // { @@ -25968,13 +25579,13 @@ in ]; }) sources."graceful-fs-4.1.11" - (sources."http-proxy-1.15.2" // { + (sources."http-proxy-1.16.2" // { dependencies = [ sources."eventemitter3-1.2.0" sources."requires-port-1.0.0" ]; }) - sources."isbinaryfile-3.0.1" + sources."isbinaryfile-3.0.2" sources."lodash-3.10.1" (sources."log4js-0.6.38" // { dependencies = [ @@ -26009,105 +25620,101 @@ in sources."qjobs-1.1.5" sources."range-parser-1.2.0" sources."rimraf-2.5.4" - (sources."socket.io-1.4.7" // { + sources."safe-buffer-5.0.1" + (sources."socket.io-1.7.2" // { dependencies = [ - (sources."engine.io-1.6.10" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."base64id-0.1.0" - (sources."ws-1.0.1" // { + sources."ms-0.7.2" + ]; + }) + (sources."engine.io-1.8.2" // { + dependencies = [ + (sources."accepts-1.3.3" // { + dependencies = [ + (sources."mime-types-2.1.14" // { + dependencies = [ + sources."mime-db-1.26.0" + ]; + }) + sources."negotiator-0.6.1" + ]; + }) + sources."base64id-1.0.0" + (sources."engine.io-parser-1.3.2" // { + dependencies = [ + sources."after-0.8.2" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + sources."wtf-8-1.0.0" + ]; + }) + (sources."ws-1.1.1" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" ]; }) - (sources."engine.io-parser-1.2.4" // { - dependencies = [ - sources."after-0.8.1" - sources."arraybuffer.slice-0.0.6" - sources."base64-arraybuffer-0.1.2" - sources."blob-0.0.4" - (sources."has-binary-0.1.6" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) - sources."utf8-2.1.0" - ]; - }) - (sources."accepts-1.1.4" // { - dependencies = [ - (sources."mime-types-2.0.14" // { - dependencies = [ - sources."mime-db-1.12.0" - ]; - }) - sources."negotiator-0.4.9" - ]; - }) + sources."cookie-0.3.1" ]; }) - (sources."socket.io-parser-2.2.6" // { + (sources."has-binary-0.1.7" // { dependencies = [ - sources."json3-3.3.2" - sources."component-emitter-1.1.2" sources."isarray-0.0.1" - sources."benchmark-1.0.0" ]; }) - (sources."socket.io-client-1.4.6" // { + sources."object-assign-4.1.0" + sources."socket.io-adapter-0.5.0" + (sources."socket.io-client-1.7.2" // { dependencies = [ - (sources."engine.io-client-1.6.9" // { + sources."backo2-1.0.2" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + (sources."engine.io-client-1.8.2" // { dependencies = [ + sources."component-inherit-0.0.3" + (sources."engine.io-parser-1.3.2" // { + dependencies = [ + sources."after-0.8.2" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + sources."wtf-8-1.0.0" + ]; + }) sources."has-cors-1.1.0" - (sources."ws-1.0.1" // { + (sources."parsejson-0.0.3" // { + dependencies = [ + (sources."better-assert-1.0.2" // { + dependencies = [ + sources."callsite-1.0.0" + ]; + }) + ]; + }) + (sources."parseqs-0.0.5" // { + dependencies = [ + (sources."better-assert-1.0.2" // { + dependencies = [ + sources."callsite-1.0.0" + ]; + }) + ]; + }) + (sources."ws-1.1.1" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" ]; }) - sources."xmlhttprequest-ssl-1.5.1" - sources."component-emitter-1.1.2" - (sources."engine.io-parser-1.2.4" // { - dependencies = [ - sources."after-0.8.1" - sources."arraybuffer.slice-0.0.6" - sources."base64-arraybuffer-0.1.2" - sources."blob-0.0.4" - (sources."has-binary-0.1.6" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) - sources."utf8-2.1.0" - ]; - }) - (sources."parsejson-0.0.1" // { - dependencies = [ - (sources."better-assert-1.0.2" // { - dependencies = [ - sources."callsite-1.0.0" - ]; - }) - ]; - }) - (sources."parseqs-0.0.2" // { - dependencies = [ - (sources."better-assert-1.0.2" // { - dependencies = [ - sources."callsite-1.0.0" - ]; - }) - ]; - }) - sources."component-inherit-0.0.3" + sources."xmlhttprequest-ssl-1.5.3" sources."yeast-0.1.2" ]; }) - sources."component-bind-1.0.0" - sources."component-emitter-1.2.0" - sources."object-component-0.0.3" sources."indexof-0.0.1" - (sources."parseuri-0.0.4" // { + sources."object-component-0.0.3" + (sources."parseuri-0.0.5" // { dependencies = [ (sources."better-assert-1.0.2" // { dependencies = [ @@ -26117,32 +25724,20 @@ in ]; }) sources."to-array-0.1.4" - sources."backo2-1.0.2" ]; }) - (sources."socket.io-adapter-0.4.0" // { + (sources."socket.io-parser-2.3.1" // { dependencies = [ - (sources."socket.io-parser-2.2.2" // { + (sources."debug-2.2.0" // { dependencies = [ - sources."debug-0.7.4" - sources."json3-3.2.6" - sources."component-emitter-1.1.2" - sources."isarray-0.0.1" - sources."benchmark-1.0.0" + sources."ms-0.7.1" ]; }) - ]; - }) - (sources."has-binary-0.1.7" // { - dependencies = [ + sources."json3-3.3.2" + sources."component-emitter-1.1.2" sources."isarray-0.0.1" ]; }) - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) ]; }) sources."source-map-0.5.6" @@ -26151,7 +25746,7 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."useragent-2.1.9" // { + (sources."useragent-2.1.11" // { dependencies = [ sources."lru-cache-2.2.4" ]; @@ -26204,9 +25799,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.5.3" @@ -26214,7 +25809,7 @@ in }) (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -26244,9 +25839,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.6.1" @@ -26335,9 +25930,9 @@ in }) sources."batch-0.5.3" sources."escape-html-1.0.3" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -26364,9 +25959,9 @@ in (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -26438,7 +26033,7 @@ in (sources."passport-oauth1-1.1.0" // { dependencies = [ sources."passport-strategy-1.0.0" - sources."oauth-0.9.14" + sources."oauth-0.9.15" sources."utils-merge-1.0.0" ]; }) @@ -26446,11 +26041,12 @@ in }) (sources."passport-google-oauth20-1.0.0" // { dependencies = [ - (sources."passport-oauth2-1.3.0" // { + (sources."passport-oauth2-1.4.0" // { dependencies = [ + sources."oauth-0.9.15" sources."passport-strategy-1.0.0" - sources."oauth-0.9.14" sources."uid2-0.0.3" + sources."utils-merge-1.0.0" ]; }) ]; @@ -26463,7 +26059,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) ]; @@ -26485,13 +26081,14 @@ in sha1 = "5de1e6426f885929b77357f014de5fee1dad0553"; }; dependencies = [ - (sources."through2-2.0.1" // { + (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -26553,11 +26150,11 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."glob-parent-3.0.1" // { + (sources."glob-parent-3.1.0" // { dependencies = [ (sources."is-glob-3.1.0" // { dependencies = [ - sources."is-extglob-2.1.0" + sources."is-extglob-2.1.1" ]; }) sources."path-dirname-1.0.2" @@ -26583,7 +26180,7 @@ in sources."isarray-1.0.0" ]; }) - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" ]; }) @@ -26602,7 +26199,7 @@ in sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -26682,14 +26279,14 @@ in }) sources."is-valid-glob-0.3.0" sources."lazystream-1.0.0" - sources."lodash.isequal-4.4.0" - sources."merge-stream-1.0.0" + sources."lodash.isequal-4.5.0" + sources."merge-stream-1.0.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -26798,23 +26395,24 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.0.tgz"; - sha1 = "7e27db0eb5102dc0f1a4667d84bd5d633e19d191"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.1.tgz"; + sha1 = "f58c3157be2ffcb8253f82641b5f0473543d21e8"; }; dependencies = [ sources."optparse-1.0.5" - sources."semver-5.0.3" + sources."semver-5.3.0" (sources."npm-registry-client-7.1.2" // { dependencies = [ sources."chownr-1.0.1" - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -26853,7 +26451,6 @@ in (sources."npm-package-arg-4.2.0" // { dependencies = [ sources."hosted-git-info-2.1.5" - sources."semver-5.3.0" ]; }) (sources."once-1.4.0" // { @@ -26886,12 +26483,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -26910,7 +26507,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -26939,14 +26536,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -26957,9 +26554,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -26971,7 +26568,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) sources."retry-0.8.0" @@ -27026,8 +26623,8 @@ in sources."aproba-1.0.4" sources."has-color-0.1.7" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -27040,7 +26637,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -27075,7 +26672,7 @@ in sources."wrappy-1.0.2" ]; }) - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -27172,10 +26769,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz"; - sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36"; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; + sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; }; dependencies = [ (sources."fstream-1.0.10" // { @@ -27221,7 +26818,7 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-3.1.2" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -27240,13 +26837,13 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.2" // { dependencies = [ sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -27259,7 +26856,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -27268,35 +26865,12 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" ]; }) - (sources."path-array-1.0.1" // { - dependencies = [ - (sources."array-index-1.0.0" // { - dependencies = [ - (sources."debug-2.3.3" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."es6-symbol-3.1.0" // { - dependencies = [ - sources."d-0.1.1" - (sources."es5-ext-0.10.12" // { - dependencies = [ - sources."es6-iterator-2.0.0" - ]; - }) - ]; - }) - ]; - }) - ]; - }) (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" @@ -27322,12 +26896,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -27346,7 +26920,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -27375,14 +26949,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -27393,9 +26967,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -27407,7 +26981,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) sources."rimraf-2.5.4" @@ -27453,7 +27027,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -27467,7 +27041,7 @@ in sources."lodash-3.10.1" ]; }) - sources."xmldom-0.1.22" + sources."xmldom-0.1.27" sources."util-deprecate-1.0.2" ]; }) @@ -27507,7 +27081,7 @@ in sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" ]; }) sources."map-obj-1.0.1" @@ -27531,7 +27105,7 @@ in }) ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" (sources."read-pkg-up-1.0.1" // { dependencies = [ (sources."find-up-1.1.2" // { @@ -27622,7 +27196,7 @@ in }) ]; }) - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -27631,9 +27205,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.6.1" @@ -27669,10 +27243,10 @@ in }) sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - (sources."proxy-addr-1.1.2" // { + (sources."proxy-addr-1.1.3" // { dependencies = [ sources."forwarded-0.1.0" - sources."ipaddr.js-1.1.1" + sources."ipaddr.js-1.2.0" ]; }) sources."qs-6.2.0" @@ -27695,9 +27269,9 @@ in (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -27756,8 +27330,8 @@ in }) (sources."v8-debug-0.7.7" // { dependencies = [ - sources."nan-2.4.0" - (sources."node-pre-gyp-0.6.31" // { + sources."nan-2.5.0" + (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -27769,7 +27343,7 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -27788,13 +27362,13 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { + (sources."gauge-2.7.2" // { dependencies = [ sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -27807,7 +27381,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -27841,12 +27415,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -27865,7 +27439,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -27894,14 +27468,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -27912,9 +27486,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -27926,7 +27500,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) (sources."rimraf-2.5.4" // { @@ -28024,8 +27598,8 @@ in }) (sources."v8-profiler-5.6.5" // { dependencies = [ - sources."nan-2.4.0" - (sources."node-pre-gyp-0.6.31" // { + sources."nan-2.5.0" + (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -28037,7 +27611,7 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -28056,13 +27630,13 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { + (sources."gauge-2.7.2" // { dependencies = [ sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -28075,7 +27649,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -28109,12 +27683,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -28133,7 +27707,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -28162,14 +27736,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -28180,9 +27754,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -28194,7 +27768,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) (sources."rimraf-2.5.4" // { @@ -28308,10 +27882,10 @@ in dependencies = [ (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) - sources."wrap-ansi-2.0.0" + sources."wrap-ansi-2.1.0" ]; }) sources."decamelize-1.2.0" @@ -28334,7 +27908,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) ]; @@ -28354,10 +27928,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.31"; + version = "0.6.32"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz"; - sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; + sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; }; dependencies = [ (sources."mkdirp-0.5.1" // { @@ -28370,7 +27944,7 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -28389,13 +27963,13 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { + (sources."gauge-2.7.2" // { dependencies = [ sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -28408,7 +27982,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -28450,12 +28024,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -28474,7 +28048,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -28503,14 +28077,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -28521,9 +28095,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -28535,7 +28109,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) (sources."rimraf-2.5.4" // { @@ -28671,7 +28245,7 @@ in sources."isarray-1.0.0" ]; }) - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" ]; }) @@ -28689,7 +28263,7 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -28726,7 +28300,7 @@ in sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ - sources."binary-extensions-1.7.0" + sources."binary-extensions-1.8.0" ]; }) (sources."is-glob-2.0.1" // { @@ -28751,10 +28325,10 @@ in sources."set-immediate-shim-1.0.1" ]; }) - (sources."fsevents-1.0.15" // { + (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.4.0" - (sources."node-pre-gyp-0.6.31" // { + sources."nan-2.5.0" + (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -28766,7 +28340,7 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -28784,13 +28358,13 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { + (sources."gauge-2.7.2" // { dependencies = [ sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -28803,7 +28377,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -28845,12 +28419,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -28869,7 +28443,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -28898,14 +28472,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -28916,9 +28490,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -28930,7 +28504,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) (sources."rimraf-2.5.4" // { @@ -29000,7 +28574,7 @@ in }) ]; }) - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -29077,12 +28651,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -29096,15 +28670,15 @@ in sources."minimist-0.0.8" ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" sources."os-tmpdir-1.0.2" - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" ]; }) sources."uuid-2.0.3" - (sources."write-file-atomic-1.2.0" // { + (sources."write-file-atomic-1.3.1" // { dependencies = [ sources."imurmurhash-0.1.4" sources."slide-1.1.6" @@ -29217,7 +28791,7 @@ in dependencies = [ (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) ]; @@ -29236,14 +28810,14 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.15.2"; + version = "0.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.15.2.tgz"; - sha1 = "4533dd93f63828f8e749f0c132a793fbeb636ea6"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.16.1.tgz"; + sha1 = "eff4162e6e08ef7e2ae9b17ad99571876f7d895d"; }; dependencies = [ - sources."basic-auth-1.0.4" - sources."bcryptjs-2.3.0" + sources."basic-auth-1.1.0" + sources."bcryptjs-2.4.0" (sources."body-parser-1.15.2" // { dependencies = [ sources."bytes-2.4.0" @@ -29268,11 +28842,16 @@ in ]; }) sources."qs-6.2.0" + (sources."raw-body-2.1.7" // { + dependencies = [ + sources."unpipe-1.0.0" + ]; + }) (sources."type-is-1.6.14" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -29331,7 +28910,7 @@ in sources."lodash.some-4.6.0" ]; }) - sources."clone-2.0.0" + sources."clone-2.1.0" (sources."cookie-parser-1.4.3" // { dependencies = [ sources."cookie-0.3.1" @@ -29343,11 +28922,11 @@ in sources."vary-1.1.0" ]; }) - (sources."cron-1.1.1" // { + (sources."cron-1.2.1" // { dependencies = [ - (sources."moment-timezone-0.5.9" // { + (sources."moment-timezone-0.5.11" // { dependencies = [ - sources."moment-2.17.0" + sources."moment-2.17.1" ]; }) ]; @@ -29356,9 +28935,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.6.1" @@ -29394,10 +28973,10 @@ in }) sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - (sources."proxy-addr-1.1.2" // { + (sources."proxy-addr-1.1.3" // { dependencies = [ sources."forwarded-0.1.0" - sources."ipaddr.js-1.1.1" + sources."ipaddr.js-1.2.0" ]; }) sources."qs-6.2.0" @@ -29419,9 +28998,9 @@ in sources."serve-static-1.11.1" (sources."type-is-1.6.14" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -29430,52 +29009,20 @@ in sources."vary-1.1.0" ]; }) - (sources."follow-redirects-0.2.0" // { + (sources."follow-redirects-1.2.1" // { dependencies = [ - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; }) - sources."stream-consume-0.1.0" ]; }) - (sources."fs-extra-0.30.0" // { + (sources."fs-extra-1.0.0" // { dependencies = [ sources."graceful-fs-4.1.11" sources."jsonfile-2.4.0" sources."klaw-1.3.1" - sources."path-is-absolute-1.0.1" - (sources."rimraf-2.5.4" // { - dependencies = [ - (sources."glob-7.1.1" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.3" // { - dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - ]; - }) ]; }) (sources."fs.notify-0.0.4" // { @@ -29497,26 +29044,29 @@ in ]; }) sources."is-utf8-0.2.1" + (sources."js-yaml-3.7.0" // { + dependencies = [ + (sources."argparse-1.0.9" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) + sources."esprima-2.7.3" + ]; + }) + sources."json-stringify-safe-5.0.1" + sources."jsonata-1.0.10" sources."media-typer-0.3.0" - (sources."mqtt-1.14.1" // { + (sources."mqtt-2.2.1" // { dependencies = [ (sources."commist-1.0.0" // { dependencies = [ sources."leven-1.0.2" ]; }) - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) ]; }) (sources."end-of-stream-1.1.0" // { @@ -29559,11 +29109,11 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."glob-parent-3.0.1" // { + (sources."glob-parent-3.1.0" // { dependencies = [ (sources."is-glob-3.1.0" // { dependencies = [ - sources."is-extglob-2.1.0" + sources."is-extglob-2.1.1" ]; }) sources."path-dirname-1.0.2" @@ -29589,7 +29139,7 @@ in sources."isarray-1.0.0" ]; }) - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" ]; }) @@ -29608,7 +29158,7 @@ in sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -29645,19 +29195,19 @@ in (sources."ordered-read-streams-0.3.0" // { dependencies = [ sources."is-stream-1.1.0" - (sources."readable-stream-2.2.2" // { + ]; + }) + (sources."through2-0.6.5" // { + dependencies = [ + (sources."readable-stream-1.0.34" // { dependencies = [ - sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" + sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" ]; }) ]; }) - sources."through2-0.6.5" (sources."to-absolute-glob-0.1.1" // { dependencies = [ (sources."extend-shallow-2.0.1" // { @@ -29676,54 +29226,35 @@ in }) (sources."through2-filter-2.0.0" // { dependencies = [ - (sources."through2-2.0.1" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."through2-2.0.3" ]; }) ]; }) ]; }) - (sources."through2-2.0.1" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."through2-2.0.3" ]; }) sources."inherits-2.0.3" sources."minimist-1.2.0" - (sources."mqtt-connection-2.1.1" // { + (sources."mqtt-packet-5.2.1" // { dependencies = [ - sources."reduplexer-1.1.0" - sources."through2-0.6.5" + sources."bl-1.2.0" + sources."process-nextick-args-1.0.7" ]; }) - (sources."mqtt-packet-3.4.7" // { + (sources."readable-stream-2.2.2" // { dependencies = [ - sources."bl-0.9.5" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" ]; }) - (sources."pump-1.0.1" // { + (sources."pump-1.0.2" // { dependencies = [ (sources."once-1.4.0" // { dependencies = [ @@ -29732,29 +29263,10 @@ in }) ]; }) - (sources."readable-stream-1.0.34" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) sources."reinterval-1.1.0" - (sources."split2-2.1.0" // { + (sources."split2-2.1.1" // { dependencies = [ - (sources."through2-2.0.1" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."through2-2.0.3" ]; }) (sources."websocket-stream-3.3.3" // { @@ -29770,54 +29282,26 @@ in }) ]; }) - (sources."readable-stream-2.2.2" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) sources."stream-shift-1.0.0" ]; }) - (sources."through2-2.0.1" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - (sources."ws-1.1.1" // { - dependencies = [ - sources."options-0.0.6" - sources."ultron-1.0.2" - ]; - }) + sources."through2-2.0.3" ]; }) sources."xtend-4.0.1" ]; }) - sources."mustache-2.2.1" + sources."mustache-2.3.0" (sources."nopt-3.0.6" // { dependencies = [ sources."abbrev-1.0.9" ]; }) - (sources."oauth2orize-1.5.0" // { + (sources."oauth2orize-1.7.0" // { dependencies = [ sources."uid2-0.0.3" sources."utils-merge-1.0.0" - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -29841,25 +29325,16 @@ in sources."passport-strategy-1.0.0" ]; }) - (sources."raw-body-2.1.7" // { + (sources."raw-body-2.2.0" // { dependencies = [ sources."bytes-2.4.0" - sources."iconv-lite-0.4.13" + sources."iconv-lite-0.4.15" sources."unpipe-1.0.0" ]; }) sources."semver-5.3.0" - (sources."sentiment-1.0.6" // { - dependencies = [ - (sources."lodash.assign-4.0.1" // { - dependencies = [ - sources."lodash.keys-4.2.0" - sources."lodash.rest-4.0.5" - ]; - }) - ]; - }) - (sources."uglify-js-2.7.3" // { + sources."sentiment-2.1.0" + (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" sources."source-map-0.5.6" @@ -29873,7 +29348,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -29889,7 +29364,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -29910,22 +29385,10 @@ in ]; }) sources."when-3.7.7" - (sources."ws-0.8.1" // { + (sources."ws-1.1.1" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" - (sources."bufferutil-1.2.1" // { - dependencies = [ - sources."bindings-1.2.1" - sources."nan-2.4.0" - ]; - }) - (sources."utf-8-validate-1.2.1" // { - dependencies = [ - sources."bindings-1.2.1" - sources."nan-2.4.0" - ]; - }) ]; }) (sources."xml2js-0.4.17" // { @@ -29933,7 +29396,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) ]; @@ -29985,7 +29448,7 @@ in dependencies = [ (sources."async-2.1.4" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) ]; @@ -29998,12 +29461,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -30022,7 +29485,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -30051,14 +29514,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -30068,10 +29531,9 @@ in }) sources."is-typedarray-1.0.0" sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."node-uuid-1.4.7" @@ -30088,7 +29550,7 @@ in }) ]; }) - (sources."node-red-node-email-0.1.12" // { + (sources."node-red-node-email-0.1.15" // { dependencies = [ (sources."nodemailer-1.11.0" // { dependencies = [ @@ -30108,7 +29570,7 @@ in sources."libqp-1.1.0" (sources."needle-0.10.0" // { dependencies = [ - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -30122,7 +29584,7 @@ in }) (sources."needle-0.11.0" // { dependencies = [ - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -30174,7 +29636,7 @@ in }) ]; }) - (sources."imap-0.8.18" // { + (sources."imap-0.8.19" // { dependencies = [ sources."utf7-1.0.2" (sources."readable-stream-1.1.14" // { @@ -30218,12 +29680,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -30242,7 +29704,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -30271,14 +29733,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -30288,10 +29750,9 @@ in }) sources."is-typedarray-1.0.0" sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -30303,315 +29764,283 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) ]; }) sources."node-red-node-rbe-0.1.6" - (sources."node-red-node-serialport-0.4.1" // { + (sources."bcrypt-1.0.2" // { dependencies = [ - (sources."serialport-4.0.6" // { + sources."bindings-1.2.1" + sources."nan-2.5.0" + (sources."node-pre-gyp-0.6.32" // { dependencies = [ - sources."bindings-1.2.1" - (sources."commander-2.9.0" // { + (sources."mkdirp-0.5.1" // { dependencies = [ - sources."graceful-readlink-1.0.1" + sources."minimist-0.0.8" ]; }) - (sources."debug-2.3.3" // { + (sources."npmlog-4.0.2" // { dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."lie-3.1.0" // { - dependencies = [ - sources."immediate-3.0.6" - ]; - }) - sources."nan-2.4.0" - (sources."node-pre-gyp-0.6.31" // { - dependencies = [ - (sources."mkdirp-0.5.1" // { + (sources."are-we-there-yet-1.1.2" // { dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."npmlog-4.0.1" // { - dependencies = [ - (sources."are-we-there-yet-1.1.2" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."inherits-2.0.3" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { - dependencies = [ - sources."aproba-1.0.4" - sources."has-color-0.1.7" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - sources."wide-align-1.1.0" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."rc-1.1.6" // { - dependencies = [ - sources."deep-extend-0.4.1" - sources."ini-1.3.4" - sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" - ]; - }) - (sources."request-2.79.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" - sources."caseless-0.11.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - (sources."is-my-json-valid-2.15.0" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-4.0.0" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.3.1" // { - dependencies = [ - sources."extsprintf-1.0.2" - sources."json-schema-0.2.3" - sources."verror-1.3.6" - ]; - }) - (sources."sshpk-1.10.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" - sources."getpass-0.1.6" - sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { - dependencies = [ - sources."mime-db-1.25.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."qs-6.3.0" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.2" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" - ]; - }) - (sources."rimraf-2.5.4" // { - dependencies = [ - (sources."glob-7.1.1" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.3" // { - dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - ]; - }) - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - (sources."fstream-1.0.10" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - sources."inherits-2.0.3" - ]; - }) - (sources."tar-pack-3.3.0" // { - dependencies = [ - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - (sources."fstream-1.0.10" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."inherits-2.0.3" - ]; - }) - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."inherits-2.0.3" - (sources."minimatch-3.0.3" // { - dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."once-1.3.3" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (sources."readable-stream-2.1.5" // { + sources."delegates-1.0.0" + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" ]; }) - sources."uid-number-0.0.6" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."gauge-2.7.2" // { + dependencies = [ + sources."aproba-1.0.4" + sources."supports-color-0.2.0" + sources."has-unicode-2.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."wide-align-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + ]; + }) + (sources."rc-1.1.6" // { + dependencies = [ + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."minimist-1.2.0" + sources."strip-json-comments-1.0.4" + ]; + }) + (sources."request-2.79.0" // { + dependencies = [ + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + (sources."combined-stream-1.0.5" // { + dependencies = [ + sources."delayed-stream-1.0.0" + ]; + }) + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + (sources."form-data-2.1.2" // { + dependencies = [ + sources."asynckit-0.4.0" + ]; + }) + (sources."har-validator-2.0.6" // { + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + (sources."commander-2.9.0" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."is-my-json-valid-2.15.0" // { + dependencies = [ + sources."generate-function-2.0.0" + (sources."generate-object-property-1.2.0" // { + dependencies = [ + sources."is-property-1.0.2" + ]; + }) + sources."jsonpointer-4.0.1" + sources."xtend-4.0.1" + ]; + }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.2" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.1" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.5" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + (sources."mime-types-2.1.14" // { + dependencies = [ + sources."mime-db-1.26.0" + ]; + }) + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + (sources."tough-cookie-2.3.2" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.4.3" + sources."uuid-3.0.1" + ]; + }) + (sources."rimraf-2.5.4" // { + dependencies = [ + (sources."glob-7.1.1" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" ]; }) ]; }) - (sources."object.assign-4.0.4" // { + (sources."tar-2.2.1" // { dependencies = [ - sources."function-bind-1.1.0" - sources."object-keys-1.0.11" - (sources."define-properties-1.1.2" // { + sources."block-stream-0.0.9" + (sources."fstream-1.0.10" // { dependencies = [ - sources."foreach-2.0.5" + sources."graceful-fs-4.1.11" ]; }) + sources."inherits-2.0.3" + ]; + }) + (sources."tar-pack-3.3.0" // { + dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + (sources."fstream-1.0.10" // { + dependencies = [ + sources."graceful-fs-4.1.11" + sources."inherits-2.0.3" + ]; + }) + (sources."fstream-ignore-1.0.5" // { + dependencies = [ + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + ]; + }) + (sources."once-1.3.3" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + (sources."readable-stream-2.1.5" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + sources."uid-number-0.0.6" ]; }) ]; }) ]; }) - (sources."bcrypt-0.8.7" // { - dependencies = [ - sources."bindings-1.2.1" - sources."nan-2.3.5" - ]; - }) ]; buildInputs = globalBuildInputs; meta = { @@ -30675,7 +30104,7 @@ in ]; }) sources."cookie-signature-1.0.1" - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -30688,7 +30117,7 @@ in (sources."config-0.4.15" // { dependencies = [ sources."js-yaml-0.3.7" - sources."coffee-script-1.11.1" + sources."coffee-script-1.12.2" (sources."vows-0.8.1" // { dependencies = [ sources."eyes-0.1.8" @@ -30749,20 +30178,21 @@ in sources."moment-2.1.0" (sources."nodemailer-0.3.35" // { dependencies = [ - (sources."mailcomposer-3.12.0" // { + (sources."mailcomposer-4.0.1" // { dependencies = [ - (sources."buildmail-3.10.0" // { + (sources."buildmail-4.0.1" // { dependencies = [ sources."addressparser-1.0.1" sources."libbase64-0.1.0" sources."libqp-1.1.0" sources."nodemailer-fetch-1.6.0" sources."nodemailer-shared-1.1.0" + sources."punycode-1.4.1" ]; }) - (sources."libmime-2.1.0" // { + (sources."libmime-3.0.0" // { dependencies = [ - sources."iconv-lite-0.4.13" + sources."iconv-lite-0.4.15" sources."libbase64-0.1.0" sources."libqp-1.1.0" ]; @@ -30814,15 +30244,15 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.0.2"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz"; - sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae"; + url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz"; + sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4"; }; dependencies = [ (sources."JSONStream-1.2.1" // { dependencies = [ - sources."jsonparse-1.2.0" + sources."jsonparse-1.3.0" sources."through-2.3.8" ]; }) @@ -30918,7 +30348,7 @@ in sources."promzard-0.3.0" ]; }) - sources."lockfile-1.0.2" + sources."lockfile-1.0.3" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ sources."lodash._createset-4.0.3" @@ -30931,18 +30361,9 @@ in sources."lodash.without-4.4.0" (sources."mississippi-1.2.0" // { dependencies = [ - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) ]; }) (sources."duplexify-3.5.0" // { @@ -30962,24 +30383,15 @@ in }) sources."flush-write-stream-1.0.2" sources."from2-2.3.0" - sources."pump-1.0.1" + sources."pump-1.0.2" sources."pumpify-1.3.5" (sources."stream-each-1.2.0" // { dependencies = [ sources."stream-shift-1.0.0" ]; }) - (sources."through2-2.0.1" // { + (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) sources."xtend-4.0.1" ]; }) @@ -31002,6 +30414,7 @@ in }) ]; }) + sources."nopt-3.0.6" (sources."npmlog-3.1.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { @@ -31013,8 +30426,8 @@ in (sources."gauge-2.6.0" // { dependencies = [ sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -31035,7 +30448,7 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -31056,7 +30469,7 @@ in }) ]; }) - sources."nopt-3.0.6" + sources."nopt-4.0.1" sources."normalize-git-url-3.0.2" (sources."normalize-package-data-2.3.5" // { dependencies = [ @@ -31070,55 +30483,17 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.0" - (sources."npm-registry-client-7.3.0" // { + (sources."npm-registry-client-7.4.5" // { dependencies = [ - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - (sources."npmlog-3.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.2" // { - dependencies = [ - sources."delegates-1.0.0" - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { - dependencies = [ - sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - sources."wide-align-1.1.0" - ]; - }) - sources."set-blocking-2.0.0" ]; }) ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -31126,11 +30501,11 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { + (sources."gauge-2.7.2" // { dependencies = [ - sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."supports-color-0.2.0" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -31149,7 +30524,7 @@ in }) sources."once-1.4.0" sources."opener-1.4.2" - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -31158,7 +30533,7 @@ in sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" ]; }) sources."read-cmd-shim-1.0.1" @@ -31192,7 +30567,7 @@ in ]; }) sources."read-package-tree-5.1.5" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -31203,7 +30578,7 @@ in ]; }) sources."realize-package-specifier-3.0.3" - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -31243,7 +30618,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -31272,14 +30647,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -31290,12 +30665,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -31307,7 +30681,7 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.10.0" + sources."retry-0.10.1" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."sha-2.0.1" @@ -31348,6 +30722,7 @@ in ]; }) sources."unpipe-1.0.0" + sources."uuid-3.0.1" (sources."validate-npm-package-name-2.2.2" // { dependencies = [ sources."builtins-0.0.7" @@ -31360,7 +30735,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-1.2.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -31433,12 +30808,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -31457,7 +30832,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -31486,14 +30861,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -31504,9 +30879,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -31518,7 +30893,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) sources."graceful-fs-2.0.3" @@ -31559,7 +30934,7 @@ in }) sources."retry-0.6.0" sources."couch-login-0.1.20" - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -31578,13 +30953,13 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { + (sources."gauge-2.7.2" // { dependencies = [ sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -31597,7 +30972,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -31712,7 +31087,7 @@ in ]; }) sources."findit-1.2.0" - sources."coffee-script-1.11.1" + sources."coffee-script-1.12.2" ]; buildInputs = globalBuildInputs; meta = { @@ -31724,25 +31099,25 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.8.6"; + version = "2.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.6.tgz"; - sha1 = "9e3a0865b29dfc9af8c3d53d95b43f4bc6b1f212"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz"; + sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3"; }; dependencies = [ - sources."bluebird-3.4.6" + sources."bluebird-3.4.7" (sources."chalk-1.1.3" // { dependencies = [ sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -31776,7 +31151,7 @@ in sources."jju-1.3.0" ]; }) - sources."lodash-4.17.2" + sources."lodash-4.17.4" sources."node-alias-1.0.4" (sources."npm-3.10.10" // { dependencies = [ @@ -31872,7 +31247,7 @@ in sources."promzard-0.3.0" ]; }) - sources."lockfile-1.0.2" + sources."lockfile-1.0.3" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ sources."lodash._createset-4.0.3" @@ -31911,8 +31286,8 @@ in (sources."gauge-2.6.0" // { dependencies = [ sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -31933,7 +31308,7 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -31970,11 +31345,12 @@ in sources."npm-package-arg-4.2.0" (sources."npm-registry-client-7.2.1" // { dependencies = [ - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -31995,8 +31371,8 @@ in (sources."gauge-2.6.0" // { dependencies = [ sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -32016,7 +31392,7 @@ in ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -32024,11 +31400,11 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { + (sources."gauge-2.7.2" // { dependencies = [ - sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."supports-color-0.2.0" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -32047,7 +31423,7 @@ in }) sources."once-1.4.0" sources."opener-1.4.2" - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -32056,7 +31432,7 @@ in sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" ]; }) sources."read-cmd-shim-1.0.1" @@ -32136,7 +31512,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -32165,14 +31541,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -32183,9 +31559,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."node-uuid-1.4.7" @@ -32200,7 +31576,7 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.10.0" + sources."retry-0.10.1" sources."rimraf-2.5.4" sources."sha-2.0.1" sources."slide-1.1.6" @@ -32232,7 +31608,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-1.2.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -32263,7 +31639,7 @@ in sources."semver-5.3.0" sources."semver-utils-1.1.1" sources."spawn-please-0.2.0" - (sources."update-notifier-1.0.2" // { + (sources."update-notifier-1.0.3" // { dependencies = [ (sources."boxen-0.6.0" // { dependencies = [ @@ -32271,7 +31647,7 @@ in sources."camelcase-2.1.1" sources."cli-boxes-1.0.0" sources."filled-array-1.1.0" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" (sources."repeating-2.0.1" // { dependencies = [ (sources."is-finite-1.0.2" // { @@ -32291,7 +31667,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) ]; @@ -32312,15 +31688,15 @@ in sources."minimist-0.0.8" ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" sources."os-tmpdir-1.0.2" - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" ]; }) sources."uuid-2.0.3" - (sources."write-file-atomic-1.2.0" // { + (sources."write-file-atomic-1.3.1" // { dependencies = [ sources."imurmurhash-0.1.4" sources."slide-1.1.6" @@ -32346,7 +31722,7 @@ in sources."is-stream-1.1.0" sources."lowercase-keys-1.0.0" sources."node-status-codes-1.0.0" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -32373,7 +31749,7 @@ in sources."util-deprecate-1.0.2" ]; }) - sources."timed-out-3.0.0" + sources."timed-out-3.1.3" sources."unzip-response-1.0.2" (sources."url-parse-lax-1.0.0" // { dependencies = [ @@ -32424,7 +31800,7 @@ in meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; homepage = https://github.com/tjunnone/npm-check-updates; - license = "MIT"; + license = "Apache-2.0"; }; production = true; }; @@ -32444,13 +31820,13 @@ in sources."is-arguments-1.0.2" ]; }) - (sources."body-parser-1.15.2" // { + (sources."body-parser-1.16.0" // { dependencies = [ sources."bytes-2.4.0" sources."content-type-1.0.2" - (sources."debug-2.2.0" // { + (sources."debug-2.6.0" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."depd-1.1.0" @@ -32461,14 +31837,14 @@ in sources."statuses-1.3.1" ]; }) - sources."iconv-lite-0.4.13" + sources."iconv-lite-0.4.15" (sources."on-finished-2.3.0" // { dependencies = [ sources."ee-first-1.1.1" ]; }) - sources."qs-6.2.0" - (sources."raw-body-2.1.7" // { + sources."qs-6.2.1" + (sources."raw-body-2.2.0" // { dependencies = [ sources."unpipe-1.0.0" ]; @@ -32476,9 +31852,9 @@ in (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -32489,9 +31865,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -32499,7 +31875,7 @@ in sources."bytes-2.3.0" (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) (sources."debug-2.2.0" // { @@ -32513,7 +31889,7 @@ in }) (sources."connect-busboy-0.0.2" // { dependencies = [ - (sources."busboy-0.2.13" // { + (sources."busboy-0.2.14" // { dependencies = [ (sources."dicer-0.2.5" // { dependencies = [ @@ -32541,9 +31917,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -32578,10 +31954,10 @@ in }) sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - (sources."proxy-addr-1.1.2" // { + (sources."proxy-addr-1.1.3" // { dependencies = [ sources."forwarded-0.1.0" - sources."ipaddr.js-1.1.1" + sources."ipaddr.js-1.2.0" ]; }) sources."qs-6.2.0" @@ -32604,9 +31980,9 @@ in (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -32658,7 +32034,7 @@ in sources."amdefine-1.0.1" ]; }) - (sources."uglify-js-2.7.4" // { + (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" sources."source-map-0.5.6" @@ -32672,7 +32048,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -32688,7 +32064,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -32790,12 +32166,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -32814,7 +32190,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -32843,14 +32219,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -32861,9 +32237,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -32875,7 +32251,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) sources."semver-5.3.0" @@ -32887,14 +32263,14 @@ in sources."parseurl-1.3.1" ]; }) - (sources."service-runner-2.1.11" // { + (sources."service-runner-2.1.13" // { dependencies = [ - sources."bluebird-3.4.6" + sources."bluebird-3.4.7" (sources."bunyan-1.8.5" // { dependencies = [ (sources."dtrace-provider-0.8.0" // { dependencies = [ - sources."nan-2.4.0" + sources."nan-2.5.0" ]; }) (sources."mv-2.1.1" // { @@ -32938,7 +32314,7 @@ in ]; }) sources."safe-json-stringify-1.0.3" - sources."moment-2.17.0" + sources."moment-2.17.1" ]; }) sources."bunyan-syslog-udp-0.1.0" @@ -32968,19 +32344,7 @@ in sources."ms-0.7.2" (sources."msgpack5-3.4.1" // { dependencies = [ - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."bl-1.2.0" sources."inherits-2.0.3" ]; }) @@ -33005,10 +32369,10 @@ in dependencies = [ (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) - sources."wrap-ansi-2.0.0" + sources."wrap-ansi-2.1.0" ]; }) sources."decamelize-1.2.0" @@ -33110,7 +32474,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) ]; @@ -33134,10 +32498,10 @@ in dependencies = [ (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) - sources."wrap-ansi-2.0.0" + sources."wrap-ansi-2.1.0" ]; }) sources."decamelize-1.2.0" @@ -33239,7 +32603,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) ]; @@ -33266,10 +32630,10 @@ in peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; - version = "0.36.0"; + version = "0.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.0.tgz"; - sha1 = "fe3b087f07389ca1c2fd3d71e38a7971d5508924"; + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz"; + sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14"; }; dependencies = [ (sources."airplayer-2.0.0" // { @@ -33286,12 +32650,13 @@ in sources."big-integer-1.6.17" ]; }) - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -33309,7 +32674,7 @@ in sources."lodash-3.10.1" ]; }) - sources."xmldom-0.1.22" + sources."xmldom-0.1.27" sources."util-deprecate-1.0.2" ]; }) @@ -33346,12 +32711,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -33369,7 +32734,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) ]; @@ -33380,7 +32745,7 @@ in }) (sources."bonjour-3.5.0" // { dependencies = [ - sources."array-flatten-2.1.0" + sources."array-flatten-2.1.1" sources."deep-equal-1.0.1" sources."dns-equal-1.0.0" (sources."dns-txt-2.0.2" // { @@ -33419,7 +32784,7 @@ in sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" ]; }) sources."map-obj-1.0.1" @@ -33444,7 +32809,7 @@ in }) ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" (sources."read-pkg-up-1.0.1" // { dependencies = [ (sources."find-up-1.1.2" // { @@ -33540,7 +32905,7 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -33562,12 +32927,13 @@ in sources."extend-3.0.0" (sources."spawn-sync-1.0.15" // { dependencies = [ - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -33590,17 +32956,17 @@ in (sources."figures-1.7.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" ]; }) - sources."lodash-4.17.2" + sources."lodash-4.17.4" sources."mute-stream-0.0.6" (sources."pinkie-promise-2.0.1" // { dependencies = [ sources."pinkie-2.0.4" ]; }) - (sources."run-async-2.2.0" // { + (sources."run-async-2.3.0" // { dependencies = [ sources."is-promise-2.1.0" ]; @@ -33618,7 +32984,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."through-2.3.8" @@ -33626,8 +32992,8 @@ in }) sources."keypress-0.2.1" sources."mime-1.3.4" - sources."network-address-1.1.0" - sources."numeral-1.5.5" + sources."network-address-1.1.2" + sources."numeral-1.5.6" sources."open-0.0.5" (sources."optimist-0.6.1" // { dependencies = [ @@ -33645,18 +33011,18 @@ in sources."uniq-1.0.1" ]; }) - (sources."parse-torrent-file-4.0.0" // { + (sources."parse-torrent-file-4.0.1" // { dependencies = [ - sources."bencode-0.10.0" - (sources."simple-sha1-2.0.8" // { + sources."bencode-0.11.0" + (sources."simple-sha1-2.1.0" // { dependencies = [ - sources."rusha-0.8.4" + sources."rusha-0.8.5" ]; }) sources."uniq-1.0.1" ]; }) - (sources."simple-get-2.3.0" // { + (sources."simple-get-2.4.0" // { dependencies = [ (sources."once-1.4.0" // { dependencies = [ @@ -33669,7 +33035,7 @@ in }) ]; }) - (sources."pump-1.0.1" // { + (sources."pump-1.0.2" // { dependencies = [ (sources."end-of-stream-1.1.0" // { dependencies = [ @@ -33716,8 +33082,13 @@ in sources."minimist-0.0.8" ]; }) - (sources."random-access-file-1.3.1" // { + (sources."random-access-file-1.4.0" // { dependencies = [ + (sources."debug-2.6.0" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."inherits-2.0.3" ]; }) @@ -33745,9 +33116,9 @@ in (sources."parse-torrent-file-2.1.4" // { dependencies = [ sources."bencode-0.7.0" - (sources."simple-sha1-2.0.8" // { + (sources."simple-sha1-2.1.0" // { dependencies = [ - sources."rusha-0.8.4" + sources."rusha-0.8.5" ]; }) ]; @@ -33833,9 +33204,9 @@ in sources."randombytes-2.0.3" ]; }) - (sources."k-rpc-socket-1.6.0" // { + (sources."k-rpc-socket-1.6.1" // { dependencies = [ - sources."bencode-0.10.0" + sources."bencode-0.11.0" ]; }) ]; @@ -33861,13 +33232,13 @@ in }) sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-get-2.3.0" // { + (sources."simple-get-2.4.0" // { dependencies = [ sources."simple-concat-1.0.0" sources."unzip-response-2.0.1" ]; }) - (sources."simple-peer-6.0.7" // { + (sources."simple-peer-6.2.1" // { dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" @@ -33883,7 +33254,7 @@ in }) ]; }) - (sources."simple-websocket-4.1.0" // { + (sources."simple-websocket-4.2.0" // { dependencies = [ (sources."readable-stream-2.2.2" // { dependencies = [ @@ -33912,7 +33283,7 @@ in }) ]; }) - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -33939,10 +33310,10 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz"; - sha1 = "683d54067d44699b2eff8bfc793e780df2912666"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz"; + sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6"; }; dependencies = [ (sources."connect-multiparty-1.2.5" // { @@ -34079,7 +33450,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."pump-1.0.1" // { + (sources."pump-1.0.2" // { dependencies = [ (sources."end-of-stream-1.1.0" // { dependencies = [ @@ -34116,9 +33487,9 @@ in (sources."parse-torrent-file-2.1.4" // { dependencies = [ sources."bencode-0.7.0" - (sources."simple-sha1-2.0.8" // { + (sources."simple-sha1-2.1.0" // { dependencies = [ - sources."rusha-0.8.4" + sources."rusha-0.8.5" ]; }) ]; @@ -34159,37 +33530,32 @@ in sources."xtend-4.0.1" ]; }) - (sources."socket.io-1.6.0" // { + (sources."socket.io-1.7.2" // { dependencies = [ (sources."debug-2.3.3" // { dependencies = [ sources."ms-0.7.2" ]; }) - (sources."engine.io-1.8.0" // { + (sources."engine.io-1.8.2" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.6.1" ]; }) - sources."base64id-0.1.0" - (sources."engine.io-parser-1.3.1" // { + sources."base64id-1.0.0" + (sources."engine.io-parser-1.3.2" // { dependencies = [ - sources."after-0.8.1" + sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" - (sources."has-binary-0.1.6" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) sources."wtf-8-1.0.0" ]; }) @@ -34209,25 +33575,20 @@ in }) sources."object-assign-4.1.0" sources."socket.io-adapter-0.5.0" - (sources."socket.io-client-1.6.0" // { + (sources."socket.io-client-1.7.2" // { dependencies = [ sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - (sources."engine.io-client-1.8.0" // { + (sources."engine.io-client-1.8.2" // { dependencies = [ sources."component-inherit-0.0.3" - (sources."engine.io-parser-1.3.1" // { + (sources."engine.io-parser-1.3.2" // { dependencies = [ - sources."after-0.8.1" + sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" - (sources."has-binary-0.1.6" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) sources."wtf-8-1.0.0" ]; }) @@ -34296,7 +33657,7 @@ in sources."addr-to-ip-port-1.4.2" sources."bencode-0.7.0" sources."buffer-equal-0.0.1" - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -34308,7 +33669,7 @@ in ]; }) sources."k-bucket-0.5.0" - sources."network-address-1.1.0" + sources."network-address-1.1.2" (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" @@ -34333,7 +33694,7 @@ in sources."bencode-0.6.0" sources."bn.js-1.3.0" sources."buffer-equal-0.0.1" - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -34405,9 +33766,9 @@ in (sources."parse-torrent-file-2.1.4" // { dependencies = [ sources."bencode-0.7.0" - (sources."simple-sha1-2.0.8" // { + (sources."simple-sha1-2.1.0" // { dependencies = [ - sources."rusha-0.8.4" + sources."rusha-0.8.5" ]; }) ]; @@ -34477,7 +33838,7 @@ in dependencies = [ (sources."async-2.1.4" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) (sources."which-1.2.12" // { @@ -34612,15 +33973,15 @@ in dependencies = [ (sources."async-2.1.4" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."node-uuid-1.4.7" @@ -34637,14 +33998,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -34678,12 +34039,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -34702,7 +34063,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -34791,10 +34152,10 @@ in }) sources."private-0.1.6" sources."q-1.4.1" - (sources."recast-0.11.17" // { + (sources."recast-0.11.20" // { dependencies = [ - sources."ast-types-0.9.2" - sources."esprima-3.1.1" + sources."ast-types-0.9.4" + sources."esprima-3.1.3" sources."source-map-0.5.6" ]; }) @@ -34889,7 +34250,7 @@ in ]; }) sources."cookie-signature-1.0.1" - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -34943,12 +34304,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -34967,7 +34328,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -34996,14 +34357,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -35014,9 +34375,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -35028,7 +34389,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) ]; @@ -35038,7 +34399,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) ]; @@ -35090,9 +34451,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.5.3" @@ -35177,9 +34538,9 @@ in (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -35198,24 +34559,24 @@ in }) ]; }) - (sources."body-parser-1.15.2" // { + (sources."body-parser-1.16.0" // { dependencies = [ sources."bytes-2.4.0" sources."content-type-1.0.2" - (sources."debug-2.2.0" // { + (sources."debug-2.6.0" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."depd-1.1.0" - sources."iconv-lite-0.4.13" + sources."iconv-lite-0.4.15" (sources."on-finished-2.3.0" // { dependencies = [ sources."ee-first-1.1.1" ]; }) - sources."qs-6.2.0" - (sources."raw-body-2.1.7" // { + sources."qs-6.2.1" + (sources."raw-body-2.2.0" // { dependencies = [ sources."unpipe-1.0.0" ]; @@ -35223,9 +34584,9 @@ in (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -35236,9 +34597,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.6.1" @@ -35247,7 +34608,7 @@ in sources."bytes-2.3.0" (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) (sources."debug-2.2.0" // { @@ -35305,12 +34666,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -35324,7 +34685,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -35353,14 +34714,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -35371,9 +34732,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -35385,7 +34746,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) sources."async-0.9.2" @@ -35401,7 +34762,7 @@ in dependencies = [ (sources."dtrace-provider-0.8.0" // { dependencies = [ - sources."nan-2.4.0" + sources."nan-2.5.0" ]; }) (sources."mv-2.1.1" // { @@ -35440,7 +34801,7 @@ in ]; }) sources."safe-json-stringify-1.0.3" - sources."moment-2.17.0" + sources."moment-2.17.1" ]; }) (sources."handlebars-2.0.0" // { @@ -35479,7 +34840,7 @@ in sources."uc.micro-1.0.3" ]; }) - (sources."sanitize-html-1.13.0" // { + (sources."sanitize-html-1.14.1" // { dependencies = [ (sources."htmlparser2-3.9.2" // { dependencies = [ @@ -35515,9 +34876,9 @@ in ]; }) sources."jju-1.3.0" - (sources."JSONStream-1.2.1" // { + (sources."JSONStream-1.3.0" // { dependencies = [ - sources."jsonparse-1.2.0" + sources."jsonparse-1.3.0" sources."through-2.3.8" ]; }) @@ -35544,12 +34905,12 @@ in }) (sources."fs-ext-0.5.0" // { dependencies = [ - sources."nan-2.4.0" + sources."nan-2.5.0" ]; }) (sources."crypt3-0.2.0" // { dependencies = [ - sources."nan-2.4.0" + sources."nan-2.5.0" ]; }) ]; @@ -35646,13 +35007,13 @@ in (sources."csv-0.4.6" // { dependencies = [ sources."csv-generate-0.0.6" - sources."csv-parse-1.1.7" + sources."csv-parse-1.1.10" sources."stream-transform-0.1.1" sources."csv-stringify-0.0.8" ]; }) sources."escape-regexp-component-1.0.2" - sources."formidable-1.0.17" + sources."formidable-1.1.1" (sources."http-signature-0.11.0" // { dependencies = [ sources."asn1-0.1.11" @@ -35691,7 +35052,7 @@ in }) (sources."dtrace-provider-0.6.0" // { dependencies = [ - sources."nan-2.4.0" + sources."nan-2.5.0" ]; }) ]; @@ -35700,7 +35061,7 @@ in dependencies = [ (sources."dtrace-provider-0.6.0" // { dependencies = [ - sources."nan-2.4.0" + sources."nan-2.5.0" ]; }) (sources."mv-2.1.1" // { @@ -35786,7 +35147,7 @@ in sources."asn1-0.2.3" sources."assert-plus-0.2.0" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" ]; @@ -35853,7 +35214,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -35934,7 +35295,7 @@ in }) (sources."csso-2.2.1" // { dependencies = [ - (sources."clap-1.1.1" // { + (sources."clap-1.1.2" // { dependencies = [ (sources."chalk-1.1.3" // { dependencies = [ @@ -35942,12 +35303,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -35978,7 +35339,7 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) sources."colors-1.1.2" @@ -36045,7 +35406,7 @@ in dependencies = [ (sources."async-2.1.4" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) ]; @@ -36058,12 +35419,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -36082,7 +35443,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -36111,14 +35472,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -36129,9 +35490,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -36157,7 +35518,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -36173,7 +35534,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -36221,12 +35582,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -36245,7 +35606,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -36274,14 +35635,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -36292,9 +35653,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."node-uuid-1.4.7" @@ -36341,10 +35702,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.0.10"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz"; - sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz"; + sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a"; }; buildInputs = globalBuildInputs; meta = { @@ -36357,10 +35718,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.4"; + version = "2.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz"; - sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; + sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; }; dependencies = [ sources."async-0.2.10" @@ -36375,7 +35736,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -36391,7 +35752,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -36421,15 +35782,15 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "0.10.3"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-0.10.3.tgz"; - sha1 = "7d4635b9a359c8db06c313374544f27a3890f63c"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz"; + sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418"; }; dependencies = [ - sources."async-2.0.1" - sources."bluebird-3.3.5" - sources."blueimp-md5-2.3.1" + sources."async-2.1.4" + sources."bluebird-3.4.7" + sources."blueimp-md5-2.6.0" (sources."body-parser-1.15.2" // { dependencies = [ sources."bytes-2.4.0" @@ -36462,26 +35823,30 @@ in (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; }) ]; }) - (sources."color-0.11.4" // { + (sources."color-1.0.3" // { dependencies = [ - sources."clone-1.0.2" - (sources."color-convert-1.8.2" // { + (sources."color-convert-1.9.0" // { dependencies = [ sources."color-name-1.1.1" ]; }) - (sources."color-string-0.3.0" // { + (sources."color-string-1.4.0" // { dependencies = [ sources."color-name-1.1.1" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.1" + ]; + }) ]; }) ]; @@ -36493,27 +35858,38 @@ in ]; }) sources."crossroads-0.12.2" - (sources."diff2html-1.2.0" // { + (sources."diff2html-2.0.12" // { dependencies = [ - sources."diff-2.2.3" - ]; - }) - (sources."express-4.13.4" // { - dependencies = [ - (sources."accepts-1.2.13" // { + sources."diff-3.2.0" + (sources."hogan.js-3.0.2" // { dependencies = [ - (sources."mime-types-2.1.13" // { + (sources."nopt-1.0.10" // { dependencies = [ - sources."mime-db-1.25.0" + sources."abbrev-1.0.9" ]; }) - sources."negotiator-0.5.3" + sources."mkdirp-0.3.0" + ]; + }) + sources."whatwg-fetch-2.0.2" + ]; + }) + (sources."express-4.14.0" // { + dependencies = [ + (sources."accepts-1.3.3" // { + dependencies = [ + (sources."mime-types-2.1.14" // { + dependencies = [ + sources."mime-db-1.26.0" + ]; + }) + sources."negotiator-0.6.1" ]; }) sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" sources."content-type-1.0.2" - sources."cookie-0.1.5" + sources."cookie-0.3.1" sources."cookie-signature-1.0.6" (sources."debug-2.2.0" // { dependencies = [ @@ -36521,10 +35897,12 @@ in ]; }) sources."depd-1.1.0" + sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.4.1" // { + (sources."finalhandler-0.5.0" // { dependencies = [ + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -36538,46 +35916,47 @@ in }) sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - (sources."proxy-addr-1.0.10" // { + (sources."proxy-addr-1.1.3" // { dependencies = [ sources."forwarded-0.1.0" - sources."ipaddr.js-1.0.5" + sources."ipaddr.js-1.2.0" ]; }) - sources."qs-4.0.0" - sources."range-parser-1.0.3" - (sources."send-0.13.1" // { + sources."qs-6.2.0" + sources."range-parser-1.2.0" + (sources."send-0.14.1" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.3.1" // { + (sources."http-errors-1.5.1" // { dependencies = [ sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" sources."ms-0.7.1" - sources."statuses-1.2.1" + sources."statuses-1.3.1" ]; }) (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) ]; }) sources."utils-merge-1.0.0" - sources."vary-1.0.1" + sources."vary-1.1.0" ]; }) - (sources."express-session-1.13.0" // { + (sources."express-session-1.14.2" // { dependencies = [ - sources."cookie-0.2.3" + sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."crc-3.4.0" + sources."crc-3.4.1" (sources."debug-2.2.0" // { dependencies = [ sources."ms-0.7.1" @@ -36586,9 +35965,10 @@ in sources."depd-1.1.0" sources."on-headers-1.0.1" sources."parseurl-1.3.1" - (sources."uid-safe-2.0.0" // { + (sources."uid-safe-2.1.3" // { dependencies = [ - sources."base64-url-1.2.1" + sources."base64-url-1.3.3" + sources."random-bytes-1.0.0" ]; }) sources."utils-merge-1.0.0" @@ -36713,32 +36093,40 @@ in dependencies = [ sources."eachr-3.2.0" sources."editions-1.3.3" - sources."typechecker-4.4.0" + sources."typechecker-4.4.1" ]; }) ]; }) sources."hasher-1.2.0" + sources."ignore-3.2.0" (sources."keen.io-0.1.3" // { dependencies = [ sources."underscore-1.5.2" ]; }) sources."knockout-3.4.1" - sources."lodash-4.12.0" + sources."lodash-4.17.4" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."moment-2.13.0" - (sources."npm-3.9.6" // { + sources."moment-2.17.1" + (sources."npm-4.1.2" // { dependencies = [ + (sources."JSONStream-1.3.0" // { + dependencies = [ + sources."jsonparse-1.3.0" + sources."through-2.3.8" + ]; + }) sources."abbrev-1.0.9" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" + sources."asap-2.0.5" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" (sources."columnify-1.5.4" // { @@ -36759,16 +36147,12 @@ in sources."proto-list-1.2.4" ]; }) - (sources."dezalgo-1.0.3" // { - dependencies = [ - sources."asap-2.0.5" - ]; - }) + sources."dezalgo-1.0.3" sources."editor-1.0.0" sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - (sources."fstream-npm-1.1.1" // { + (sources."fstream-npm-1.2.0" // { dependencies = [ (sources."fstream-ignore-1.0.5" // { dependencies = [ @@ -36786,7 +36170,7 @@ in }) ]; }) - (sources."glob-7.0.6" // { + (sources."glob-7.1.1" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."minimatch-3.0.3" // { @@ -36829,83 +36213,71 @@ in sources."promzard-0.3.0" ]; }) - sources."lockfile-1.0.2" + sources."lockfile-1.0.3" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" ]; }) - (sources."lodash.clonedeep-4.3.2" // { + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" + (sources."mississippi-1.2.0" // { dependencies = [ - sources."lodash._baseclone-4.5.7" - ]; - }) - (sources."lodash.union-4.4.0" // { - dependencies = [ - sources."lodash._baseflatten-4.2.1" - sources."lodash.rest-4.0.5" - ]; - }) - sources."lodash.uniq-4.3.0" - (sources."lodash.without-4.2.0" // { - dependencies = [ - (sources."lodash._basedifference-4.5.0" // { + (sources."concat-stream-1.6.0" // { dependencies = [ - sources."lodash._root-3.0.1" + sources."typedarray-0.0.6" + ]; + }) + (sources."duplexify-3.5.0" // { + dependencies = [ + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."stream-shift-1.0.0" + ]; + }) + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."flush-write-stream-1.0.2" + sources."from2-2.3.0" + sources."pump-1.0.2" + sources."pumpify-1.3.5" + (sources."stream-each-1.2.0" // { + dependencies = [ + sources."stream-shift-1.0.0" + ]; + }) + (sources."through2-2.0.3" // { + dependencies = [ + sources."xtend-4.0.1" ]; }) - sources."lodash.rest-4.0.5" ]; }) - (sources."node-gyp-3.3.1" // { + (sources."node-gyp-3.5.0" // { dependencies = [ - (sources."glob-4.5.3" // { + (sources."minimatch-3.0.3" // { dependencies = [ - (sources."minimatch-2.0.10" // { + (sources."brace-expansion-1.1.6" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."minimatch-1.0.0" // { - dependencies = [ - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" - ]; - }) - (sources."path-array-1.0.1" // { - dependencies = [ - (sources."array-index-1.0.0" // { - dependencies = [ - (sources."debug-2.3.3" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."es6-symbol-3.1.0" // { - dependencies = [ - sources."d-0.1.1" - (sources."es5-ext-0.10.12" // { - dependencies = [ - sources."es6-iterator-2.0.0" - ]; - }) - ]; - }) + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" ]; }) ]; }) + sources."nopt-3.0.6" ]; }) - sources."nopt-3.0.6" + sources."nopt-4.0.1" sources."normalize-git-url-3.0.2" (sources."normalize-package-data-2.3.5" // { dependencies = [ @@ -36918,28 +36290,40 @@ in }) sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" - sources."npm-package-arg-4.1.1" + sources."npm-package-arg-4.2.0" sources."npm-user-validate-0.1.5" - (sources."npmlog-2.0.4" // { + (sources."npmlog-4.0.2" // { dependencies = [ - sources."ansi-0.3.1" (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" ]; }) - (sources."gauge-1.2.7" // { + sources."console-control-strings-1.1.0" + (sources."gauge-2.7.2" // { dependencies = [ - sources."lodash.pad-4.5.1" - sources."lodash.padend-4.6.1" - sources."lodash.padstart-4.6.1" + sources."supports-color-0.2.0" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + sources."wide-align-1.1.0" ]; }) + sources."set-blocking-2.0.0" ]; }) - sources."once-1.3.3" + sources."once-1.4.0" sources."opener-1.4.2" - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-tmpdir-1.0.2" ]; @@ -36947,7 +36331,7 @@ in sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" ]; }) sources."read-cmd-shim-1.0.1" @@ -36981,7 +36365,7 @@ in ]; }) sources."read-package-tree-5.1.5" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -36992,23 +36376,10 @@ in ]; }) sources."realize-package-specifier-3.0.3" - (sources."request-2.72.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -37017,7 +36388,11 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + (sources."form-data-2.1.2" // { + dependencies = [ + sources."asynckit-0.4.0" + ]; + }) (sources."har-validator-2.0.6" // { dependencies = [ (sources."chalk-1.1.3" // { @@ -37041,7 +36416,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -37070,14 +36445,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -37088,23 +36463,46 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.1.0" + sources."qs-6.3.0" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" + (sources."tough-cookie-2.3.2" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.9.0" + sources."retry-0.10.1" sources."sha-2.0.1" sources."slide-1.1.6" sources."sorted-object-2.0.1" + (sources."sorted-union-stream-2.1.3" // { + dependencies = [ + (sources."from2-1.3.0" // { + dependencies = [ + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) + ]; + }) + (sources."stream-iterate-1.2.0" // { + dependencies = [ + sources."stream-shift-1.0.0" + ]; + }) + ]; + }) sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -37120,6 +36518,7 @@ in ]; }) sources."unpipe-1.0.0" + sources."uuid-3.0.1" (sources."validate-npm-package-name-2.2.2" // { dependencies = [ sources."builtins-0.0.7" @@ -37131,8 +36530,8 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" - sources."ansi-regex-2.0.0" + sources."write-file-atomic-1.3.1" + sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -37154,15 +36553,15 @@ in }) ]; }) - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.4.5" // { dependencies = [ - sources."chownr-1.0.1" - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -37228,12 +36627,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -37252,7 +36651,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -37281,14 +36680,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -37299,9 +36698,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -37313,12 +36712,12 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) - sources."retry-0.8.0" + sources."retry-0.10.1" sources."slide-1.1.6" - (sources."npmlog-3.1.2" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -37337,13 +36736,13 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.2" // { dependencies = [ sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -37356,7 +36755,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -37381,12 +36780,13 @@ in sources."passport-strategy-1.0.0" ]; }) - (sources."raven-0.11.0" // { + (sources."raven-1.1.1" // { dependencies = [ - sources."cookie-0.1.0" + sources."cookie-0.3.1" + sources."json-stringify-safe-5.0.1" sources."lsmod-1.0.0" - sources."node-uuid-1.4.7" - sources."stack-trace-0.0.7" + sources."uuid-3.0.0" + sources."stack-trace-0.0.9" ]; }) (sources."rc-1.1.6" // { @@ -37428,21 +36828,23 @@ in }) ]; }) - sources."semver-5.1.1" - (sources."serve-static-1.10.3" // { + sources."semver-5.3.0" + (sources."serve-static-1.11.1" // { dependencies = [ + sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."parseurl-1.3.1" - (sources."send-0.13.2" // { + (sources."send-0.14.1" // { dependencies = [ sources."debug-2.2.0" sources."depd-1.1.0" sources."destroy-1.0.4" sources."etag-1.7.0" sources."fresh-0.3.0" - (sources."http-errors-1.3.1" // { + (sources."http-errors-1.5.1" // { dependencies = [ sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" @@ -37452,8 +36854,8 @@ in sources."ee-first-1.1.1" ]; }) - sources."range-parser-1.0.3" - sources."statuses-1.2.1" + sources."range-parser-1.2.0" + sources."statuses-1.3.1" ]; }) ]; @@ -37464,105 +36866,100 @@ in sources."eve-0.4.2" ]; }) - (sources."socket.io-1.4.8" // { + (sources."socket.io-1.7.2" // { dependencies = [ - (sources."engine.io-1.6.11" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."base64id-0.1.0" - (sources."ws-1.1.0" // { + sources."ms-0.7.2" + ]; + }) + (sources."engine.io-1.8.2" // { + dependencies = [ + (sources."accepts-1.3.3" // { + dependencies = [ + (sources."mime-types-2.1.14" // { + dependencies = [ + sources."mime-db-1.26.0" + ]; + }) + sources."negotiator-0.6.1" + ]; + }) + sources."base64id-1.0.0" + (sources."engine.io-parser-1.3.2" // { + dependencies = [ + sources."after-0.8.2" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + sources."wtf-8-1.0.0" + ]; + }) + (sources."ws-1.1.1" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" ]; }) - (sources."engine.io-parser-1.2.4" // { - dependencies = [ - sources."after-0.8.1" - sources."arraybuffer.slice-0.0.6" - sources."base64-arraybuffer-0.1.2" - sources."blob-0.0.4" - (sources."has-binary-0.1.6" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) - sources."utf8-2.1.0" - ]; - }) - (sources."accepts-1.1.4" // { - dependencies = [ - (sources."mime-types-2.0.14" // { - dependencies = [ - sources."mime-db-1.12.0" - ]; - }) - sources."negotiator-0.4.9" - ]; - }) + sources."cookie-0.3.1" ]; }) - (sources."socket.io-parser-2.2.6" // { + (sources."has-binary-0.1.7" // { dependencies = [ - sources."json3-3.3.2" - sources."component-emitter-1.1.2" sources."isarray-0.0.1" - sources."benchmark-1.0.0" ]; }) - (sources."socket.io-client-1.4.8" // { + sources."object-assign-4.1.0" + sources."socket.io-adapter-0.5.0" + (sources."socket.io-client-1.7.2" // { dependencies = [ - (sources."engine.io-client-1.6.11" // { + sources."backo2-1.0.2" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + (sources."engine.io-client-1.8.2" // { dependencies = [ + sources."component-inherit-0.0.3" + (sources."engine.io-parser-1.3.2" // { + dependencies = [ + sources."after-0.8.2" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + sources."wtf-8-1.0.0" + ]; + }) sources."has-cors-1.1.0" - (sources."ws-1.0.1" // { + (sources."parsejson-0.0.3" // { + dependencies = [ + (sources."better-assert-1.0.2" // { + dependencies = [ + sources."callsite-1.0.0" + ]; + }) + ]; + }) + (sources."parseqs-0.0.5" // { + dependencies = [ + (sources."better-assert-1.0.2" // { + dependencies = [ + sources."callsite-1.0.0" + ]; + }) + ]; + }) + (sources."ws-1.1.1" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" ]; }) - sources."xmlhttprequest-ssl-1.5.1" - sources."component-emitter-1.1.2" - (sources."engine.io-parser-1.2.4" // { - dependencies = [ - sources."after-0.8.1" - sources."arraybuffer.slice-0.0.6" - sources."base64-arraybuffer-0.1.2" - sources."blob-0.0.4" - (sources."has-binary-0.1.6" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) - sources."utf8-2.1.0" - ]; - }) - (sources."parsejson-0.0.1" // { - dependencies = [ - (sources."better-assert-1.0.2" // { - dependencies = [ - sources."callsite-1.0.0" - ]; - }) - ]; - }) - (sources."parseqs-0.0.2" // { - dependencies = [ - (sources."better-assert-1.0.2" // { - dependencies = [ - sources."callsite-1.0.0" - ]; - }) - ]; - }) - sources."component-inherit-0.0.3" + sources."xmlhttprequest-ssl-1.5.3" sources."yeast-0.1.2" ]; }) - sources."component-bind-1.0.0" - sources."component-emitter-1.2.0" - sources."object-component-0.0.3" sources."indexof-0.0.1" - (sources."parseuri-0.0.4" // { + sources."object-component-0.0.3" + (sources."parseuri-0.0.5" // { dependencies = [ (sources."better-assert-1.0.2" // { dependencies = [ @@ -37572,32 +36969,20 @@ in ]; }) sources."to-array-0.1.4" - sources."backo2-1.0.2" ]; }) - (sources."socket.io-adapter-0.4.0" // { + (sources."socket.io-parser-2.3.1" // { dependencies = [ - (sources."socket.io-parser-2.2.2" // { + (sources."debug-2.2.0" // { dependencies = [ - sources."debug-0.7.4" - sources."json3-3.2.6" - sources."component-emitter-1.1.2" - sources."isarray-0.0.1" - sources."benchmark-1.0.0" + sources."ms-0.7.1" ]; }) - ]; - }) - (sources."has-binary-0.1.7" // { - dependencies = [ + sources."json3-3.3.2" + sources."component-emitter-1.1.2" sources."isarray-0.0.1" ]; }) - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) ]; }) (sources."superagent-0.21.0" // { @@ -37608,7 +36993,7 @@ in sources."component-emitter-1.1.2" sources."methods-1.0.1" sources."cookiejar-2.0.1" - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -37641,32 +37026,31 @@ in sources."rimraf-2.2.8" ]; }) - (sources."winston-2.2.0" // { + (sources."winston-2.3.1" // { dependencies = [ sources."async-1.0.0" sources."colors-1.0.3" sources."cycle-1.0.3" sources."eyes-0.1.8" sources."isstream-0.1.2" - sources."pkginfo-0.3.1" sources."stack-trace-0.0.9" ]; }) - (sources."yargs-4.7.1" // { + (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" (sources."cliui-3.2.0" // { dependencies = [ (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) - sources."wrap-ansi-2.0.0" + sources."wrap-ansi-2.1.0" ]; }) sources."decamelize-1.2.0" - sources."lodash.assign-4.2.0" + sources."get-caller-file-1.0.2" (sources."os-locale-1.4.0" // { dependencies = [ (sources."lcid-1.0.0" // { @@ -37676,47 +37060,6 @@ in }) ]; }) - (sources."pkg-conf-1.1.3" // { - dependencies = [ - (sources."find-up-1.1.2" // { - dependencies = [ - sources."path-exists-2.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.0" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) - ]; - }) - sources."object-assign-4.1.0" - sources."symbol-0.2.3" - ]; - }) (sources."read-pkg-up-1.0.1" // { dependencies = [ (sources."find-up-1.1.2" // { @@ -37791,8 +37134,9 @@ in }) ]; }) + sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."set-blocking-1.0.0" + sources."set-blocking-2.0.0" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -37803,14 +37147,14 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) ]; }) - sources."window-size-0.2.0" + sources."which-module-1.0.0" sources."y18n-3.2.1" - sources."yargs-parser-2.4.1" + sources."yargs-parser-4.2.1" ]; }) ]; @@ -37967,15 +37311,15 @@ in dependencies = [ (sources."async-2.1.4" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."node-uuid-1.4.7" @@ -37992,14 +37336,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -38033,12 +37377,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -38057,7 +37401,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -38104,12 +37448,13 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "1.13.3"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-1.13.3.tgz"; - sha1 = "e79c46fe5a37c5ca70084ba0894c595cdcb42815"; + url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz"; + sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823"; }; dependencies = [ + sources."acorn-3.3.0" sources."async-1.5.2" sources."clone-1.0.2" (sources."enhanced-resolve-0.9.1" // { @@ -38118,14 +37463,13 @@ in sources."graceful-fs-4.1.11" ]; }) - sources."acorn-3.3.0" sources."interpret-0.6.6" (sources."loader-utils-0.2.16" // { dependencies = [ sources."big.js-3.1.3" sources."emojis-list-2.1.0" - sources."json5-0.5.0" - sources."object-assign-4.1.0" + sources."json5-0.5.1" + sources."object-assign-4.1.1" ]; }) (sources."memory-fs-0.3.0" // { @@ -38153,7 +37497,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."node-libs-browser-0.6.0" // { + (sources."node-libs-browser-0.7.0" // { dependencies = [ sources."assert-1.4.1" (sources."browserify-zlib-0.1.4" // { @@ -38173,44 +37517,58 @@ in sources."date-now-0.1.4" ]; }) - sources."constants-browserify-0.0.1" - (sources."crypto-browserify-3.2.8" // { + sources."constants-browserify-1.0.0" + (sources."crypto-browserify-3.3.0" // { dependencies = [ sources."pbkdf2-compat-2.0.1" sources."ripemd160-0.2.0" sources."sha.js-2.2.6" + (sources."browserify-aes-0.4.0" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) ]; }) sources."domain-browser-1.1.7" sources."events-1.1.1" - (sources."http-browserify-1.7.0" // { - dependencies = [ - sources."Base64-0.2.1" - sources."inherits-2.0.3" - ]; - }) - sources."https-browserify-0.0.0" - sources."os-browserify-0.1.2" + sources."https-browserify-0.0.1" + sources."os-browserify-0.2.1" sources."path-browserify-0.0.0" sources."process-0.11.9" sources."punycode-1.4.1" sources."querystring-es3-0.2.1" - (sources."readable-stream-1.1.14" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."isarray-0.0.1" + sources."isarray-1.0.0" + sources."inherits-2.0.3" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + ]; + }) + (sources."stream-browserify-2.0.1" // { + dependencies = [ sources."inherits-2.0.3" ]; }) - (sources."stream-browserify-1.0.0" // { + (sources."stream-http-2.6.3" // { dependencies = [ + sources."builtin-status-codes-3.0.0" sources."inherits-2.0.3" + sources."to-arraybuffer-1.0.1" + sources."xtend-4.0.1" ]; }) sources."string_decoder-0.10.31" - sources."timers-browserify-1.4.2" + (sources."timers-browserify-2.0.2" // { + dependencies = [ + sources."setimmediate-1.0.5" + ]; + }) sources."tty-browserify-0.0.0" - (sources."url-0.10.3" // { + (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" sources."querystring-0.2.0" @@ -38234,13 +37592,13 @@ in sources."minimist-0.0.10" ]; }) - (sources."supports-color-3.1.2" // { + (sources."supports-color-3.2.3" // { dependencies = [ sources."has-flag-1.0.0" ]; }) sources."tapable-0.1.10" - (sources."uglify-js-2.7.4" // { + (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" sources."source-map-0.5.6" @@ -38254,7 +37612,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -38270,7 +37628,7 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -38318,7 +37676,7 @@ in sources."isarray-1.0.0" ]; }) - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" ]; }) @@ -38336,7 +37694,7 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; @@ -38373,7 +37731,7 @@ in sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ - sources."binary-extensions-1.7.0" + sources."binary-extensions-1.8.0" ]; }) (sources."is-glob-2.0.1" // { @@ -38407,17 +37765,17 @@ in sources."set-immediate-shim-1.0.1" ]; }) - (sources."fsevents-1.0.15" // { + (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.4.0" - (sources."node-pre-gyp-0.6.31" // { + sources."nan-2.5.0" + (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."nopt-3.0.6" // { dependencies = [ sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -38435,13 +37793,13 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { + (sources."gauge-2.7.2" // { dependencies = [ sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -38454,7 +37812,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -38496,12 +37854,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -38520,7 +37878,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -38549,14 +37907,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -38567,9 +37925,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -38581,7 +37939,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) (sources."rimraf-2.5.4" // { @@ -38669,14 +38027,14 @@ in sources."graceful-fs-4.1.11" ]; }) - (sources."webpack-core-0.6.8" // { + (sources."webpack-core-0.6.9" // { dependencies = [ (sources."source-map-0.4.4" // { dependencies = [ sources."amdefine-1.0.1" ]; }) - sources."source-list-map-0.1.6" + sources."source-list-map-0.1.8" ]; }) ]; @@ -38707,16 +38065,16 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.17.8"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz"; - sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.19.1.tgz"; + sha1 = "102ca03ce7fc910a73f719c70bba9e9f9e3b2b4d"; }; dependencies = [ - (sources."babel-runtime-6.18.0" // { + (sources."babel-runtime-6.22.0" // { dependencies = [ sources."core-js-2.4.1" - sources."regenerator-runtime-0.9.6" + sources."regenerator-runtime-0.10.1" ]; }) sources."bytes-2.4.0" @@ -38727,12 +38085,12 @@ in sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -38748,8 +38106,8 @@ in sources."graceful-readlink-1.0.1" ]; }) - sources."death-1.0.0" - (sources."debug-2.3.3" // { + sources."death-1.1.0" + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -38781,12 +38139,13 @@ in sources."extend-3.0.0" (sources."spawn-sync-1.0.15" // { dependencies = [ - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { + (sources."readable-stream-2.2.2" // { dependencies = [ + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -38809,17 +38168,17 @@ in (sources."figures-1.7.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" ]; }) - sources."lodash-4.17.2" + sources."lodash-4.17.4" sources."mute-stream-0.0.6" (sources."pinkie-promise-2.0.1" // { dependencies = [ sources."pinkie-2.0.4" ]; }) - (sources."run-async-2.2.0" // { + (sources."run-async-2.3.0" // { dependencies = [ sources."is-promise-2.1.0" ]; @@ -38837,7 +38196,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."through-2.3.8" @@ -38845,9 +38204,9 @@ in }) (sources."invariant-2.2.2" // { dependencies = [ - (sources."loose-envify-1.3.0" // { + (sources."loose-envify-1.3.1" // { dependencies = [ - sources."js-tokens-2.0.0" + sources."js-tokens-3.0.0" ]; }) ]; @@ -38870,7 +38229,7 @@ in sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" ]; }) (sources."minimatch-3.0.3" // { @@ -38888,12 +38247,12 @@ in sources."minimist-0.0.8" ]; }) - (sources."node-emoji-1.4.1" // { + (sources."node-emoji-1.5.1" // { dependencies = [ sources."string.prototype.codepointat-0.2.0" ]; }) - (sources."node-gyp-3.4.0" // { + (sources."node-gyp-3.5.0" // { dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ @@ -38923,7 +38282,7 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-3.1.2" // { + (sources."npmlog-4.0.2" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -38942,13 +38301,13 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.2" // { dependencies = [ sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { dependencies = [ sources."code-point-at-1.1.0" @@ -38961,7 +38320,7 @@ in }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."wide-align-1.1.0" @@ -38970,30 +38329,12 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."osenv-0.1.3" // { + (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" ]; }) - (sources."path-array-1.0.1" // { - dependencies = [ - (sources."array-index-1.0.0" // { - dependencies = [ - (sources."es6-symbol-3.1.0" // { - dependencies = [ - sources."d-0.1.1" - (sources."es5-ext-0.10.12" // { - dependencies = [ - sources."es6-iterator-2.0.0" - ]; - }) - ]; - }) - ]; - }) - ]; - }) (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" @@ -39002,17 +38343,15 @@ in ]; }) sources."object-path-0.11.3" - (sources."proper-lockfile-1.2.0" // { + (sources."proper-lockfile-2.0.0" // { dependencies = [ - sources."err-code-1.1.1" - sources."extend-3.0.0" sources."graceful-fs-4.1.11" - sources."retry-0.10.0" + sources."retry-0.10.1" ]; }) (sources."read-1.0.7" // { dependencies = [ - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" ]; }) (sources."repeating-2.0.1" // { @@ -39051,7 +38390,7 @@ in sources."is-property-1.0.2" ]; }) - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -39080,14 +38419,14 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -39098,9 +38437,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.13" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" @@ -39112,7 +38451,7 @@ in ]; }) sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" ]; }) sources."request-capture-har-1.1.4" @@ -39157,20 +38496,7 @@ in }) (sources."tar-stream-1.5.2" // { dependencies = [ - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."bl-1.2.0" (sources."end-of-stream-1.1.0" // { dependencies = [ (sources."once-1.3.3" // { diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 2132aff9dd03..7de48f6c175f 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.0. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -76,13 +76,13 @@ let sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; }; }; - "resolve-1.1.7" = { + "resolve-1.2.0" = { name = "resolve"; packageName = "resolve"; - version = "1.1.7"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz"; + sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c"; }; }; "global-paths-0.1.2" = { @@ -274,13 +274,13 @@ let sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe"; }; }; - "global-prefix-0.1.4" = { + "global-prefix-0.1.5" = { name = "global-prefix"; packageName = "global-prefix"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz"; - sha1 = "05158db1cde2dd491b455e290eb3ab8bfc45c6e1"; + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz"; + sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"; }; }; "is-windows-0.2.0" = { @@ -292,6 +292,15 @@ let sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; }; }; + "homedir-polyfill-1.0.1" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; + sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + }; + }; "ini-1.3.4" = { name = "ini"; packageName = "ini"; @@ -301,15 +310,6 @@ let sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; }; }; - "osenv-0.1.3" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz"; - sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; - }; - }; "which-1.2.12" = { name = "which"; packageName = "which"; @@ -319,22 +319,13 @@ let sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; }; }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; + "parse-passwd-1.0.0" = { + name = "parse-passwd"; + packageName = "parse-passwd"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; "isexe-1.1.2" = { @@ -409,13 +400,13 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-cdn-0.2.1" = { + "azure-arm-cdn-1.0.0" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; - version = "0.2.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-0.2.1.tgz"; - sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a"; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz"; + sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85"; }; }; "azure-arm-commerce-0.2.0" = { @@ -427,13 +418,31 @@ let sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; }; }; - "azure-arm-compute-0.19.0" = { + "azure-arm-compute-0.19.1" = { name = "azure-arm-compute"; packageName = "azure-arm-compute"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.0.tgz"; - sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e"; + url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz"; + sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd"; + }; + }; + "azure-arm-datalake-analytics-1.0.1-preview" = { + name = "azure-arm-datalake-analytics"; + packageName = "azure-arm-datalake-analytics"; + version = "1.0.1-preview"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.1-preview.tgz"; + sha1 = "75461904000427e12ce11d634d74c052c86de994"; + }; + }; + "azure-arm-datalake-store-1.0.1-preview" = { + name = "azure-arm-datalake-store"; + packageName = "azure-arm-datalake-store"; + version = "1.0.1-preview"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.1-preview.tgz"; + sha1 = "bd07cbeb5eb355a00b7bed69e198a1a968115dd5"; }; }; "azure-arm-hdinsight-0.2.2" = { @@ -535,24 +544,6 @@ let sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02"; }; }; - "azure-arm-datalake-analytics-0.4.3" = { - name = "azure-arm-datalake-analytics"; - packageName = "azure-arm-datalake-analytics"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-0.4.3.tgz"; - sha1 = "10c81e59d3064289a42ab37fea805a334333ed91"; - }; - }; - "azure-arm-datalake-store-0.4.2" = { - name = "azure-arm-datalake-store"; - packageName = "azure-arm-datalake-store"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-0.4.2.tgz"; - sha1 = "479f4a28986c9737b8fef14090c0c7ccc33cb123"; - }; - }; "azure-arm-devtestlabs-0.1.0" = { name = "azure-arm-devtestlabs"; packageName = "azure-arm-devtestlabs"; @@ -643,13 +634,13 @@ let sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; }; }; - "azure-arm-resource-1.4.5-preview" = { + "azure-arm-resource-1.6.1-preview" = { name = "azure-arm-resource"; packageName = "azure-arm-resource"; - version = "1.4.5-preview"; + version = "1.6.1-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.5-preview.tgz"; - sha1 = "166934783752607e9a4128ea0ad715b9b7a9015f"; + url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz"; + sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; }; }; "azure-arm-storage-0.13.1-preview" = { @@ -742,13 +733,13 @@ let sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e"; }; }; - "applicationinsights-0.15.12" = { + "applicationinsights-0.16.0" = { name = "applicationinsights"; packageName = "applicationinsights"; - version = "0.15.12"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.15.12.tgz"; - sha1 = "d03f282da9424f33729eb7da8279e8e8a20dc7fc"; + url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz"; + sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3"; }; }; "caller-id-0.1.0" = { @@ -868,13 +859,13 @@ let sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a"; }; }; - "moment-2.17.0" = { + "moment-2.17.1" = { name = "moment"; packageName = "moment"; - version = "2.17.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz"; - sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f"; + url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; + sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; }; }; "ms-rest-1.15.2" = { @@ -904,15 +895,6 @@ let sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; }; }; - "node-uuid-1.2.0" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz"; - sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b"; - }; - }; "omelette-0.1.0" = { name = "omelette"; packageName = "omelette"; @@ -1039,6 +1021,15 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; + "uuid-3.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; + sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; + }; + }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -1120,13 +1111,13 @@ let sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; }; }; - "xmldom-0.1.22" = { + "xmldom-0.1.27" = { name = "xmldom"; packageName = "xmldom"; - version = "0.1.22"; + version = "0.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz"; - sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"; + sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; }; }; "xpath.js-1.0.7" = { @@ -1147,13 +1138,13 @@ let sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb"; }; }; - "jwa-1.1.4" = { + "jwa-1.1.5" = { name = "jwa"; packageName = "jwa"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz"; - sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e"; + url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz"; + sha1 = "a0552ce0220742cd52e153774a32905c30e756e5"; }; }; "safe-buffer-5.0.1" = { @@ -1174,22 +1165,13 @@ let sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; }; }; - "ecdsa-sig-formatter-1.0.7" = { + "ecdsa-sig-formatter-1.0.9" = { name = "ecdsa-sig-formatter"; packageName = "ecdsa-sig-formatter"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz"; - sha1 = "3137e976a1d6232517e2513e04e32f79bcbdf126"; - }; - }; - "base64-url-1.3.3" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; - sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz"; + sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1"; }; }; "xml2js-0.2.7" = { @@ -1831,13 +1813,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.13" = { + "mime-types-2.1.14" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.13"; + version = "2.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz"; - sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; + sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; }; }; "oauth-sign-0.8.2" = { @@ -1903,13 +1885,13 @@ let sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; }; }; - "lodash-4.17.2" = { + "lodash-4.17.4" = { name = "lodash"; packageName = "lodash"; - version = "4.17.2"; + version = "4.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz"; - sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; + sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; }; }; "chalk-1.1.3" = { @@ -1993,13 +1975,13 @@ let sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; }; }; - "ansi-regex-2.0.0" = { + "ansi-regex-2.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; - sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; "graceful-readlink-1.0.1" = { @@ -2029,13 +2011,13 @@ let sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; }; }; - "jsonpointer-4.0.0" = { + "jsonpointer-4.0.1" = { name = "jsonpointer"; packageName = "jsonpointer"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz"; - sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5"; + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; + sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; }; }; "xtend-4.0.1" = { @@ -2119,13 +2101,13 @@ let sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; }; }; - "sshpk-1.10.1" = { + "sshpk-1.10.2" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz"; - sha1 = "30e1a5d329244974a1af61511339d595af6638b0"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"; + sha1 = "d5a804ce22695515638e798dbe23273de070a5fa"; }; }; "extsprintf-1.0.2" = { @@ -2173,13 +2155,13 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "dashdash-1.14.0" = { + "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"; - sha1 = "29e486c5418bf0f356034a993d51686a33e84141"; + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; "getpass-0.1.6" = { @@ -2200,13 +2182,13 @@ let sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; }; }; - "tweetnacl-0.14.3" = { + "tweetnacl-0.14.5" = { name = "tweetnacl"; packageName = "tweetnacl"; - version = "0.14.3"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; - sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; "jodid25519-1.0.2" = { @@ -2236,13 +2218,13 @@ let sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; }; }; - "mime-db-1.25.0" = { + "mime-db-1.26.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz"; - sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; + sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; }; }; "punycode-1.4.1" = { @@ -2299,13 +2281,13 @@ let sha1 = "0c989774f2870c69378aa665648cdc60f343aa53"; }; }; - "concat-stream-1.5.2" = { + "concat-stream-1.6.0" = { name = "concat-stream"; packageName = "concat-stream"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; - sha1 = "708978624d856af41a5a741defdd261da752c266"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; + sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; }; }; "http-response-object-1.1.0" = { @@ -2335,6 +2317,24 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; + "readable-stream-2.2.2" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; + sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; + }; + }; + "buffer-shims-1.0.0" = { + name = "buffer-shims"; + packageName = "buffer-shims"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; + sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + }; + }; "http-basic-2.5.1" = { name = "http-basic"; packageName = "http-basic"; @@ -2362,6 +2362,15 @@ let sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; }; }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; "async-1.0.0" = { name = "async"; packageName = "async"; @@ -2380,13 +2389,13 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; - "mute-stream-0.0.6" = { + "mute-stream-0.0.7" = { name = "mute-stream"; packageName = "mute-stream"; - version = "0.0.6"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; - sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; }; }; "argparse-1.0.4" = { @@ -2677,15 +2686,6 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "readable-stream-2.2.2" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; - sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; - }; - }; "stream-shift-1.0.0" = { name = "stream-shift"; packageName = "stream-shift"; @@ -2704,15 +2704,6 @@ let sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; }; }; - "buffer-shims-1.0.0" = { - name = "buffer-shims"; - packageName = "buffer-shims"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; - sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; - }; - }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -2767,13 +2758,13 @@ let sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; }; }; - "object-assign-4.1.0" = { + "object-assign-4.1.1" = { name = "object-assign"; packageName = "object-assign"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; - sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; "read-pkg-up-1.0.1" = { @@ -2821,13 +2812,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "signal-exit-3.0.1" = { + "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; - sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; "array-find-index-1.0.2" = { @@ -3118,13 +3109,13 @@ let sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "debug-2.3.3" = { + "debug-2.6.0" = { name = "debug"; packageName = "debug"; - version = "2.3.3"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; - sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; + sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; }; }; "ms-0.7.2" = { @@ -3136,6 +3127,15 @@ let sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; "rimraf-2.2.8" = { name = "rimraf"; packageName = "rimraf"; @@ -3145,22 +3145,22 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "JSONStream-1.2.1" = { + "JSONStream-1.3.0" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; - sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; - }; - }; - "assert-1.3.0" = { - name = "assert"; - packageName = "assert"; version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; - sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz"; + sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5"; + }; + }; + "assert-1.4.1" = { + name = "assert"; + packageName = "assert"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; + sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; }; }; "browser-pack-6.0.2" = { @@ -3208,6 +3208,15 @@ let sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4"; }; }; + "concat-stream-1.5.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; + }; + }; "console-browserify-1.1.0" = { name = "console-browserify"; packageName = "console-browserify"; @@ -3280,15 +3289,6 @@ let sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; }; }; - "glob-5.0.15" = { - name = "glob"; - packageName = "glob"; - version = "5.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; - sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; - }; - }; "has-1.0.1" = { name = "has"; packageName = "has"; @@ -3424,13 +3424,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.5.0" = { + "stream-http-2.6.3" = { name = "stream-http"; packageName = "stream-http"; - version = "2.5.0"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz"; - sha1 = "585eee513217ed98fe199817e7313b6f772a6802"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz"; + sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"; }; }; "subarg-1.0.0" = { @@ -3451,13 +3451,13 @@ let sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710"; }; }; - "through2-2.0.1" = { + "through2-2.0.3" = { name = "through2"; packageName = "through2"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz"; - sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9"; + url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; + sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; }; }; "timers-browserify-1.4.2" = { @@ -3505,6 +3505,15 @@ let sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; }; }; + "jsonparse-1.3.0" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz"; + sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8"; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -3568,6 +3577,15 @@ let sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; }; }; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -3802,13 +3820,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "asn1.js-4.9.0" = { + "asn1.js-4.9.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.9.0"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz"; - sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz"; + sha1 = "48ba240b45a9280e94748990ba597d216617fd40"; }; }; "ripemd160-1.0.1" = { @@ -3973,13 +3991,13 @@ let sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; }; }; - "builtin-status-codes-2.0.0" = { + "builtin-status-codes-3.0.0" = { name = "builtin-status-codes"; packageName = "builtin-status-codes"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz"; - sha1 = "6f22003baacf003ccd287afe6872151fddc58579"; + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; "to-arraybuffer-1.0.1" = { @@ -4045,13 +4063,13 @@ let sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395"; }; }; - "castv2-client-1.1.2" = { + "castv2-client-1.2.0" = { name = "castv2-client"; packageName = "castv2-client"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.1.2.tgz"; - sha1 = "7865eac9181cd1f419fdcee448b5793706f853ad"; + url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz"; + sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544"; }; }; "chalk-1.0.0" = { @@ -4450,13 +4468,13 @@ let sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc"; }; }; - "numeral-1.5.5" = { + "numeral-1.5.6" = { name = "numeral"; packageName = "numeral"; - version = "1.5.5"; + version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz"; - sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208"; + url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz"; + sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; }; }; "open-0.0.5" = { @@ -4522,13 +4540,13 @@ let sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; }; }; - "mdns-js-0.5.1" = { + "mdns-js-0.5.3" = { name = "mdns-js"; packageName = "mdns-js"; - version = "0.5.1"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz"; - sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec"; + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.3.tgz"; + sha1 = "add2958d399319b6d8f2dde29bebac5e845e8b6d"; }; }; "plist-2.0.1" = { @@ -4675,22 +4693,22 @@ let sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8"; }; }; - "parse-torrent-file-4.0.0" = { + "parse-torrent-file-4.0.1" = { name = "parse-torrent-file"; packageName = "parse-torrent-file"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.0.tgz"; - sha1 = "106df57e0e509bafa6756e544d88205e52be33a6"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz"; + sha1 = "4580c5ebb3f6e607baa02ef0ace51f627859e699"; }; }; - "simple-get-2.3.0" = { + "simple-get-2.4.0" = { name = "simple-get"; packageName = "simple-get"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.3.0.tgz"; - sha1 = "c5fdfcce1e516ad4b2ce7b7c2bd2d710502d8ac9"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz"; + sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2"; }; }; "thirty-two-1.0.2" = { @@ -4711,31 +4729,31 @@ let sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; }; }; - "bencode-0.10.0" = { + "bencode-0.11.0" = { name = "bencode"; packageName = "bencode"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-0.10.0.tgz"; - sha1 = "717b36fc61c4e9cb3755f0a9f90996ee5b46f0d0"; + url = "https://registry.npmjs.org/bencode/-/bencode-0.11.0.tgz"; + sha1 = "7ea65d4ce00300393a43a92d5640b6fb0204dc64"; }; }; - "simple-sha1-2.0.8" = { + "simple-sha1-2.1.0" = { name = "simple-sha1"; packageName = "simple-sha1"; - version = "2.0.8"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.8.tgz"; - sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f"; + url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz"; + sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3"; }; }; - "rusha-0.8.4" = { + "rusha-0.8.5" = { name = "rusha"; packageName = "rusha"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz"; - sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.5.tgz"; + sha1 = "a30ae9bd5a4e80fbc96fbe7a13232b944be24f84"; }; }; "simple-concat-1.0.0" = { @@ -4900,13 +4918,13 @@ let sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; }; }; - "random-access-file-1.3.1" = { + "random-access-file-1.4.0" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.3.1.tgz"; - sha1 = "5302a65a7ff2b83c50e18d79bf4cd619b520ac8d"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz"; + sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767"; }; }; "run-parallel-1.1.6" = { @@ -5125,13 +5143,13 @@ let sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; - "k-rpc-socket-1.6.0" = { + "k-rpc-socket-1.6.1" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.0.tgz"; - sha1 = "28c3909cf1547aaa47d5cd924034d55720f7ba64"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz"; + sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e"; }; }; "bencode-0.8.0" = { @@ -5170,22 +5188,22 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "simple-peer-6.0.7" = { + "simple-peer-6.2.1" = { name = "simple-peer"; packageName = "simple-peer"; - version = "6.0.7"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.7.tgz"; - sha1 = "ccc5133b7e75e154ab17b9ccdbec91e970cc2278"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz"; + sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb"; }; }; - "simple-websocket-4.1.0" = { + "simple-websocket-4.2.0" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.1.0.tgz"; - sha1 = "2b1e887e7737ae1452458ead0d0a79722901877f"; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz"; + sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf"; }; }; "string2compact-1.2.2" = { @@ -5512,13 +5530,13 @@ let sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c"; }; }; - "exit-on-epipe-0.1.0" = { + "exit-on-epipe-1.0.0" = { name = "exit-on-epipe"; packageName = "exit-on-epipe"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz"; - sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697"; + url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.0.tgz"; + sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc"; }; }; "sax-1.2.1" = { @@ -5557,13 +5575,13 @@ let sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33"; }; }; - "insight-0.8.3" = { + "insight-0.8.4" = { name = "insight"; packageName = "insight"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz"; - sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d"; + url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; + sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; }; }; "nopt-3.0.1" = { @@ -5638,6 +5656,24 @@ let sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; }; }; + "glob-5.0.15" = { + name = "glob"; + packageName = "glob"; + version = "5.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; + sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + }; + }; + "osenv-0.1.4" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; + sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; + }; + }; "plist-1.2.0" = { name = "plist"; packageName = "plist"; @@ -5746,13 +5782,13 @@ let sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980"; }; }; - "cordova-serve-1.0.0" = { + "cordova-serve-1.0.1" = { name = "cordova-serve"; packageName = "cordova-serve"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.0.tgz"; - sha1 = "7fa1c40183d2b82adb792f9cb9e0d554a23eed85"; + url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.1.tgz"; + sha1 = "895c7fb4bbe630fa1c89feaf6d74779cbff66da7"; }; }; "dep-graph-1.1.0" = { @@ -5926,13 +5962,13 @@ let sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26"; }; }; - "shelljs-0.7.5" = { + "shelljs-0.7.6" = { name = "shelljs"; packageName = "shelljs"; - version = "0.7.5"; + version = "0.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz"; - sha1 = "2eef7a50a21e1ccf37da00df767ec69e30ad0675"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz"; + sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad"; }; }; "interpret-1.0.1" = { @@ -5971,6 +6007,15 @@ let sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; }; }; + "assert-1.3.0" = { + name = "assert"; + packageName = "assert"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; + sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; + }; + }; "compression-1.6.2" = { name = "compression"; packageName = "compression"; @@ -6205,13 +6250,13 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-1.1.2" = { + "proxy-addr-1.1.3" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz"; - sha1 = "b4cc5f22610d9535824c123aef9d3cf73c40ba37"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz"; + sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074"; }; }; "qs-6.2.0" = { @@ -6286,15 +6331,6 @@ let sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; }; }; - "ipaddr.js-1.1.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz"; - sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230"; - }; - }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -6592,22 +6628,22 @@ let sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; }; }; - "lockfile-1.0.2" = { + "lockfile-1.0.3" = { name = "lockfile"; packageName = "lockfile"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz"; - sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83"; + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz"; + sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79"; }; }; - "lru-cache-4.0.1" = { + "lru-cache-4.0.2" = { name = "lru-cache"; packageName = "lru-cache"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz"; - sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"; + sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; }; }; "node-gyp-3.4.0" = { @@ -6718,13 +6754,13 @@ let sha1 = "d0def882952b8de3f67eba5e91199661271f41f4"; }; }; - "retry-0.10.0" = { + "retry-0.10.1" = { name = "retry"; packageName = "retry"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz"; - sha1 = "649e15ca408422d98318161935e7f7d652d435dd"; + url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"; + sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; }; }; "sha-2.0.1" = { @@ -6961,15 +6997,6 @@ let sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; }; }; - "uuid-3.0.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; - sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; - }; - }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -7573,13 +7600,22 @@ let sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; }; }; - "parserlib-1.0.0" = { + "clone-2.1.0" = { + name = "clone"; + packageName = "clone"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz"; + sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6"; + }; + }; + "parserlib-1.1.1" = { name = "parserlib"; packageName = "parserlib"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz"; - sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f"; + url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz"; + sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4"; }; }; "bluebird-2.9.9" = { @@ -7979,13 +8015,13 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "nan-2.4.0" = { + "nan-2.5.0" = { name = "nan"; packageName = "nan"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; - sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; + sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; }; }; "jsonparse-0.0.6" = { @@ -8342,22 +8378,22 @@ let sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce"; }; }; - "ndjson-1.4.3" = { + "ndjson-1.5.0" = { name = "ndjson"; packageName = "ndjson"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ndjson/-/ndjson-1.4.3.tgz"; - sha1 = "7aa026fe3ab38a7da1a2b4ad07b1008e733eb239"; + url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz"; + sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "pump-1.0.1" = { + "pump-1.0.2" = { name = "pump"; packageName = "pump"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz"; - sha1 = "f1f1409fb9bd1085bbdb576b43b84ec4b5eadc1a"; + url = "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz"; + sha1 = "3b3ee6512f94f0e575538c17995f9f16990a5d51"; }; }; "pumpify-1.3.5" = { @@ -8693,6 +8729,15 @@ let sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3"; }; }; + "split2-2.1.1" = { + name = "split2"; + packageName = "split2"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz"; + sha1 = "7a1f551e176a90ecd3345f7246a0cfe175ef4fd0"; + }; + }; "murl-0.4.1" = { name = "murl"; packageName = "murl"; @@ -8711,31 +8756,40 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; - "JSONStream-1.1.4" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "1.1.4"; + "bl-1.2.0" = { + name = "bl"; + packageName = "bl"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; - sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + url = "https://registry.npmjs.org/bl/-/bl-1.2.0.tgz"; + sha1 = "1397e7ec42c5f5dc387470c500e34a9f6be9ea98"; }; }; - "async-2.0.1" = { - name = "async"; - packageName = "async"; - version = "2.0.1"; + "awscred-1.2.0" = { + name = "awscred"; + packageName = "awscred"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz"; - sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; + url = "https://registry.npmjs.org/awscred/-/awscred-1.2.0.tgz"; + sha1 = "9ba714a0d2feb625b848f15c62746c07aebdc3b5"; }; }; - "got-6.6.3" = { + "clipboardy-0.1.2" = { + name = "clipboardy"; + packageName = "clipboardy"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-0.1.2.tgz"; + sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc"; + }; + }; + "got-6.7.1" = { name = "got"; packageName = "got"; - version = "6.6.3"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz"; - sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec"; + url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; }; }; "lodash.debounce-4.0.8" = { @@ -8756,13 +8810,76 @@ let sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; }; }; - "mem-0.1.1" = { + "mem-1.1.0" = { name = "mem"; packageName = "mem"; - version = "0.1.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; - sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + }; + }; + "execa-0.5.1" = { + name = "execa"; + packageName = "execa"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz"; + sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36"; + }; + }; + "cross-spawn-4.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; "create-error-class-3.0.2" = { @@ -8783,13 +8900,13 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "get-stream-2.3.1" = { + "get-stream-3.0.0" = { name = "get-stream"; packageName = "get-stream"; - version = "2.3.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; - sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; }; }; "is-retry-allowed-1.1.0" = { @@ -8801,22 +8918,13 @@ let sha1 = "11a060568b67339444033d0125a61a20d564fb34"; }; }; - "node-status-codes-2.0.1" = { - name = "node-status-codes"; - packageName = "node-status-codes"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz"; - sha1 = "298067659cb68a2b4670abbefde02a3819981f5b"; - }; - }; - "timed-out-3.0.0" = { + "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; - version = "3.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz"; - sha1 = "ff88de96030ce960eabd42487db61d3add229273"; + url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; }; }; "url-parse-lax-1.0.0" = { @@ -8837,13 +8945,22 @@ let sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; }; }; - "babel-code-frame-6.16.0" = { + "mimic-fn-1.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; + sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; + }; + }; + "babel-code-frame-6.22.0" = { name = "babel-code-frame"; packageName = "babel-code-frame"; - version = "6.16.0"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz"; - sha1 = "f90e60da0862909d3ce098733b5d3987c97cb8de"; + url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz"; + sha1 = "027620bee567a88c32561574e7fd0801d33118e4"; }; }; "doctrine-1.5.0" = { @@ -9008,6 +9125,15 @@ let sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; }; }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; "table-3.8.3" = { name = "table"; packageName = "table"; @@ -9017,13 +9143,13 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "js-tokens-2.0.0" = { + "js-tokens-3.0.0" = { name = "js-tokens"; packageName = "js-tokens"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz"; - sha1 = "79903f5563ee778cc1162e6dcf1a0027c97f9cb5"; + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.0.tgz"; + sha1 = "a2f2a969caae142fb3cd56228358c89366957bd1"; }; }; "es6-map-0.1.4" = { @@ -9080,13 +9206,13 @@ let sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; }; }; - "acorn-4.0.3" = { + "acorn-4.0.4" = { name = "acorn"; packageName = "acorn"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz"; - sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz"; + sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a"; }; }; "acorn-jsx-3.0.1" = { @@ -9098,13 +9224,13 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; - "flat-cache-1.2.1" = { + "flat-cache-1.2.2" = { name = "flat-cache"; packageName = "flat-cache"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.1.tgz"; - sha1 = "6c837d6225a7de5659323740b36d5361f71691ff"; + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz"; + sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96"; }; }; "circular-json-0.3.1" = { @@ -9278,13 +9404,13 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; - "fast-levenshtein-2.0.5" = { + "fast-levenshtein-2.0.6" = { name = "fast-levenshtein"; packageName = "fast-levenshtein"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz"; - sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2"; + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; "caller-path-0.1.0" = { @@ -9314,22 +9440,22 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.9.0" = { + "ajv-4.10.4" = { name = "ajv"; packageName = "ajv"; - version = "4.9.0"; + version = "4.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz"; - sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz"; + sha1 = "c0974dd00b3464984892d6010aa9c2c945933254"; }; }; - "ajv-keywords-1.1.1" = { + "ajv-keywords-1.5.0" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "1.1.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz"; - sha1 = "02550bc605a3e576041565628af972e06c549d50"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz"; + sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c"; }; }; "slice-ansi-0.0.4" = { @@ -9440,13 +9566,13 @@ let sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d"; }; }; - "prettyjson-1.2.0" = { + "prettyjson-1.2.1" = { name = "prettyjson"; packageName = "prettyjson"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz"; - sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf"; + url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz"; + sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289"; }; }; "shush-1.0.0" = { @@ -9584,13 +9710,13 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "fsevents-1.0.15" = { + "fsevents-1.0.17" = { name = "fsevents"; packageName = "fsevents"; - version = "1.0.15"; + version = "1.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz"; - sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz"; + sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558"; }; }; "micromatch-2.3.11" = { @@ -9656,13 +9782,13 @@ let sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; - "kind-of-3.0.4" = { + "kind-of-3.1.0" = { name = "kind-of"; packageName = "kind-of"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"; - sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74"; + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; + sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; }; }; "normalize-path-2.0.1" = { @@ -9764,13 +9890,13 @@ let sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; }; }; - "randomatic-1.1.5" = { + "randomatic-1.1.6" = { name = "randomatic"; packageName = "randomatic"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz"; - sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b"; + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz"; + sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"; }; }; "repeat-string-1.6.1" = { @@ -9854,13 +9980,13 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "binary-extensions-1.7.0" = { + "binary-extensions-1.8.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz"; - sha1 = "6c1610db163abfb34edfe42fa423343a1e01185d"; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz"; + sha1 = "48ec8d16df4377eae5fa5884682480af4d95c774"; }; }; "set-immediate-shim-1.0.1" = { @@ -9872,22 +9998,22 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; - "node-pre-gyp-0.6.31" = { + "node-pre-gyp-0.6.32" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.31"; + version = "0.6.32"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz"; - sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; + sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; }; }; - "npmlog-4.0.1" = { + "npmlog-4.0.2" = { name = "npmlog"; packageName = "npmlog"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz"; - sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz"; + sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f"; }; }; "tar-pack-3.3.0" = { @@ -9908,13 +10034,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "gauge-2.7.1" = { + "gauge-2.7.2" = { name = "gauge"; packageName = "gauge"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz"; - sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz"; + sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774"; }; }; "set-blocking-2.0.0" = { @@ -10071,13 +10197,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.11.1" = { + "coffee-script-1.12.2" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.11.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz"; - sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; + sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; }; }; "jade-1.11.0" = { @@ -10116,13 +10242,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.21" = { + "clean-css-3.4.24" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.21"; + version = "3.4.24"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz"; - sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.24.tgz"; + sha1 = "89f5a5e9da37ae02394fe049a41388abbe72c3b5"; }; }; "commander-2.6.0" = { @@ -10161,13 +10287,13 @@ let sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }; }; - "uglify-js-2.7.4" = { + "uglify-js-2.7.5" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.4"; + version = "2.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz"; - sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; + sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; }; }; "void-elements-2.0.1" = { @@ -10404,13 +10530,13 @@ let sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; }; }; - "gulp-util-3.0.7" = { + "gulp-util-3.0.8" = { name = "gulp-util"; packageName = "gulp-util"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz"; - sha1 = "78925c4b8f8b49005ac01a011c557e6218941cbb"; + url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"; + sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; "liftoff-2.3.0" = { @@ -10485,22 +10611,22 @@ let sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; - "dateformat-1.0.12" = { + "dateformat-2.0.0" = { name = "dateformat"; packageName = "dateformat"; - version = "1.0.12"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; - sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; + url = "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz"; + sha1 = "2743e3abb5c3fc2462e527dca445e04e9f4dee17"; }; }; - "fancy-log-1.2.0" = { + "fancy-log-1.3.0" = { name = "fancy-log"; packageName = "fancy-log"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz"; - sha1 = "d5a51b53e9ab22ca07d558f2b67ae55fdb5fcbd8"; + url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz"; + sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948"; }; }; "gulplog-1.0.0" = { @@ -10890,13 +11016,13 @@ let sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5"; }; }; - "is-unc-path-0.1.1" = { + "is-unc-path-0.1.2" = { name = "is-unc-path"; packageName = "is-unc-path"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.1.tgz"; - sha1 = "ab2533d77ad733561124c3dc0f5cd8b90054c86b"; + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz"; + sha1 = "6ab053a72573c10250ff416a3814c35178af39b9"; }; }; "unc-path-regex-0.1.2" = { @@ -11304,13 +11430,13 @@ let sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7"; }; }; - "supports-color-3.1.2" = { + "supports-color-3.2.3" = { name = "supports-color"; packageName = "supports-color"; - version = "3.1.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; - sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"; + sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; }; }; "estraverse-1.9.3" = { @@ -11358,22 +11484,22 @@ let sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; - "bluebird-3.4.6" = { + "bluebird-3.4.7" = { name = "bluebird"; packageName = "bluebird"; - version = "3.4.6"; + version = "3.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"; - sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz"; + sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; }; }; - "body-parser-1.15.2" = { + "body-parser-1.16.0" = { name = "body-parser"; packageName = "body-parser"; - version = "1.15.2"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz"; - sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz"; + sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b"; }; }; "combine-lists-1.0.1" = { @@ -11430,22 +11556,22 @@ let sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; }; }; - "http-proxy-1.15.2" = { + "http-proxy-1.16.2" = { name = "http-proxy"; packageName = "http-proxy"; - version = "1.15.2"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz"; - sha1 = "642fdcaffe52d3448d2bda3b0079e9409064da31"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz"; + sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; }; }; - "isbinaryfile-3.0.1" = { + "isbinaryfile-3.0.2" = { name = "isbinaryfile"; packageName = "isbinaryfile"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.1.tgz"; - sha1 = "6e99573675372e841a0520c036b41513d783e79e"; + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz"; + sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621"; }; }; "log4js-0.6.38" = { @@ -11466,13 +11592,13 @@ let sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; }; }; - "socket.io-1.4.7" = { + "socket.io-1.7.2" = { name = "socket.io"; packageName = "socket.io"; - version = "1.4.7"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz"; - sha1 = "92b7f7cb88c5797d4daee279fe8075dbe6d3fa1c"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz"; + sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71"; }; }; "tmp-0.0.28" = { @@ -11484,13 +11610,13 @@ let sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; }; }; - "useragent-2.1.9" = { + "useragent-2.1.11" = { name = "useragent"; packageName = "useragent"; - version = "2.1.9"; + version = "2.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz"; - sha1 = "4dba2bc4dad1875777ab15de3ff8098b475000b7"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz"; + sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29"; }; }; "bytes-2.4.0" = { @@ -11502,22 +11628,22 @@ let sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; }; }; - "iconv-lite-0.4.13" = { + "iconv-lite-0.4.15" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.4.13"; + version = "0.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; - sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; + sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; }; }; - "raw-body-2.1.7" = { + "raw-body-2.2.0" = { name = "raw-body"; packageName = "raw-body"; - version = "2.1.7"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; - sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz"; + sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; }; }; "custom-event-1.0.1" = { @@ -11601,40 +11727,22 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "engine.io-1.6.10" = { + "debug-2.3.3" = { + name = "debug"; + packageName = "debug"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; + }; + }; + "engine.io-1.8.2" = { name = "engine.io"; packageName = "engine.io"; - version = "1.6.10"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz"; - sha1 = "f87d84e1bd21d1a2ec7f8deef0c62054acdfb27a"; - }; - }; - "socket.io-parser-2.2.6" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz"; - sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99"; - }; - }; - "socket.io-client-1.4.6" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz"; - sha1 = "49b0ba537efd15b8297c84016e642e1c7c752c3d"; - }; - }; - "socket.io-adapter-0.4.0" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz"; - sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz"; + sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e"; }; }; "has-binary-0.1.7" = { @@ -11646,49 +11754,67 @@ let sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; }; }; - "base64id-0.1.0" = { + "object-assign-4.1.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; + sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + }; + }; + "socket.io-adapter-0.5.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; + sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; + }; + }; + "socket.io-client-1.7.2" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz"; + sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644"; + }; + }; + "socket.io-parser-2.3.1" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; + sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; + }; + }; + "base64id-1.0.0" = { name = "base64id"; packageName = "base64id"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; - sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; + url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz"; + sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; }; }; - "ws-1.0.1" = { - name = "ws"; - packageName = "ws"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz"; - sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9"; - }; - }; - "engine.io-parser-1.2.4" = { + "engine.io-parser-1.3.2" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "1.2.4"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz"; - sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42"; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz"; + sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; }; }; - "accepts-1.1.4" = { - name = "accepts"; - packageName = "accepts"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz"; - sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a"; - }; - }; - "after-0.8.1" = { + "after-0.8.2" = { name = "after"; packageName = "after"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz"; - sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; + url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; + sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; }; }; "arraybuffer.slice-0.0.6" = { @@ -11700,13 +11826,13 @@ let sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; }; }; - "base64-arraybuffer-0.1.2" = { + "base64-arraybuffer-0.1.5" = { name = "base64-arraybuffer"; packageName = "base64-arraybuffer"; - version = "0.1.2"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; - sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; + sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; }; }; "blob-0.0.4" = { @@ -11718,103 +11844,13 @@ let sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; }; }; - "has-binary-0.1.6" = { - name = "has-binary"; - packageName = "has-binary"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz"; - sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10"; - }; - }; - "utf8-2.1.0" = { - name = "utf8"; - packageName = "utf8"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz"; - sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5"; - }; - }; - "negotiator-0.4.9" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.4.9"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"; - sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f"; - }; - }; - "json3-3.3.2" = { - name = "json3"; - packageName = "json3"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; - }; - }; - "benchmark-1.0.0" = { - name = "benchmark"; - packageName = "benchmark"; + "wtf-8-1.0.0" = { + name = "wtf-8"; + packageName = "wtf-8"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"; - sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73"; - }; - }; - "engine.io-client-1.6.9" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz"; - sha1 = "1d6ad48048a5083c95096943b29d36efdb212401"; - }; - }; - "component-bind-1.0.0" = { - name = "component-bind"; - packageName = "component-bind"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; - sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; - }; - }; - "component-emitter-1.2.0" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz"; - sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe"; - }; - }; - "object-component-0.0.3" = { - name = "object-component"; - packageName = "object-component"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; - sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; - }; - }; - "parseuri-0.0.4" = { - name = "parseuri"; - packageName = "parseuri"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz"; - sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350"; - }; - }; - "to-array-0.1.4" = { - name = "to-array"; - packageName = "to-array"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; - sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; + url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; + sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; }; }; "backo2-1.0.2" = { @@ -11826,40 +11862,58 @@ let sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; }; }; - "has-cors-1.1.0" = { - name = "has-cors"; - packageName = "has-cors"; - version = "1.1.0"; + "component-bind-1.0.0" = { + name = "component-bind"; + packageName = "component-bind"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; + url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; + sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; }; }; - "xmlhttprequest-ssl-1.5.1" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.1"; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz"; - sha1 = "3b7741fea4a86675976e908d296d4445961faa67"; + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; }; }; - "parsejson-0.0.1" = { - name = "parsejson"; - packageName = "parsejson"; - version = "0.0.1"; + "engine.io-client-1.8.2" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; - sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz"; + sha1 = "c38767547f2a7d184f5752f6f0ad501006703766"; }; }; - "parseqs-0.0.2" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.2"; + "object-component-0.0.3" = { + name = "object-component"; + packageName = "object-component"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; - sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; + url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; + sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; + }; + }; + "parseuri-0.0.5" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; + sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; + }; + }; + "to-array-0.1.4" = { + name = "to-array"; + packageName = "to-array"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; + sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; }; }; "component-inherit-0.0.3" = { @@ -11871,6 +11925,42 @@ let sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; }; }; + "has-cors-1.1.0" = { + name = "has-cors"; + packageName = "has-cors"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; + sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; + }; + }; + "parsejson-0.0.3" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; + sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; + }; + }; + "parseqs-0.0.5" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + }; + }; + "xmlhttprequest-ssl-1.5.3" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; + sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; + }; + }; "yeast-0.1.2" = { name = "yeast"; packageName = "yeast"; @@ -11898,22 +11988,13 @@ let sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; }; }; - "socket.io-parser-2.2.2" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz"; - sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417"; - }; - }; - "json3-3.2.6" = { + "json3-3.3.2" = { name = "json3"; packageName = "json3"; - version = "3.2.6"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; - sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; + url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; + sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; }; }; "lru-cache-2.2.4" = { @@ -12213,6 +12294,24 @@ let sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; }; }; + "raw-body-2.1.7" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; + sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; + }; + }; + "iconv-lite-0.4.13" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; + sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; + }; + }; "csrf-3.0.4" = { name = "csrf"; packageName = "csrf"; @@ -12222,6 +12321,15 @@ let sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; }; }; + "base64-url-1.3.3" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; + sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; + }; + }; "rndm-1.2.0" = { name = "rndm"; packageName = "rndm"; @@ -12366,22 +12474,22 @@ let sha1 = "a7de988a211f9cf4687377130ea74df32730c918"; }; }; - "oauth-0.9.14" = { + "oauth-0.9.15" = { name = "oauth"; packageName = "oauth"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { - url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz"; - sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz"; + sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1"; }; }; - "passport-oauth2-1.3.0" = { + "passport-oauth2-1.4.0" = { name = "passport-oauth2"; packageName = "passport-oauth2"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz"; - sha1 = "d72b4bd62eeb807a4089ff3071a22c26c382dc0c"; + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz"; + sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad"; }; }; "uid2-0.0.3" = { @@ -12447,22 +12555,22 @@ let sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; }; }; - "lodash.isequal-4.4.0" = { + "lodash.isequal-4.5.0" = { name = "lodash.isequal"; packageName = "lodash.isequal"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.4.0.tgz"; - sha1 = "6295768e98e14dc15ce8d362ef6340db82852031"; + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; - "merge-stream-1.0.0" = { + "merge-stream-1.0.1" = { name = "merge-stream"; packageName = "merge-stream"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz"; - sha1 = "9cfd156fef35421e2b5403ce11dc6eb1962b026e"; + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz"; + sha1 = "4041202d508a342ba00174008df0c251b8c135e1"; }; }; "strip-bom-stream-1.0.0" = { @@ -12492,13 +12600,13 @@ let sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; }; }; - "glob-parent-3.0.1" = { + "glob-parent-3.1.0" = { name = "glob-parent"; packageName = "glob-parent"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.1.tgz"; - sha1 = "60021327cc963ddc3b5f085764f500479ecd82ff"; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; "ordered-read-streams-0.3.0" = { @@ -12546,13 +12654,13 @@ let sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; }; }; - "is-extglob-2.1.0" = { + "is-extglob-2.1.1" = { name = "is-extglob"; packageName = "is-extglob"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz"; - sha1 = "33411a482b046bf95e6b0cb27ee2711af4cf15ad"; + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; "extend-shallow-2.0.1" = { @@ -12708,15 +12816,6 @@ let sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9"; }; }; - "semver-5.0.3" = { - name = "semver"; - packageName = "semver"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; - }; - }; "npm-registry-client-7.1.2" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -12942,15 +13041,6 @@ let sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; }; }; - "after-0.8.2" = { - name = "after"; - packageName = "after"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; - sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; - }; - }; "yargs-1.3.3" = { name = "yargs"; packageName = "yargs"; @@ -13023,13 +13113,13 @@ let sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; }; }; - "wrap-ansi-2.0.0" = { + "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz"; - sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f"; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; }; }; "lcid-1.0.0" = { @@ -13158,22 +13248,31 @@ let sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; }; - "write-file-atomic-1.2.0" = { + "write-file-atomic-1.3.1" = { name = "write-file-atomic"; packageName = "write-file-atomic"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; - sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz"; + sha1 = "7d45ba32316328dd1ec7d90f60ebc0d845bb759a"; }; }; - "bcryptjs-2.3.0" = { + "bcryptjs-2.4.0" = { name = "bcryptjs"; packageName = "bcryptjs"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz"; - sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec"; + url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz"; + sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678"; + }; + }; + "body-parser-1.15.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz"; + sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; }; }; "cheerio-0.22.0" = { @@ -13185,15 +13284,6 @@ let sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; }; }; - "clone-2.0.0" = { - name = "clone"; - packageName = "clone"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.0.0.tgz"; - sha1 = "df65d3ca142e4a4a47db33da3468d088a16fc76e"; - }; - }; "cookie-parser-1.4.3" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -13203,31 +13293,31 @@ let sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; }; }; - "cron-1.1.1" = { + "cron-1.2.1" = { name = "cron"; packageName = "cron"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.1.1.tgz"; - sha1 = "02719d4ef480dfc8ee24d81a3603460ba39013ce"; + url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz"; + sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; }; }; - "follow-redirects-0.2.0" = { + "follow-redirects-1.2.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "0.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.2.0.tgz"; - sha1 = "e0229d7a388bb5ff7b29f44fc1e1b62e921272df"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz"; + sha1 = "796c716970df4fb0096165393545040f61b00f59"; }; }; - "fs-extra-0.30.0" = { + "fs-extra-1.0.0" = { name = "fs-extra"; packageName = "fs-extra"; - version = "0.30.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"; - sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; + sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; }; }; "fs.notify-0.0.4" = { @@ -13248,31 +13338,40 @@ let sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; }; }; - "mqtt-1.14.1" = { + "jsonata-1.0.10" = { + name = "jsonata"; + packageName = "jsonata"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz"; + sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96"; + }; + }; + "mqtt-2.2.1" = { name = "mqtt"; packageName = "mqtt"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-1.14.1.tgz"; - sha1 = "7e376987153d01793e946d26d46122ebf0c03554"; - }; - }; - "mustache-2.2.1" = { - name = "mustache"; - packageName = "mustache"; version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-2.2.1.tgz"; - sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876"; + url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz"; + sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852"; }; }; - "oauth2orize-1.5.0" = { + "mustache-2.3.0" = { + name = "mustache"; + packageName = "mustache"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz"; + sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0"; + }; + }; + "oauth2orize-1.7.0" = { name = "oauth2orize"; packageName = "oauth2orize"; - version = "1.5.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.5.0.tgz"; - sha1 = "e352ff4f1b5bf08f0ee94a09757f8f640eb8e0a6"; + url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz"; + sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc"; }; }; "passport-http-bearer-1.0.1" = { @@ -13293,22 +13392,13 @@ let sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba"; }; }; - "sentiment-1.0.6" = { + "sentiment-2.1.0" = { name = "sentiment"; packageName = "sentiment"; - version = "1.0.6"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sentiment/-/sentiment-1.0.6.tgz"; - sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1"; - }; - }; - "uglify-js-2.7.3" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz"; - sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868"; + url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz"; + sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; }; }; "when-3.7.7" = { @@ -13320,15 +13410,6 @@ let sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; }; }; - "ws-0.8.1" = { - name = "ws"; - packageName = "ws"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-0.8.1.tgz"; - sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759"; - }; - }; "node-red-node-feedparser-0.1.7" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; @@ -13338,13 +13419,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.12" = { + "node-red-node-email-0.1.15" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.12"; + version = "0.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz"; - sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz"; + sha1 = "7a528596d3b693a077b1ee293300299855537142"; }; }; "node-red-node-twitter-0.1.9" = { @@ -13365,22 +13446,13 @@ let sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539"; }; }; - "node-red-node-serialport-0.4.1" = { - name = "node-red-node-serialport"; - packageName = "node-red-node-serialport"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz"; - sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c"; - }; - }; - "bcrypt-0.8.7" = { + "bcrypt-1.0.2" = { name = "bcrypt"; packageName = "bcrypt"; - version = "0.8.7"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz"; - sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz"; + sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736"; }; }; "css-select-1.2.0" = { @@ -13527,13 +13599,13 @@ let sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "moment-timezone-0.5.9" = { + "moment-timezone-0.5.11" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.9"; + version = "0.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz"; - sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz"; + sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f"; }; }; "retry-0.6.1" = { @@ -13599,22 +13671,13 @@ let sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a"; }; }; - "mqtt-connection-2.1.1" = { - name = "mqtt-connection"; - packageName = "mqtt-connection"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-2.1.1.tgz"; - sha1 = "7b2e985a74e196619430bebd35da162c34c4e56a"; - }; - }; - "mqtt-packet-3.4.7" = { + "mqtt-packet-5.2.1" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "3.4.7"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.7.tgz"; - sha1 = "be8c267be7f0bf6a2a2d4f6de28307b6e0940e5f"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz"; + sha1 = "876e35ed616a8e348ac0283b4922039872458b58"; }; }; "reinterval-1.1.0" = { @@ -13626,15 +13689,6 @@ let sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; }; }; - "split2-2.1.0" = { - name = "split2"; - packageName = "split2"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-2.1.0.tgz"; - sha1 = "7382c148cb622c4b28af7c727f9673730b73f474"; - }; - }; "websocket-stream-3.3.3" = { name = "websocket-stream"; packageName = "websocket-stream"; @@ -13662,60 +13716,6 @@ let sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; }; }; - "reduplexer-1.1.0" = { - name = "reduplexer"; - packageName = "reduplexer"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/reduplexer/-/reduplexer-1.1.0.tgz"; - sha1 = "7dfed18a679e749c1d7ad36de01acb515f08e140"; - }; - }; - "lodash.assign-4.0.1" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.1.tgz"; - sha1 = "8e7ff0206897a99dca32fc8123309f5c4c2c731e"; - }; - }; - "lodash.keys-4.2.0" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz"; - sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"; - }; - }; - "lodash.rest-4.0.5" = { - name = "lodash.rest"; - packageName = "lodash.rest"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.5.tgz"; - sha1 = "954ef75049262038c96d1fc98b28fdaf9f0772aa"; - }; - }; - "bufferutil-1.2.1" = { - name = "bufferutil"; - packageName = "bufferutil"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz"; - sha1 = "37be5d36e1e06492221e68d474b1ac58e510cbd7"; - }; - }; - "utf-8-validate-1.2.1" = { - name = "utf-8-validate"; - packageName = "utf-8-validate"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz"; - sha1 = "44cb7c6eead73d6b40448f71f745904357b9f72c"; - }; - }; "feedparser-1.1.3" = { name = "feedparser"; packageName = "feedparser"; @@ -13779,13 +13779,13 @@ let sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3"; }; }; - "imap-0.8.18" = { + "imap-0.8.19" = { name = "imap"; packageName = "imap"; - version = "0.8.18"; + version = "0.8.19"; src = fetchurl { - url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz"; - sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f"; + url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz"; + sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5"; }; }; "libmime-1.2.0" = { @@ -13941,58 +13941,13 @@ let sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; }; }; - "serialport-4.0.6" = { - name = "serialport"; - packageName = "serialport"; - version = "4.0.6"; + "oauth-0.9.14" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz"; - sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae"; - }; - }; - "lie-3.1.0" = { - name = "lie"; - packageName = "lie"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz"; - sha1 = "65e0139eaef9ae791a1f5c8c53692c8d3b4718f4"; - }; - }; - "object.assign-4.0.4" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz"; - sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc"; - }; - }; - "immediate-3.0.6" = { - name = "immediate"; - packageName = "immediate"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"; - sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; - }; - }; - "define-properties-1.1.2" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; - sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; - }; - }; - "nan-2.3.5" = { - name = "nan"; - packageName = "nan"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; - sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz"; + sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; }; }; "mongoose-3.6.7" = { @@ -14373,6 +14328,15 @@ let sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d"; }; }; + "base64id-0.1.0" = { + name = "base64id"; + packageName = "base64id"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; + sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; + }; + }; "redis-0.7.3" = { name = "redis"; packageName = "redis"; @@ -14454,13 +14418,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-3.12.0" = { + "mailcomposer-4.0.1" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "3.12.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz"; - sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; + sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; }; }; "simplesmtp-0.3.35" = { @@ -14472,22 +14436,22 @@ let sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; }; - "buildmail-3.10.0" = { + "buildmail-4.0.1" = { name = "buildmail"; packageName = "buildmail"; - version = "3.10.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz"; - sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz"; + sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72"; }; }; - "libmime-2.1.0" = { + "libmime-3.0.0" = { name = "libmime"; packageName = "libmime"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz"; - sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd"; + url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz"; + sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; }; }; "addressparser-1.0.1" = { @@ -14544,6 +14508,15 @@ let sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528"; }; }; + "nan-2.3.5" = { + name = "nan"; + packageName = "nan"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; + sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + }; + }; "argparse-0.1.16" = { name = "argparse"; packageName = "argparse"; @@ -14571,6 +14544,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "JSONStream-1.2.1" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; + sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; + }; + }; "fstream-npm-1.2.0" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -14634,6 +14616,15 @@ let sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; }; }; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + }; "npm-install-checks-3.0.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -14643,13 +14634,13 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "npm-registry-client-7.3.0" = { + "npm-registry-client-7.4.5" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.3.0"; + version = "7.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz"; - sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz"; + sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df"; }; }; "opener-1.4.2" = { @@ -14679,15 +14670,6 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; - "request-2.78.0" = { - name = "request"; - packageName = "request"; - version = "2.78.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; - sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; - }; - }; "sorted-union-stream-2.1.3" = { name = "sorted-union-stream"; packageName = "sorted-union-stream"; @@ -14706,6 +14688,15 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; + "write-file-atomic-1.2.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; + sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; + }; + }; "lodash._baseindexof-3.1.0" = { name = "lodash._baseindexof"; packageName = "lodash._baseindexof"; @@ -15048,13 +15039,13 @@ let sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d"; }; }; - "update-notifier-1.0.2" = { + "update-notifier-1.0.3" = { name = "update-notifier"; packageName = "update-notifier"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz"; - sha1 = "27c90519196dc15015be02a34ea52986feab8877"; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz"; + sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a"; }; }; "request-2.75.0" = { @@ -15201,6 +15192,15 @@ let sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; }; }; + "timed-out-3.1.3" = { + name = "timed-out"; + packageName = "timed-out"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; + sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; + }; + }; "unzip-response-1.0.2" = { name = "unzip-response"; packageName = "unzip-response"; @@ -15321,13 +15321,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.1.11" = { + "service-runner-2.1.13" = { name = "service-runner"; packageName = "service-runner"; - version = "2.1.11"; + version = "2.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz"; - sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz"; + sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb"; }; }; "simplediff-0.1.1" = { @@ -15357,13 +15357,13 @@ let sha1 = "07e30ad79531844179b642d2d8399435182c8727"; }; }; - "busboy-0.2.13" = { + "busboy-0.2.14" = { name = "busboy"; packageName = "busboy"; - version = "0.2.13"; + version = "0.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz"; - sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6"; + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; + sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; }; }; "dicer-0.2.5" = { @@ -15384,6 +15384,24 @@ let sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }; }; + "object.assign-4.0.4" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz"; + sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc"; + }; + }; + "define-properties-1.1.2" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; + sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; + }; + }; "gelfling-0.2.0" = { name = "gelfling"; packageName = "gelfling"; @@ -15682,13 +15700,13 @@ let sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; - "network-address-1.1.0" = { + "network-address-1.1.2" = { name = "network-address"; packageName = "network-address"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/network-address/-/network-address-1.1.0.tgz"; - sha1 = "74d577b0dea652284659079fc8d7010b72f01092"; + url = "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz"; + sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; "airplay-protocol-2.0.2" = { @@ -15808,13 +15826,13 @@ let sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; }; }; - "array-flatten-2.1.0" = { + "array-flatten-2.1.1" = { name = "array-flatten"; packageName = "array-flatten"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.0.tgz"; - sha1 = "26a692c83881fc68dac3ec5d1f0c1b49bf2304d9"; + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz"; + sha1 = "426bb9da84090c1838d812c8150af20a8331e296"; }; }; "dns-equal-1.0.0" = { @@ -15871,13 +15889,22 @@ let sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; }; }; - "run-async-2.2.0" = { + "mute-stream-0.0.6" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; + sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; + }; + }; + "run-async-2.3.0" = { name = "run-async"; packageName = "run-async"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz"; - sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9"; + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; "rx-4.1.0" = { @@ -15934,15 +15961,6 @@ let sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad"; }; }; - "socket.io-1.6.0" = { - name = "socket.io"; - packageName = "socket.io"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz"; - sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1"; - }; - }; "torrent-stream-0.18.1" = { name = "torrent-stream"; packageName = "torrent-stream"; @@ -16312,123 +16330,6 @@ let sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; }; }; - "engine.io-1.8.0" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz"; - sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa"; - }; - }; - "socket.io-adapter-0.5.0" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; - sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; - }; - }; - "socket.io-client-1.6.0" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz"; - sha1 = "5b668f4f771304dfeed179064708386fa6717853"; - }; - }; - "socket.io-parser-2.3.1" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; - sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; - }; - }; - "engine.io-parser-1.3.1" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz"; - sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf"; - }; - }; - "base64-arraybuffer-0.1.5" = { - name = "base64-arraybuffer"; - packageName = "base64-arraybuffer"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; - sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; - }; - }; - "wtf-8-1.0.0" = { - name = "wtf-8"; - packageName = "wtf-8"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; - sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; - }; - }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; - }; - }; - "engine.io-client-1.8.0" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz"; - sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c"; - }; - }; - "parseuri-0.0.5" = { - name = "parseuri"; - packageName = "parseuri"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; - sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; - }; - }; - "parsejson-0.0.3" = { - name = "parsejson"; - packageName = "parsejson"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; - sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; - }; - }; - "parseqs-0.0.5" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; - sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; - }; - }; - "xmlhttprequest-ssl-1.5.3" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; - sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; - }; - }; "bittorrent-dht-3.2.6" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; @@ -16699,15 +16600,6 @@ let sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; }; }; - "iconv-lite-0.4.15" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; - sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; - }; - }; "private-0.1.6" = { name = "private"; packageName = "private"; @@ -16717,31 +16609,31 @@ let sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"; }; }; - "recast-0.11.17" = { + "recast-0.11.20" = { name = "recast"; packageName = "recast"; - version = "0.11.17"; + version = "0.11.20"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz"; - sha1 = "67e829df49ef8ea822381cc516d305411e60bad8"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz"; + sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3"; }; }; - "ast-types-0.9.2" = { + "ast-types-0.9.4" = { name = "ast-types"; packageName = "ast-types"; - version = "0.9.2"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.2.tgz"; - sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz"; + sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b"; }; }; - "esprima-3.1.1" = { + "esprima-3.1.3" = { name = "esprima"; packageName = "esprima"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz"; - sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06"; + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; }; }; "base62-0.1.1" = { @@ -16927,11 +16819,11 @@ let "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = { name = "oauth"; packageName = "oauth"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { - name = "oauth-0.9.14.tar.gz"; + name = "oauth-0.9.15.tar.gz"; url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; - sha256 = "abd0d7be4fb10804e5a38ee66a4db5fc36d2ed045be52e7c8b7e19e4c9e16bd8"; + sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; "connect-2.3.9" = { @@ -17213,13 +17105,13 @@ let sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; }; }; - "sanitize-html-1.13.0" = { + "sanitize-html-1.14.1" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.13.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz"; - sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631"; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz"; + sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8"; }; }; "linkify-it-1.2.4" = { @@ -17366,6 +17258,15 @@ let sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2"; }; }; + "formidable-1.1.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; + sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -17438,13 +17339,13 @@ let sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; - "csv-parse-1.1.7" = { + "csv-parse-1.1.10" = { name = "csv-parse"; packageName = "csv-parse"; - version = "1.1.7"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.7.tgz"; - sha1 = "6e4678f7967013ac823929a4303a3ce177115abc"; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.10.tgz"; + sha1 = "767340d0d1f26d05434c798b7132222c669189de"; }; }; "stream-transform-0.1.1" = { @@ -17636,13 +17537,13 @@ let sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2"; }; }; - "clap-1.1.1" = { + "clap-1.1.2" = { name = "clap"; packageName = "clap"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz"; - sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d"; + url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz"; + sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed"; }; }; "async-2.1.2" = { @@ -17699,6 +17600,15 @@ let sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4"; }; }; + "request-2.78.0" = { + name = "request"; + packageName = "request"; + version = "2.78.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; + sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; + }; + }; "sprintf-0.1.5" = { name = "sprintf"; packageName = "sprintf"; @@ -17798,6 +17708,15 @@ let sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; }; }; + "xmldom-0.1.22" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.1.22"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz"; + sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; + }; + }; "qs-6.0.2" = { name = "qs"; packageName = "qs"; @@ -17807,31 +17726,22 @@ let sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; }; }; - "bluebird-3.3.5" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.3.5.tgz"; - sha1 = "5ee747f1c7bd967658b683936430aee753955a34"; - }; - }; - "blueimp-md5-2.3.1" = { + "blueimp-md5-2.6.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.3.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz"; - sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a"; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.6.0.tgz"; + sha1 = "c96dd67f57db522da9a0c49b464ca44e20c04e0f"; }; }; - "color-0.11.4" = { + "color-1.0.3" = { name = "color"; packageName = "color"; - version = "0.11.4"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz"; - sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764"; + url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz"; + sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d"; }; }; "crossroads-0.12.2" = { @@ -17843,31 +17753,22 @@ let sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2"; }; }; - "diff2html-1.2.0" = { + "diff2html-2.0.12" = { name = "diff2html"; packageName = "diff2html"; - version = "1.2.0"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-1.2.0.tgz"; - sha1 = "8b54af41c180befd9cb1caa130a3d76081ae4a07"; + url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.12.tgz"; + sha1 = "20eda2f1ffd14027716485c938e3fe21dc379455"; }; }; - "express-4.13.4" = { - name = "express"; - packageName = "express"; - version = "4.13.4"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.13.4.tgz"; - sha1 = "3c0b76f3c77590c8345739061ec0bd3ba067ec24"; - }; - }; - "express-session-1.13.0" = { + "express-session-1.14.2" = { name = "express-session"; packageName = "express-session"; - version = "1.13.0"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.13.0.tgz"; - sha1 = "8ac3b5c0188b48382851d88207b8e7746efb4011"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz"; + sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275"; }; }; "forever-monitor-1.1.0" = { @@ -17915,31 +17816,13 @@ let sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0"; }; }; - "lodash-4.12.0" = { - name = "lodash"; - packageName = "lodash"; - version = "4.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz"; - sha1 = "2bd6dc46a040f59e686c972ed21d93dc59053258"; - }; - }; - "moment-2.13.0" = { - name = "moment"; - packageName = "moment"; - version = "2.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz"; - sha1 = "24162d99521e6d40f99ae6939e806d2139eaac52"; - }; - }; - "npm-3.9.6" = { + "npm-4.1.2" = { name = "npm"; packageName = "npm"; - version = "3.9.6"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.9.6.tgz"; - sha1 = "0ef1d272a069ad95bdca8b2dfe6fcd82f4b461d7"; + url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz"; + sha1 = "daaa77d631947135b36528c304573243f5cd2e07"; }; }; "octicons-3.5.0" = { @@ -17960,13 +17843,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-0.11.0" = { + "raven-1.1.1" = { name = "raven"; packageName = "raven"; - version = "0.11.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-0.11.0.tgz"; - sha1 = "32981138a93e4c8ad08cfc17e46b85b453dc107b"; + url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz"; + sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42"; }; }; "signals-1.0.0" = { @@ -17987,49 +17870,40 @@ let sha1 = "e0767014167825957de7e125c29b0fa89796ea03"; }; }; - "socket.io-1.4.8" = { - name = "socket.io"; - packageName = "socket.io"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz"; - sha1 = "e576f330cd0bed64e55b3fd26df991141884867b"; - }; - }; - "winston-2.2.0" = { + "winston-2.3.1" = { name = "winston"; packageName = "winston"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.2.0.tgz"; - sha1 = "2c853dd87ab552a8e8485d72cbbf9a2286f029b7"; + url = "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz"; + sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "yargs-4.7.1" = { + "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; - version = "4.7.1"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-4.7.1.tgz"; - sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; - "color-convert-1.8.2" = { + "color-convert-1.9.0" = { name = "color-convert"; packageName = "color-convert"; - version = "1.8.2"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz"; - sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; + sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; }; }; - "color-string-0.3.0" = { + "color-string-1.4.0" = { name = "color-string"; packageName = "color-string"; - version = "0.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz"; - sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991"; + url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz"; + sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898"; }; }; "color-name-1.1.1" = { @@ -18041,58 +17915,58 @@ let sha1 = "4b1415304cf50028ea81643643bd82ea05803689"; }; }; - "diff-2.2.3" = { + "simple-swizzle-0.2.2" = { + name = "simple-swizzle"; + packageName = "simple-swizzle"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + }; + }; + "is-arrayish-0.3.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz"; + sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; + }; + }; + "diff-3.2.0" = { name = "diff"; packageName = "diff"; - version = "2.2.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz"; - sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; + url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; + sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; }; }; - "cookie-0.1.5" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.5"; + "hogan.js-3.0.2" = { + name = "hogan.js"; + packageName = "hogan.js"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.5.tgz"; - sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c"; + url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz"; + sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; }; }; - "finalhandler-0.4.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.4.1"; + "whatwg-fetch-2.0.2" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; - sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz"; + sha1 = "fe294d1d89e36c5be8b3195057f2e4bc74fc980e"; }; }; - "send-0.13.1" = { - name = "send"; - packageName = "send"; - version = "0.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.13.1.tgz"; - sha1 = "a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7"; - }; - }; - "cookie-0.2.3" = { - name = "cookie"; - packageName = "cookie"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.2.3.tgz"; - sha1 = "1a59536af68537a21178a01346f87cb059d2ae5c"; - }; - }; - "crc-3.4.0" = { + "crc-3.4.1" = { name = "crc"; packageName = "crc"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz"; - sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz"; + sha1 = "65d5830b1a2569557cfb324c0e679998521473ee"; }; }; "broadway-0.2.10" = { @@ -18203,13 +18077,13 @@ let sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b"; }; }; - "typechecker-4.4.0" = { + "typechecker-4.4.1" = { name = "typechecker"; packageName = "typechecker"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz"; - sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc"; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz"; + sha1 = "f97b95f51b038417212d677d45a373ee7bced7e6"; }; }; "underscore-1.5.2" = { @@ -18221,103 +18095,13 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "lodash.clonedeep-4.3.2" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; - sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; - }; - }; - "lodash.union-4.4.0" = { - name = "lodash.union"; - packageName = "lodash.union"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; - sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; - }; - }; - "lodash.uniq-4.3.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; - sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; - }; - }; - "lodash.without-4.2.0" = { - name = "lodash.without"; - packageName = "lodash.without"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; - sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; - }; - }; - "node-gyp-3.3.1" = { + "node-gyp-3.5.0" = { name = "node-gyp"; packageName = "node-gyp"; - version = "3.3.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz"; - sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0"; - }; - }; - "request-2.72.0" = { - name = "request"; - packageName = "request"; - version = "2.72.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz"; - sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1"; - }; - }; - "retry-0.9.0" = { - name = "retry"; - packageName = "retry"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; - sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; - }; - }; - "lodash._baseclone-4.5.7" = { - name = "lodash._baseclone"; - packageName = "lodash._baseclone"; - version = "4.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; - sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; - }; - }; - "lodash._baseflatten-4.2.1" = { - name = "lodash._baseflatten"; - packageName = "lodash._baseflatten"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; - sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; - }; - }; - "lodash._basedifference-4.5.0" = { - name = "lodash._basedifference"; - packageName = "lodash._basedifference"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; - sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; - }; - }; - "qs-6.1.0" = { - name = "qs"; - packageName = "qs"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"; - sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26"; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; + sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; }; }; "lsmod-1.0.0" = { @@ -18329,13 +18113,13 @@ let sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b"; }; }; - "stack-trace-0.0.7" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.7"; + "uuid-3.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz"; - sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; + sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; "eve-0.4.2" = { @@ -18347,67 +18131,13 @@ let sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; }; }; - "engine.io-1.6.11" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.6.11"; + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.11.tgz"; - sha1 = "2533a97a65876c40ffcf95397b7ef9b495c423fe"; - }; - }; - "socket.io-client-1.4.8" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.8.tgz"; - sha1 = "481b241e73df140ea1a4fb03486a85ad097f5558"; - }; - }; - "ws-1.1.0" = { - name = "ws"; - packageName = "ws"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.0.tgz"; - sha1 = "c1d6fd1515d3ceff1f0ae2759bf5fd77030aad1d"; - }; - }; - "engine.io-client-1.6.11" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.6.11"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.11.tgz"; - sha1 = "7d250d8fa1c218119ecde51390458a57d5171376"; - }; - }; - "pkg-conf-1.1.3" = { - name = "pkg-conf"; - packageName = "pkg-conf"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-1.1.3.tgz"; - sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; - }; - }; - "set-blocking-1.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-1.0.0.tgz"; - sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5"; - }; - }; - "symbol-0.2.3" = { - name = "symbol"; - packageName = "symbol"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol/-/symbol-0.2.3.tgz"; - sha1 = "3b9873b8a901e47c6efe21526a3ac372ef28bbc7"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; }; }; "kew-0.1.7" = { @@ -18491,13 +18221,13 @@ let sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; }; }; - "node-libs-browser-0.6.0" = { + "node-libs-browser-0.7.0" = { name = "node-libs-browser"; packageName = "node-libs-browser"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.6.0.tgz"; - sha1 = "244806d44d319e048bc8607b5cc4eaf9a29d2e3c"; + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz"; + sha1 = "3e272c0819e308935e26674408d7af0e1491b83b"; }; }; "tapable-0.1.10" = { @@ -18518,13 +18248,13 @@ let sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b"; }; }; - "webpack-core-0.6.8" = { + "webpack-core-0.6.9" = { name = "webpack-core"; packageName = "webpack-core"; - version = "0.6.8"; + version = "0.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz"; - sha1 = "edf9135de00a6a3c26dd0f14b208af0aa4af8d0a"; + url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz"; + sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; }; }; "memory-fs-0.2.0" = { @@ -18554,76 +18284,40 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "json5-0.5.0" = { + "json5-0.5.1" = { name = "json5"; packageName = "json5"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz"; - sha1 = "9b20715b026cbe3778fd769edccd822d8332a5b2"; + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; - "assert-1.4.1" = { - name = "assert"; - packageName = "assert"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; - }; - }; - "constants-browserify-0.0.1" = { - name = "constants-browserify"; - packageName = "constants-browserify"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"; - sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2"; - }; - }; - "crypto-browserify-3.2.8" = { + "crypto-browserify-3.3.0" = { name = "crypto-browserify"; packageName = "crypto-browserify"; - version = "3.2.8"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz"; - sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189"; + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz"; + sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"; }; }; - "http-browserify-1.7.0" = { - name = "http-browserify"; - packageName = "http-browserify"; - version = "1.7.0"; + "os-browserify-0.2.1" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz"; - sha1 = "33795ade72df88acfbfd36773cefeda764735b20"; + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz"; + sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"; }; }; - "https-browserify-0.0.0" = { - name = "https-browserify"; - packageName = "https-browserify"; - version = "0.0.0"; + "timers-browserify-2.0.2" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"; - sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd"; - }; - }; - "stream-browserify-1.0.0" = { - name = "stream-browserify"; - packageName = "stream-browserify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"; - sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193"; - }; - }; - "url-0.10.3" = { - name = "url"; - packageName = "url"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz"; - sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz"; + sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86"; }; }; "pbkdf2-compat-2.0.1" = { @@ -18653,40 +18347,49 @@ let sha1 = "17ddeddc5f722fb66501658895461977867315ba"; }; }; - "Base64-0.2.1" = { - name = "Base64"; - packageName = "Base64"; - version = "0.2.1"; + "browserify-aes-0.4.0" = { + name = "browserify-aes"; + packageName = "browserify-aes"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"; - sha1 = "ba3a4230708e186705065e66babdd4c35cf60028"; + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz"; + sha1 = "067149b668df31c4b58533e02d01e806d8608e2c"; }; }; - "source-list-map-0.1.6" = { + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + }; + "source-list-map-0.1.8" = { name = "source-list-map"; packageName = "source-list-map"; - version = "0.1.6"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz"; - sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f"; + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz"; + sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106"; }; }; - "babel-runtime-6.18.0" = { + "babel-runtime-6.22.0" = { name = "babel-runtime"; packageName = "babel-runtime"; - version = "6.18.0"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz"; - sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078"; + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz"; + sha1 = "1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"; }; }; - "death-1.0.0" = { + "death-1.1.0" = { name = "death"; packageName = "death"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz"; - sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de"; + url = "https://registry.npmjs.org/death/-/death-1.1.0.tgz"; + sha1 = "01aa9c401edd92750514470b8266390c66c67318"; }; }; "detect-indent-4.0.0" = { @@ -18698,6 +18401,15 @@ let sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; }; }; + "diff-2.2.3" = { + name = "diff"; + packageName = "diff"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz"; + sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; + }; + }; "invariant-2.2.2" = { name = "invariant"; packageName = "invariant"; @@ -18725,13 +18437,13 @@ let sha1 = "74c45744439550da185801912829f61d22071bc1"; }; }; - "node-emoji-1.4.1" = { + "node-emoji-1.5.1" = { name = "node-emoji"; packageName = "node-emoji"; - version = "1.4.1"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz"; - sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc"; + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.5.1.tgz"; + sha1 = "fd918e412769bf8c448051238233840b2aff16a1"; }; }; "object-path-0.11.3" = { @@ -18743,13 +18455,13 @@ let sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554"; }; }; - "proper-lockfile-1.2.0" = { + "proper-lockfile-2.0.0" = { name = "proper-lockfile"; packageName = "proper-lockfile"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz"; - sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34"; + url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.0.tgz"; + sha1 = "b21f5e79bcbb6b4e23eeeced15cfc7f63e8a2e55"; }; }; "request-capture-har-1.1.4" = { @@ -18770,22 +18482,22 @@ let sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e"; }; }; - "regenerator-runtime-0.9.6" = { + "regenerator-runtime-0.10.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.9.6"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz"; - sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz"; + sha1 = "257f41961ce44558b18f7814af48c17559f9faeb"; }; }; - "loose-envify-1.3.0" = { + "loose-envify-1.3.1" = { name = "loose-envify"; packageName = "loose-envify"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz"; - sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8"; + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; + sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; }; }; "ci-info-1.0.0" = { @@ -18806,25 +18518,16 @@ let sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; }; }; - "err-code-1.1.1" = { - name = "err-code"; - packageName = "err-code"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz"; - sha1 = "739d71b6851f24d050ea18c79a5b722420771d59"; - }; - }; }; in { alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.4.tgz"; - sha1 = "8f85b28758ed0e7a251a635cd2e6a73ce92e9dde"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz"; + sha1 = "78be031931f4b9012f6085e1544069c56dcba233"; }; dependencies = [ sources."colors-0.6.0-1" @@ -18839,7 +18542,7 @@ in sources."source-map-0.1.34" ]; }) - sources."resolve-1.1.7" + sources."resolve-1.2.0" sources."global-paths-0.1.2" sources."source-map-0.1.9" sources."xml2tss-0.0.5" @@ -18864,16 +18567,15 @@ in ]; }) sources."is-windows-0.1.1" - (sources."global-prefix-0.1.4" // { + (sources."global-prefix-0.1.5" // { dependencies = [ sources."is-windows-0.2.0" ]; }) + sources."homedir-polyfill-1.0.1" sources."ini-1.3.4" - sources."osenv-0.1.3" sources."which-1.2.12" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" + sources."parse-passwd-1.0.0" sources."isexe-1.1.2" sources."xml2js-0.2.8" sources."sax-0.5.8" @@ -18890,17 +18592,13 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.7"; + version = "0.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz"; - sha1 = "48e59f6be202122c0d71153efab4f924065da586"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz"; + sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc"; }; dependencies = [ - (sources."adal-node-0.1.21" // { - dependencies = [ - sources."node-uuid-1.4.7" - ]; - }) + sources."adal-node-0.1.21" sources."async-1.4.2" (sources."azure-common-0.9.18" // { dependencies = [ @@ -18909,9 +18607,11 @@ in ]; }) sources."azure-arm-authorization-2.0.0" - sources."azure-arm-cdn-0.2.1" + sources."azure-arm-cdn-1.0.0" sources."azure-arm-commerce-0.2.0" - sources."azure-arm-compute-0.19.0" + sources."azure-arm-compute-0.19.1" + sources."azure-arm-datalake-analytics-1.0.1-preview" + sources."azure-arm-datalake-store-1.0.1-preview" sources."azure-arm-hdinsight-0.2.2" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" @@ -18923,8 +18623,6 @@ in sources."azure-arm-dns-0.11.1" sources."azure-arm-website-0.11.4" sources."azure-arm-rediscache-0.2.1" - sources."azure-arm-datalake-analytics-0.4.3" - sources."azure-arm-datalake-store-0.4.2" sources."azure-arm-devtestlabs-0.1.0" sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" @@ -18939,7 +18637,7 @@ in ]; }) sources."azure-asm-network-0.13.0" - sources."azure-arm-resource-1.4.5-preview" + sources."azure-arm-resource-1.6.1-preview" sources."azure-arm-storage-0.13.1-preview" sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" @@ -18952,7 +18650,6 @@ in }) (sources."azure-storage-1.3.0" // { dependencies = [ - sources."node-uuid-1.4.7" sources."readable-stream-2.0.6" sources."validator-3.22.2" sources."xml2js-0.2.7" @@ -18961,7 +18658,7 @@ in sources."azure-arm-batch-0.3.0" sources."azure-batch-0.5.2" sources."azure-servicefabric-0.1.4" - sources."applicationinsights-0.15.12" + sources."applicationinsights-0.16.0" sources."caller-id-0.1.0" sources."colors-1.1.2" sources."commander-1.0.4" @@ -18980,16 +18677,16 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.17.0" + sources."moment-2.17.1" sources."ms-rest-1.15.2" (sources."ms-rest-azure-1.15.2" // { dependencies = [ sources."async-0.2.7" + sources."uuid-2.0.1" sources."azure-arm-resource-1.4.4-preview" ]; }) sources."node-forge-0.6.23" - sources."node-uuid-1.2.0" sources."omelette-0.1.0" sources."openssl-wrapper-0.2.1" sources."progress-1.1.8" @@ -19012,7 +18709,6 @@ in (sources."request-2.74.0" // { dependencies = [ sources."extend-3.0.0" - sources."node-uuid-1.4.7" ]; }) (sources."ssh-key-to-pem-0.11.0" // { @@ -19027,6 +18723,7 @@ in sources."tunnel-0.0.2" sources."underscore-1.4.4" sources."user-home-2.0.0" + sources."uuid-3.0.1" sources."validator-5.2.0" (sources."winston-2.1.1" // { dependencies = [ @@ -19041,14 +18738,14 @@ in sources."read-1.0.7" sources."date-utils-1.2.21" sources."jws-3.1.4" - sources."xmldom-0.1.22" + sources."node-uuid-1.4.7" + sources."xmldom-0.1.27" sources."xpath.js-1.0.7" sources."base64url-2.0.0" - sources."jwa-1.1.4" + sources."jwa-1.1.5" sources."safe-buffer-5.0.1" sources."buffer-equal-constant-time-1.0.1" - sources."ecdsa-sig-formatter-1.0.7" - sources."base64-url-1.3.3" + sources."ecdsa-sig-formatter-1.0.9" sources."dateformat-1.0.2-1.2.3" sources."envconf-0.0.4" sources."duplexer-0.1.1" @@ -19080,7 +18777,6 @@ in sources."has-color-0.1.7" sources."ansi-styles-1.0.0" sources."strip-ansi-0.1.1" - sources."uuid-2.0.1" sources."debug-0.7.4" sources."q-0.9.7" sources."pkginfo-0.4.0" @@ -19135,24 +18831,24 @@ in sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.2.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."lodash-4.17.2" + sources."lodash-4.17.4" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -19162,7 +18858,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -19171,7 +18867,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -19182,30 +18878,31 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."ctype-0.5.2" sources."source-map-0.1.43" sources."fibers-1.0.15" sources."galaxy-0.1.12" sources."amdefine-1.0.1" - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.0.6" + sources."readable-stream-2.2.2" ]; }) sources."http-response-object-1.1.0" sources."then-request-2.2.0" sources."typedarray-0.0.6" + sources."buffer-shims-1.0.0" sources."http-basic-2.5.1" sources."promise-7.1.1" sources."asap-2.0.5" sources."os-homedir-1.0.2" - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" ]; buildInputs = globalBuildInputs; meta = { @@ -19268,7 +18965,7 @@ in sources."ext-list-2.2.0" (sources."meow-3.7.0" // { dependencies = [ - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" ]; }) sources."sort-keys-length-1.0.1" @@ -19306,7 +19003,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -19368,7 +19065,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."q-1.4.1" - sources."debug-2.3.3" + sources."debug-2.6.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -19388,16 +19085,20 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "13.1.1"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.1.1.tgz"; - sha1 = "72a2310e2f706ed87db929cf0ee73a5e195d9bb0"; + url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; + sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; }; dependencies = [ - sources."JSONStream-1.2.1" - sources."assert-1.3.0" + sources."JSONStream-1.3.0" + sources."assert-1.4.1" sources."browser-pack-6.0.2" - sources."browser-resolve-1.11.2" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) sources."browserify-zlib-0.1.4" sources."buffer-4.9.1" sources."cached-path-relative-1.0.0" @@ -19414,7 +19115,7 @@ in sources."domain-browser-1.1.7" sources."duplexer2-0.1.4" sources."events-1.1.1" - sources."glob-5.0.15" + sources."glob-7.1.1" sources."has-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" @@ -19434,11 +19135,11 @@ in sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" sources."readable-stream-2.2.2" - sources."resolve-1.1.7" + sources."resolve-1.2.0" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.5.0" + sources."stream-http-2.6.3" sources."string_decoder-0.10.31" sources."subarg-1.0.0" (sources."syntax-error-1.1.6" // { @@ -19446,11 +19147,7 @@ in sources."acorn-2.7.0" ]; }) - (sources."through2-2.0.1" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) + sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."tty-browserify-0.0.0" (sources."url-0.11.0" // { @@ -19465,7 +19162,7 @@ in }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" - sources."jsonparse-1.2.0" + sources."jsonparse-1.3.0" sources."through-2.3.8" sources."combine-source-map-0.7.2" sources."umd-3.0.1" @@ -19504,10 +19201,11 @@ in sources."parse-asn1-5.0.0" sources."brorand-1.0.6" sources."hash.js-1.0.3" - sources."asn1.js-4.9.0" + sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" sources."sha.js-2.4.8" sources."miller-rabin-4.0.0" + sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."once-1.4.0" @@ -19535,7 +19233,7 @@ in sources."array-filter-0.0.1" sources."array-reduce-0.0.0" sources."array-map-0.0.0" - sources."builtin-status-codes-2.0.0" + sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" sources."minimist-1.2.0" sources."querystring-0.2.0" @@ -19559,11 +19257,11 @@ in }; dependencies = [ sources."array-loop-1.0.0" - sources."castv2-client-1.1.2" + sources."castv2-client-1.2.0" sources."chalk-1.0.0" sources."chromecast-player-0.2.3" sources."debounced-seeker-1.0.0" - sources."debug-2.3.3" + sources."debug-2.6.0" sources."fs-extended-0.2.1" sources."got-1.2.2" sources."internal-ip-1.2.0" @@ -19602,7 +19300,7 @@ in (sources."xml2js-0.4.17" // { dependencies = [ sources."xmlbuilder-4.2.1" - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) sources."xtend-4.0.1" @@ -19635,7 +19333,7 @@ in sources."object-assign-1.0.0" (sources."meow-3.7.0" // { dependencies = [ - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" ]; }) sources."camelcase-keys-2.1.0" @@ -19648,7 +19346,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -19681,7 +19379,7 @@ in sources."clivas-0.1.4" sources."inquirer-0.8.5" sources."network-address-0.0.5" - sources."numeral-1.5.5" + sources."numeral-1.5.6" sources."open-0.0.5" (sources."optimist-0.6.1" // { dependencies = [ @@ -19715,7 +19413,7 @@ in ]; }) sources."windows-no-runnable-0.0.6" - (sources."mdns-js-0.5.1" // { + (sources."mdns-js-0.5.3" // { dependencies = [ sources."semver-5.1.1" ]; @@ -19725,11 +19423,11 @@ in sources."qap-3.1.3" sources."base64-js-1.1.2" sources."xmlbuilder-8.2.2" - sources."xmldom-0.1.22" + sources."xmldom-0.1.27" sources."cli-width-1.1.1" (sources."figures-1.7.0" // { dependencies = [ - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" ]; }) sources."lodash-3.10.1" @@ -19740,13 +19438,13 @@ in sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" sources."magnet-uri-5.1.5" - sources."parse-torrent-file-4.0.0" - sources."simple-get-2.3.0" + sources."parse-torrent-file-4.0.1" + sources."simple-get-2.4.0" sources."thirty-two-1.0.2" sources."uniq-1.0.1" - sources."bencode-0.10.0" - sources."simple-sha1-2.0.8" - sources."rusha-0.8.4" + sources."bencode-0.11.0" + sources."simple-sha1-2.1.0" + sources."rusha-0.8.5" sources."once-1.4.0" sources."simple-concat-1.0.0" sources."unzip-response-2.0.1" @@ -19776,7 +19474,7 @@ in sources."rimraf-2.5.4" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.0" - (sources."random-access-file-1.3.1" // { + (sources."random-access-file-1.4.0" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.1" @@ -19829,18 +19527,18 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.6.0" + sources."k-rpc-socket-1.6.1" sources."bn.js-4.11.6" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-peer-6.0.7" // { + (sources."simple-peer-6.2.1" // { dependencies = [ sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) - (sources."simple-websocket-4.1.0" // { + (sources."simple-websocket-4.2.0" // { dependencies = [ sources."readable-stream-2.2.2" sources."isarray-1.0.0" @@ -19887,13 +19585,13 @@ in sources."codepage-1.4.0" sources."utfx-1.0.1" sources."voc-0.5.0" - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.0.6" + sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) - sources."exit-on-epipe-0.1.0" + sources."exit-on-epipe-1.0.0" sources."commander-2.9.0" sources."typedarray-0.0.6" sources."graceful-readlink-1.0.1" @@ -19910,10 +19608,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.11.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz"; - sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; + sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; }; buildInputs = globalBuildInputs; meta = { @@ -19946,7 +19644,7 @@ in sources."unorm-1.3.3" ]; }) - (sources."insight-0.8.3" // { + (sources."insight-0.8.4" // { dependencies = [ sources."async-1.5.2" sources."request-2.79.0" @@ -19963,7 +19661,7 @@ in sources."elementtree-0.1.6" sources."glob-5.0.15" sources."minimatch-3.0.3" - sources."osenv-0.1.3" + sources."osenv-0.1.4" sources."plist-1.2.0" sources."semver-5.3.0" sources."shelljs-0.5.3" @@ -19982,14 +19680,14 @@ in sources."os-tmpdir-1.0.2" sources."base64-js-0.0.8" sources."xmlbuilder-4.0.0" - sources."xmldom-0.1.22" + sources."xmldom-0.1.27" sources."util-deprecate-1.0.2" sources."lodash-3.10.1" sources."aliasify-1.9.0" (sources."cordova-fetch-1.0.1" // { dependencies = [ sources."q-1.4.1" - sources."shelljs-0.7.5" + sources."shelljs-0.7.6" sources."glob-7.1.1" ]; }) @@ -19999,7 +19697,7 @@ in ]; }) sources."cordova-js-4.2.0" - (sources."cordova-serve-1.0.0" // { + (sources."cordova-serve-1.0.1" // { dependencies = [ sources."q-1.4.1" ]; @@ -20073,13 +19771,17 @@ in sources."interpret-1.0.1" sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" - sources."resolve-1.1.7" + sources."resolve-1.2.0" sources."cordova-app-hello-world-3.11.0" sources."browserify-13.1.0" - sources."JSONStream-1.2.1" + sources."JSONStream-1.3.0" sources."assert-1.3.0" sources."browser-pack-6.0.2" - sources."browser-resolve-1.11.2" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) sources."browserify-zlib-0.1.4" (sources."buffer-4.9.1" // { dependencies = [ @@ -20122,7 +19824,7 @@ in sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.5.0" + sources."stream-http-2.6.3" sources."string_decoder-0.10.31" sources."subarg-1.0.0" (sources."syntax-error-1.1.6" // { @@ -20130,12 +19832,7 @@ in sources."acorn-2.7.0" ]; }) - (sources."through2-2.0.1" // { - dependencies = [ - sources."readable-stream-2.0.6" - sources."isarray-1.0.0" - ]; - }) + sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."tty-browserify-0.0.0" (sources."url-0.11.0" // { @@ -20150,7 +19847,7 @@ in }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" - sources."jsonparse-1.2.0" + sources."jsonparse-1.3.0" sources."combine-source-map-0.7.2" sources."umd-3.0.1" sources."convert-source-map-1.1.3" @@ -20185,7 +19882,7 @@ in sources."parse-asn1-5.0.0" sources."brorand-1.0.6" sources."hash.js-1.0.3" - sources."asn1.js-4.9.0" + sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" sources."sha.js-2.4.8" sources."miller-rabin-4.0.0" @@ -20208,7 +19905,7 @@ in sources."array-filter-0.0.1" sources."array-reduce-0.0.0" sources."array-map-0.0.0" - sources."builtin-status-codes-2.0.0" + sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" sources."minimist-1.2.0" sources."querystring-0.2.0" @@ -20221,16 +19918,16 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."accepts-1.3.3" sources."bytes-2.3.0" sources."compressible-2.0.9" sources."debug-2.2.0" sources."on-headers-1.0.1" sources."vary-1.1.0" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."negotiator-0.6.1" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."ms-0.7.1" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -20248,7 +19945,7 @@ in sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.2" + sources."proxy-addr-1.1.3" sources."qs-6.2.0" sources."range-parser-1.2.0" sources."send-0.14.1" @@ -20259,7 +19956,7 @@ in sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.1.1" + sources."ipaddr.js-1.2.0" sources."destroy-1.0.4" sources."http-errors-1.5.1" sources."mime-1.3.4" @@ -20276,7 +19973,7 @@ in sources."validate-npm-package-license-3.0.1" sources."validate-npm-package-name-2.2.2" sources."hosted-git-info-2.1.5" - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" sources."json-parse-helpfulerror-1.0.3" sources."normalize-package-data-2.3.5" sources."graceful-fs-4.1.11" @@ -20308,8 +20005,8 @@ in sources."github-url-from-git-1.4.0" sources."github-url-from-username-repo-1.0.2" sources."ini-1.3.4" - sources."lockfile-1.0.2" - sources."lru-cache-4.0.1" + sources."lockfile-1.0.3" + sources."lru-cache-4.0.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -20335,7 +20032,7 @@ in sources."path-is-inside-1.0.2" sources."read-installed-4.0.3" sources."realize-package-specifier-3.0.3" - sources."retry-0.10.0" + sources."retry-0.10.1" (sources."rimraf-2.5.4" // { dependencies = [ sources."glob-7.1.1" @@ -20382,7 +20079,7 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."commander-2.9.0" @@ -20391,7 +20088,7 @@ in sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" sources."hoek-2.16.3" @@ -20400,7 +20097,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -20409,7 +20106,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -20420,7 +20117,7 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -20443,7 +20140,7 @@ in sources."node-uuid-1.4.7" (sources."async-2.1.4" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) sources."isexe-1.1.2" @@ -20463,7 +20160,7 @@ in }) sources."inquirer-0.10.1" sources."lodash.debounce-3.1.1" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" sources."os-name-1.0.3" sources."xdg-basedir-2.0.0" sources."ansi-escapes-1.4.0" @@ -20528,14 +20225,14 @@ in csslint = nodeEnv.buildNodePackage { name = "csslint"; packageName = "csslint"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/csslint-1.0.4.tgz"; - sha1 = "0d3907933cc3f04b56960496d573387fbe9bb1e7"; + url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz"; + sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9"; }; dependencies = [ - sources."clone-1.0.2" - sources."parserlib-1.0.0" + sources."clone-2.1.0" + sources."parserlib-1.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -20624,9 +20321,9 @@ in sources."cookie-0.1.2" sources."merge-descriptors-0.0.2" sources."utils-merge-1.0.0" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."negotiator-0.5.3" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."ms-0.7.0" sources."crc-3.2.1" sources."ee-first-1.1.0" @@ -20635,7 +20332,7 @@ in sources."destroy-1.0.3" sources."mime-1.2.11" sources."bindings-1.2.1" - sources."nan-2.4.0" + sources."nan-2.5.0" sources."jsonparse-0.0.6" sources."es5class-2.3.1" sources."faye-websocket-0.11.0" @@ -20733,12 +20430,16 @@ in sources."minimist-0.0.8" ]; }) - (sources."ndjson-1.4.3" // { + (sources."ndjson-1.5.0" // { dependencies = [ sources."minimist-1.2.0" + sources."split2-2.1.1" + sources."through2-2.0.3" + sources."readable-stream-2.2.2" + sources."isarray-1.0.0" ]; }) - sources."pump-1.0.1" + sources."pump-1.0.2" sources."pumpify-1.3.5" sources."relative-date-1.1.3" sources."root-2.0.0" @@ -20747,11 +20448,7 @@ in sources."stream-collector-1.0.1" (sources."tar-stream-1.5.2" // { dependencies = [ - (sources."bl-1.1.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) + sources."bl-1.2.0" sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; @@ -20821,6 +20518,7 @@ in sources."looper-2.0.0" sources."bindings-1.2.1" sources."nan-2.1.0" + sources."json-stringify-safe-5.0.1" sources."murl-0.4.1" sources."protein-0.5.0" sources."network-address-0.0.5" @@ -20836,20 +20534,21 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "2.4.2"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-2.4.2.tgz"; - sha1 = "757c98aea05ee8714f0de2a33224c4136414633e"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz"; + sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4"; }; dependencies = [ - sources."JSONStream-1.1.4" - sources."async-2.0.1" + sources."JSONStream-1.3.0" + sources."async-2.1.4" sources."aws4-1.5.0" + sources."awscred-1.2.0" sources."optimist-0.6.1" sources."request-2.79.0" - sources."jsonparse-1.2.0" + sources."jsonparse-1.3.0" sources."through-2.3.8" - sources."lodash-4.17.2" + sources."lodash-4.17.4" sources."wordwrap-0.0.3" sources."minimist-0.0.10" sources."aws-sign2-0.6.0" @@ -20864,13 +20563,13 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -20882,11 +20581,11 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -20896,7 +20595,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -20905,7 +20604,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -20916,11 +20615,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" ]; buildInputs = globalBuildInputs; @@ -20934,45 +20633,63 @@ in emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; - version = "0.3.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz"; - sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c"; + url = "https://registry.npmjs.org/emoj/-/emoj-1.0.0.tgz"; + sha1 = "3cccbeec420e2b45f73b923e880c220392c055bd"; }; dependencies = [ sources."chalk-1.1.3" - sources."got-6.6.3" + sources."clipboardy-0.1.2" + (sources."got-6.7.1" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) sources."has-ansi-2.0.0" sources."lodash.debounce-4.0.8" sources."log-update-1.0.2" - sources."mem-0.1.1" + sources."mem-1.1.0" sources."meow-3.7.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" + sources."execa-0.5.1" + sources."cross-spawn-4.0.2" + sources."get-stream-2.3.1" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."signal-exit-3.0.2" + sources."strip-eof-1.0.0" + sources."lru-cache-4.0.2" + sources."which-1.2.12" + sources."pseudomap-1.0.2" + sources."yallist-2.0.0" + sources."isexe-1.1.2" + sources."object-assign-4.1.1" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."path-key-2.0.1" sources."create-error-class-3.0.2" sources."duplexer3-0.1.4" - sources."get-stream-2.3.1" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" - sources."is-stream-1.1.0" sources."lowercase-keys-1.0.0" - sources."node-status-codes-2.0.1" - sources."timed-out-3.0.0" + sources."safe-buffer-5.0.1" + sources."timed-out-4.0.1" sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" - sources."object-assign-4.1.0" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" sources."prepend-http-1.0.4" sources."ansi-escapes-1.4.0" sources."cli-cursor-1.0.2" sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" sources."onetime-1.1.0" + sources."mimic-fn-1.1.0" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -20984,7 +20701,6 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.1" sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -21024,16 +20740,16 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.10.2"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz"; - sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz"; + sha1 = "564d2646b5efded85df96985332edd91a23bff25"; }; dependencies = [ - sources."babel-code-frame-6.16.0" + sources."babel-code-frame-6.22.0" sources."chalk-1.1.3" - sources."concat-stream-1.5.2" - sources."debug-2.3.3" + sources."concat-stream-1.6.0" + sources."debug-2.6.0" sources."doctrine-1.5.0" sources."escope-3.6.0" sources."espree-3.3.2" @@ -21050,7 +20766,7 @@ in sources."js-yaml-3.7.0" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.2" + sources."lodash-4.17.4" sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" sources."optionator-0.8.2" @@ -21058,9 +20774,9 @@ in sources."pluralize-1.2.1" sources."progress-1.1.8" sources."require-uncached-1.0.3" - sources."shelljs-0.7.5" + sources."shelljs-0.7.6" sources."strip-bom-3.0.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" (sources."table-3.8.3" // { dependencies = [ sources."string-width-2.0.0" @@ -21069,16 +20785,17 @@ in }) sources."text-table-0.2.0" sources."user-home-2.0.0" - sources."js-tokens-2.0.0" + sources."js-tokens-3.0.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.0.6" + sources."readable-stream-2.2.2" + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -21098,14 +20815,14 @@ in sources."es6-set-0.1.4" sources."es6-symbol-3.1.0" sources."event-emitter-0.3.4" - sources."object-assign-4.1.0" - sources."acorn-4.0.3" + sources."object-assign-4.1.1" + sources."acorn-4.0.4" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" ]; }) - sources."flat-cache-1.2.1" + sources."flat-cache-1.2.2" sources."circular-json-0.3.1" sources."del-2.2.2" sources."graceful-fs-4.1.11" @@ -21148,7 +20865,7 @@ in sources."number-is-nan-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."tryit-1.0.3" @@ -21161,15 +20878,15 @@ in sources."minimist-0.0.8" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" - sources."fast-levenshtein-2.0.5" + sources."fast-levenshtein-2.0.6" sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" sources."interpret-1.0.1" sources."rechoir-0.6.2" - sources."resolve-1.1.7" - sources."ajv-4.9.0" - sources."ajv-keywords-1.1.1" + sources."resolve-1.2.0" + sources."ajv-4.10.4" + sources."ajv-keywords-1.5.0" sources."slice-ansi-0.0.4" sources."co-4.6.0" sources."os-homedir-1.0.2" @@ -21185,10 +20902,10 @@ in emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz"; - sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6"; + url = "https://registry.npmjs.org/emojione/-/emojione-2.2.7.tgz"; + sha1 = "46457cf6b9b2f8da13ae8a2e4e547de06ee15e96"; }; buildInputs = globalBuildInputs; meta = { @@ -21254,7 +20971,7 @@ in sources."object-assign-3.0.0" sources."optimist-0.6.1" sources."path-is-absolute-1.0.1" - (sources."prettyjson-1.2.0" // { + (sources."prettyjson-1.2.1" // { dependencies = [ sources."colors-1.1.2" sources."minimist-1.2.0" @@ -21286,7 +21003,7 @@ in sources."minimist-0.0.10" sources."read-1.0.7" sources."revalidator-0.1.8" - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" sources."chokidar-1.6.1" sources."minimatch-3.0.3" sources."ps-tree-0.0.3" @@ -21297,7 +21014,7 @@ in sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.15" + sources."fsevents-1.0.17" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -21307,7 +21024,7 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."normalize-path-2.0.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" @@ -21319,7 +21036,7 @@ in sources."fill-range-2.2.3" sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" sources."isarray-1.0.0" sources."is-posix-bracket-0.1.1" @@ -21331,7 +21048,7 @@ in sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.7.0" + sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" @@ -21340,15 +21057,15 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."nan-2.4.0" - sources."node-pre-gyp-0.6.31" + sources."nan-2.5.0" + sources."node-pre-gyp-0.6.32" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) sources."nopt-3.0.6" - sources."npmlog-4.0.1" + sources."npmlog-4.0.2" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" @@ -21367,24 +21084,24 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.1" // { + (sources."gauge-2.7.2" // { dependencies = [ - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" ]; }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-1.0.4" @@ -21401,27 +21118,30 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -21431,7 +21151,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21440,7 +21160,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21451,11 +21171,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -21498,10 +21218,10 @@ in git-run = nodeEnv.buildNodePackage { name = "git-run"; packageName = "git-run"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/git-run/-/git-run-0.5.2.tgz"; - sha1 = "1edbc7163389067dd9f2c46ab3acff07889f8333"; + url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz"; + sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c"; }; dependencies = [ sources."minilog-2.0.8" @@ -21559,7 +21279,7 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.11.1" + sources."coffee-script-1.12.2" sources."jade-1.11.0" (sources."q-2.0.3" // { dependencies = [ @@ -21569,7 +21289,7 @@ in sources."xml2js-0.4.17" sources."msgpack-1.0.2" sources."character-parser-1.2.1" - (sources."clean-css-3.4.21" // { + (sources."clean-css-3.4.24" // { dependencies = [ sources."commander-2.8.1" ]; @@ -21586,7 +21306,7 @@ in sources."source-map-0.1.43" ]; }) - (sources."uglify-js-2.7.4" // { + (sources."uglify-js-2.7.5" // { dependencies = [ sources."source-map-0.5.6" ]; @@ -21625,7 +21345,7 @@ in sources."right-align-0.1.3" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.4" @@ -21634,8 +21354,8 @@ in sources."weak-map-1.0.5" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.17.2" - sources."nan-2.4.0" + sources."lodash-4.17.4" + sources."nan-2.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -21656,7 +21376,7 @@ in sources."archy-1.0.0" sources."chalk-1.1.3" sources."deprecated-0.0.1" - sources."gulp-util-3.0.7" + sources."gulp-util-3.0.8" sources."interpret-1.0.1" sources."liftoff-2.3.0" sources."minimist-1.2.0" @@ -21667,8 +21387,6 @@ in sources."v8flags-2.0.11" (sources."vinyl-fs-0.3.14" // { dependencies = [ - sources."graceful-fs-3.0.11" - sources."strip-bom-1.0.0" sources."through2-0.6.5" sources."vinyl-0.4.6" sources."readable-stream-1.0.34" @@ -21680,12 +21398,12 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."array-differ-1.0.0" sources."array-uniq-1.0.3" sources."beeper-1.1.1" - sources."dateformat-1.0.12" - sources."fancy-log-1.2.0" + sources."dateformat-2.0.0" + sources."fancy-log-1.3.0" sources."gulplog-1.0.0" sources."has-gulplog-0.1.0" sources."lodash._reescape-3.0.0" @@ -21695,57 +21413,13 @@ in sources."multipipe-0.1.2" sources."object-assign-3.0.0" sources."replace-ext-0.0.1" - (sources."through2-2.0.1" // { + (sources."through2-2.0.3" // { dependencies = [ - sources."readable-stream-2.0.6" + sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) sources."vinyl-0.5.3" - sources."get-stdin-4.0.1" - (sources."meow-3.7.0" // { - dependencies = [ - sources."object-assign-4.1.0" - ]; - }) - sources."camelcase-keys-2.1.0" - sources."decamelize-1.2.0" - sources."loud-rejection-1.6.0" - sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.5" - sources."read-pkg-up-1.0.1" - sources."redent-1.0.0" - sources."trim-newlines-1.0.0" - sources."camelcase-2.1.1" - sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.1" - sources."array-find-index-1.0.2" - sources."hosted-git-info-2.1.5" - sources."is-builtin-module-1.0.0" - sources."validate-npm-package-license-3.0.1" - sources."builtin-modules-1.1.1" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" - sources."find-up-1.1.2" - sources."read-pkg-1.1.0" - sources."path-exists-2.1.0" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" - sources."load-json-file-1.1.0" - sources."path-type-1.1.0" - sources."graceful-fs-4.1.11" - sources."parse-json-2.2.0" - sources."pify-2.3.0" - sources."strip-bom-2.0.0" - sources."error-ex-1.3.0" - sources."is-arrayish-0.2.1" - sources."is-utf8-0.2.1" - sources."indent-string-2.1.0" - sources."strip-indent-1.0.1" - sources."repeating-2.0.1" - sources."is-finite-1.0.2" - sources."number-is-nan-1.0.1" sources."time-stamp-1.0.1" sources."glogg-1.0.0" sources."sparkles-1.0.0" @@ -21768,6 +21442,7 @@ in sources."string_decoder-0.10.31" sources."inherits-2.0.3" sources."xtend-4.0.1" + sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."clone-1.0.2" @@ -21780,7 +21455,7 @@ in sources."lodash.isstring-4.0.1" sources."lodash.mapvalues-4.6.0" sources."rechoir-0.6.2" - sources."resolve-1.1.7" + sources."resolve-1.2.0" sources."detect-file-0.1.0" sources."is-glob-2.0.1" sources."micromatch-2.3.11" @@ -21793,7 +21468,7 @@ in sources."expand-brackets-0.1.5" sources."extglob-0.3.2" sources."filename-regex-2.0.0" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."normalize-path-2.0.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" @@ -21809,7 +21484,7 @@ in sources."isarray-1.0.0" ]; }) - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.4" @@ -21824,12 +21499,12 @@ in sources."expand-tilde-1.2.2" sources."global-modules-0.2.3" sources."os-homedir-1.0.2" - sources."global-prefix-0.1.4" + sources."global-prefix-0.1.5" sources."is-windows-0.2.0" + sources."homedir-polyfill-1.0.1" sources."ini-1.3.4" - sources."osenv-0.1.3" sources."which-1.2.12" - sources."os-tmpdir-1.0.2" + sources."parse-passwd-1.0.0" sources."isexe-1.1.2" sources."lodash.assignwith-4.2.0" sources."lodash.isempty-4.4.0" @@ -21839,7 +21514,7 @@ in sources."map-cache-0.2.2" sources."path-root-0.1.1" sources."is-relative-0.2.1" - sources."is-unc-path-0.1.1" + sources."is-unc-path-0.1.2" sources."unc-path-regex-0.1.2" sources."path-root-regex-0.1.2" sources."end-of-stream-0.1.5" @@ -21856,11 +21531,13 @@ in ]; }) sources."glob-watcher-0.0.6" + sources."graceful-fs-3.0.11" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) + sources."strip-bom-1.0.0" sources."glob-4.5.3" sources."minimatch-2.0.10" sources."ordered-read-streams-0.1.0" @@ -21885,6 +21562,7 @@ in sources."sigmund-1.0.1" sources."natives-1.1.0" sources."first-chunk-stream-1.0.0" + sources."is-utf8-0.2.1" ]; buildInputs = globalBuildInputs; meta = { @@ -22019,7 +21697,7 @@ in sources."nopt-3.0.6" sources."once-1.4.0" sources."resolve-1.1.7" - sources."supports-color-3.1.2" + sources."supports-color-3.2.3" sources."which-1.2.12" sources."wordwrap-1.0.0" sources."estraverse-1.9.3" @@ -22030,7 +21708,7 @@ in sources."deep-is-0.1.3" sources."type-check-0.3.2" sources."levn-0.3.0" - sources."fast-levenshtein-2.0.5" + sources."fast-levenshtein-2.0.6" sources."amdefine-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -22045,7 +21723,7 @@ in sources."wordwrap-0.0.3" ]; }) - (sources."uglify-js-2.7.4" // { + (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" sources."source-map-0.5.6" @@ -22066,7 +21744,7 @@ in sources."right-align-0.1.3" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.4" @@ -22207,22 +21885,27 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz"; - sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f"; + url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz"; + sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b"; }; dependencies = [ - sources."bluebird-3.4.6" - sources."body-parser-1.15.2" + sources."bluebird-3.4.7" + sources."body-parser-1.16.0" sources."chokidar-1.6.1" sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" + ]; + }) + (sources."connect-3.5.0" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" ]; }) - sources."connect-3.5.0" sources."core-js-2.4.1" sources."di-0.0.1" sources."dom-serialize-2.2.1" @@ -22236,8 +21919,8 @@ in }) sources."glob-7.1.1" sources."graceful-fs-4.1.11" - sources."http-proxy-1.15.2" - sources."isbinaryfile-3.0.1" + sources."http-proxy-1.16.2" + sources."isbinaryfile-3.0.2" sources."lodash-3.10.1" (sources."log4js-0.6.38" // { dependencies = [ @@ -22252,29 +21935,35 @@ in sources."qjobs-1.1.5" sources."range-parser-1.2.0" sources."rimraf-2.5.4" - sources."socket.io-1.4.7" + sources."safe-buffer-5.0.1" + (sources."socket.io-1.7.2" // { + dependencies = [ + sources."debug-2.3.3" + sources."object-assign-4.1.0" + ]; + }) sources."source-map-0.5.6" sources."tmp-0.0.28" - sources."useragent-2.1.9" + sources."useragent-2.1.11" sources."bytes-2.4.0" sources."content-type-1.0.2" - sources."debug-2.2.0" + sources."debug-2.6.0" sources."depd-1.1.0" sources."http-errors-1.5.1" - sources."iconv-lite-0.4.13" + sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" - sources."qs-6.2.0" - sources."raw-body-2.1.7" + sources."qs-6.2.1" + sources."raw-body-2.2.0" sources."type-is-1.6.14" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."inherits-2.0.3" sources."setprototypeof-1.0.2" sources."statuses-1.3.1" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.13" - sources."mime-db-1.25.0" + sources."mime-types-2.1.14" + sources."mime-db-1.26.0" sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -22282,7 +21971,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.15" + sources."fsevents-1.0.17" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -22292,7 +21981,7 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."normalize-path-2.0.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" @@ -22304,7 +21993,7 @@ in sources."fill-range-2.2.3" sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" sources."isarray-1.0.0" sources."is-posix-bracket-0.1.1" @@ -22316,7 +22005,7 @@ in sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.7.0" + sources."binary-extensions-1.8.0" sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" @@ -22324,11 +22013,11 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."nan-2.4.0" - sources."node-pre-gyp-0.6.31" + sources."nan-2.5.0" + sources."node-pre-gyp-0.6.32" sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.0.1" + sources."npmlog-4.0.2" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" @@ -22343,28 +22032,30 @@ in sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ + sources."debug-2.2.0" sources."readable-stream-2.1.5" + sources."ms-0.7.1" ]; }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.1" + sources."gauge-2.7.2" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-1.0.4" @@ -22385,21 +22076,24 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -22409,7 +22103,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22418,7 +22112,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22429,7 +22123,7 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -22440,7 +22134,12 @@ in sources."once-1.3.3" sources."uid-number-0.0.6" sources."wrappy-1.0.2" - sources."finalhandler-0.5.0" + (sources."finalhandler-0.5.0" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."parseurl-1.3.1" sources."utils-merge-1.0.0" sources."escape-html-1.0.3" @@ -22456,26 +22155,9 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."wordwrap-0.0.3" - sources."engine.io-1.6.10" - (sources."socket.io-parser-2.2.6" // { + (sources."engine.io-1.8.2" // { dependencies = [ - sources."isarray-0.0.1" - ]; - }) - (sources."socket.io-client-1.4.6" // { - dependencies = [ - sources."component-emitter-1.2.0" - ]; - }) - (sources."socket.io-adapter-0.4.0" // { - dependencies = [ - (sources."socket.io-parser-2.2.2" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - sources."json3-3.2.6" - sources."isarray-0.0.1" + sources."debug-2.3.3" ]; }) (sources."has-binary-0.1.7" // { @@ -22483,46 +22165,58 @@ in sources."isarray-0.0.1" ]; }) - sources."base64id-0.1.0" - sources."ws-1.0.1" - (sources."engine.io-parser-1.2.4" // { + (sources."socket.io-adapter-0.5.0" // { dependencies = [ - sources."has-binary-0.1.6" + sources."debug-2.3.3" + ]; + }) + (sources."socket.io-client-1.7.2" // { + dependencies = [ + sources."debug-2.3.3" + ]; + }) + (sources."socket.io-parser-2.3.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."component-emitter-1.1.2" sources."isarray-0.0.1" + sources."ms-0.7.1" ]; }) - (sources."accepts-1.1.4" // { - dependencies = [ - sources."mime-types-2.0.14" - sources."mime-db-1.12.0" - ]; - }) + sources."accepts-1.3.3" + sources."base64id-1.0.0" + sources."engine.io-parser-1.3.2" + sources."ws-1.1.1" + sources."cookie-0.3.1" + sources."negotiator-0.6.1" + sources."after-0.8.2" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + sources."wtf-8-1.0.0" sources."options-0.0.6" sources."ultron-1.0.2" - sources."after-0.8.1" - sources."arraybuffer.slice-0.0.6" - sources."base64-arraybuffer-0.1.2" - sources."blob-0.0.4" - sources."utf8-2.1.0" - sources."negotiator-0.4.9" - sources."json3-3.3.2" - sources."component-emitter-1.1.2" - sources."benchmark-1.0.0" - sources."engine.io-client-1.6.9" - sources."component-bind-1.0.0" - sources."object-component-0.0.3" - sources."indexof-0.0.1" - sources."parseuri-0.0.4" - sources."to-array-0.1.4" sources."backo2-1.0.2" - sources."has-cors-1.1.0" - sources."xmlhttprequest-ssl-1.5.1" - sources."parsejson-0.0.1" - sources."parseqs-0.0.2" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + (sources."engine.io-client-1.8.2" // { + dependencies = [ + sources."debug-2.3.3" + ]; + }) + sources."indexof-0.0.1" + sources."object-component-0.0.3" + sources."parseuri-0.0.5" + sources."to-array-0.1.4" sources."component-inherit-0.0.3" + sources."has-cors-1.1.0" + sources."parsejson-0.0.3" + sources."parseqs-0.0.5" + sources."xmlhttprequest-ssl-1.5.3" sources."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" + sources."json3-3.3.2" sources."os-tmpdir-1.0.2" sources."lru-cache-2.2.4" ]; @@ -22650,9 +22344,9 @@ in sources."unpipe-1.0.0" sources."accepts-1.2.13" sources."compressible-2.0.9" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."negotiator-0.5.3" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."ms-0.7.1" sources."csrf-3.0.4" sources."base64-url-1.3.3" @@ -22679,12 +22373,12 @@ in sources."passport-google-oauth1-1.0.0" sources."passport-google-oauth20-1.0.0" sources."passport-oauth1-1.1.0" - sources."oauth-0.9.14" - sources."passport-oauth2-1.3.0" + sources."oauth-0.9.15" + sources."passport-oauth2-1.4.0" sources."uid2-0.0.3" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; buildInputs = globalBuildInputs; meta = { @@ -22702,14 +22396,15 @@ in sha1 = "5de1e6426f885929b77357f014de5fee1dad0553"; }; dependencies = [ - sources."through2-2.0.1" + sources."through2-2.0.3" sources."vinyl-1.2.0" sources."vinyl-fs-2.4.4" - sources."readable-stream-2.0.6" + sources."readable-stream-2.2.2" sources."xtend-4.0.1" + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -22728,10 +22423,10 @@ in sources."gulp-sourcemaps-1.6.0" sources."is-valid-glob-0.3.0" sources."lazystream-1.0.0" - sources."lodash.isequal-4.4.0" - sources."merge-stream-1.0.0" + sources."lodash.isequal-4.5.0" + sources."merge-stream-1.0.1" sources."mkdirp-0.5.1" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" sources."strip-bom-2.0.0" sources."strip-bom-stream-1.0.0" sources."through2-filter-2.0.0" @@ -22742,7 +22437,7 @@ in sources."wrappy-1.0.2" sources."extend-3.0.0" sources."glob-5.0.15" - sources."glob-parent-3.0.1" + sources."glob-parent-3.1.0" (sources."micromatch-2.3.11" // { dependencies = [ sources."is-extglob-1.0.0" @@ -22760,7 +22455,7 @@ in sources."concat-map-0.0.1" sources."is-glob-3.1.0" sources."path-dirname-1.0.2" - sources."is-extglob-2.1.0" + sources."is-extglob-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" sources."braces-1.8.5" @@ -22771,7 +22466,7 @@ in ]; }) sources."filename-regex-2.0.0" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."normalize-path-2.0.1" sources."object.omit-2.0.1" (sources."parse-glob-3.0.4" // { @@ -22788,7 +22483,7 @@ in sources."fill-range-2.2.3" sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.4" @@ -22880,14 +22575,14 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.0.tgz"; - sha1 = "7e27db0eb5102dc0f1a4667d84bd5d633e19d191"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.1.tgz"; + sha1 = "f58c3157be2ffcb8253f82641b5f0473543d21e8"; }; dependencies = [ sources."optparse-1.0.5" - sources."semver-5.0.3" + sources."semver-5.3.0" sources."npm-registry-client-7.1.2" (sources."npmconf-2.0.9" // { dependencies = [ @@ -22910,15 +22605,11 @@ in sources."slasp-0.0.4" sources."nijs-0.0.23" sources."chownr-1.0.1" - sources."concat-stream-1.5.2" + sources."concat-stream-1.6.0" sources."graceful-fs-4.1.11" sources."mkdirp-0.5.1" sources."normalize-package-data-2.3.5" - (sources."npm-package-arg-4.2.0" // { - dependencies = [ - sources."semver-5.3.0" - ]; - }) + sources."npm-package-arg-4.2.0" sources."once-1.4.0" sources."request-2.79.0" sources."retry-0.8.0" @@ -22927,7 +22618,8 @@ in sources."npmlog-3.1.2" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.0.6" + sources."readable-stream-2.2.2" + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -22955,13 +22647,13 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -22973,11 +22665,11 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -22987,7 +22679,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22996,7 +22688,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23007,11 +22699,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -23029,8 +22721,8 @@ in sources."aproba-1.0.4" sources."has-color-0.1.7" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" @@ -23039,7 +22731,7 @@ in sources."config-chain-1.1.11" sources."ini-1.3.4" sources."nopt-3.0.6" - sources."osenv-0.1.3" + sources."osenv-0.1.4" sources."uid-number-0.0.5" sources."proto-list-1.2.4" sources."abbrev-1.0.9" @@ -23069,10 +22761,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz"; - sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36"; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; + sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; }; dependencies = [ sources."fstream-1.0.10" @@ -23081,9 +22773,8 @@ in sources."minimatch-3.0.3" sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-3.1.2" - sources."osenv-0.1.3" - sources."path-array-1.0.1" + sources."npmlog-4.0.2" + sources."osenv-0.1.4" sources."request-2.79.0" sources."rimraf-2.5.4" sources."semver-5.3.0" @@ -23102,7 +22793,7 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.2" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -23113,26 +22804,19 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."array-index-1.0.0" - sources."debug-2.3.3" - sources."es6-symbol-3.1.0" - sources."ms-0.7.2" - sources."d-0.1.1" - sources."es5-ext-0.10.12" - sources."es6-iterator-2.0.0" sources."aws-sign2-0.6.0" sources."aws4-1.5.0" sources."caseless-0.11.0" @@ -23146,27 +22830,30 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -23176,7 +22863,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23185,7 +22872,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23196,11 +22883,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."isexe-1.1.2" @@ -23224,7 +22911,7 @@ in dependencies = [ sources."async-0.9.2" sources."biased-opener-0.2.8" - sources."debug-2.3.3" + sources."debug-2.6.0" (sources."express-4.14.0" // { dependencies = [ sources."debug-2.2.0" @@ -23252,7 +22939,7 @@ in sources."minimist-0.0.8" ]; }) - sources."osenv-0.1.3" + sources."osenv-0.1.4" sources."plist-1.2.0" (sources."win-detect-browsers-1.0.2" // { dependencies = [ @@ -23269,7 +22956,7 @@ in sources."lodash-3.10.1" ]; }) - sources."xmldom-0.1.22" + sources."xmldom-0.1.27" sources."util-deprecate-1.0.2" sources."after-0.8.2" sources."xtend-4.0.1" @@ -23283,13 +22970,13 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."normalize-package-data-2.3.5" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -23341,7 +23028,7 @@ in sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.2" + sources."proxy-addr-1.1.3" sources."qs-6.2.0" sources."range-parser-1.2.0" (sources."send-0.14.1" // { @@ -23354,14 +23041,14 @@ in sources."type-is-1.6.14" sources."utils-merge-1.0.0" sources."vary-1.1.0" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."negotiator-0.6.1" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."statuses-1.3.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.1.1" + sources."ipaddr.js-1.2.0" sources."destroy-1.0.4" sources."http-errors-1.5.1" sources."mime-1.3.4" @@ -23379,8 +23066,8 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."truncate-1.0.5" - sources."nan-2.4.0" - (sources."node-pre-gyp-0.6.31" // { + sources."nan-2.5.0" + (sources."node-pre-gyp-0.6.32" // { dependencies = [ sources."rimraf-2.5.4" sources."semver-5.3.0" @@ -23388,7 +23075,7 @@ in ]; }) sources."nopt-3.0.6" - sources."npmlog-4.0.1" + sources."npmlog-4.0.2" (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.0" @@ -23408,7 +23095,7 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.1" + sources."gauge-2.7.2" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -23418,14 +23105,14 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."aws-sign2-0.6.0" sources."aws4-1.5.0" sources."caseless-0.11.0" @@ -23443,20 +23130,23 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."is-property-1.0.2" sources."hoek-2.16.3" sources."boom-2.10.1" @@ -23464,7 +23154,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23473,7 +23163,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23484,7 +23174,7 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -23501,7 +23191,7 @@ in sources."os-locale-1.4.0" sources."window-size-0.1.4" sources."y18n-3.2.1" - sources."wrap-ansi-2.0.0" + sources."wrap-ansi-2.1.0" sources."lcid-1.0.0" sources."invert-kv-1.0.0" ]; @@ -23515,15 +23205,15 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.31"; + version = "0.6.32"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz"; - sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; + sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; }; dependencies = [ sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.0.1" + sources."npmlog-4.0.2" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" @@ -23543,7 +23233,7 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.1" + sources."gauge-2.7.2" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -23555,17 +23245,17 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-1.0.4" @@ -23582,27 +23272,30 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -23612,7 +23305,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23621,7 +23314,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23632,11 +23325,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -23674,7 +23367,7 @@ in }; dependencies = [ sources."chokidar-1.6.1" - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -23699,7 +23392,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.15" + sources."fsevents-1.0.17" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -23709,7 +23402,7 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."normalize-path-2.0.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" @@ -23721,7 +23414,7 @@ in sources."fill-range-2.2.3" sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" sources."isarray-1.0.0" sources."is-posix-bracket-0.1.1" @@ -23733,7 +23426,7 @@ in sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.7.0" + sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" @@ -23742,11 +23435,11 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."nan-2.4.0" - sources."node-pre-gyp-0.6.31" + sources."nan-2.5.0" + sources."node-pre-gyp-0.6.32" sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.0.1" + sources."npmlog-4.0.2" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" @@ -23767,21 +23460,21 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.1" + sources."gauge-2.7.2" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-1.0.4" @@ -23798,27 +23491,30 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -23828,7 +23524,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23837,7 +23533,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23848,11 +23544,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -23897,8 +23593,8 @@ in sources."semver-diff-2.1.0" sources."string-length-1.0.1" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.3" - sources."write-file-atomic-1.2.0" + sources."osenv-0.1.4" + sources."write-file-atomic-1.3.1" sources."xdg-basedir-2.0.0" sources."os-homedir-1.0.2" sources."imurmurhash-0.1.4" @@ -23938,53 +23634,64 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.15.2"; + version = "0.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.15.2.tgz"; - sha1 = "4533dd93f63828f8e749f0c132a793fbeb636ea6"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.16.1.tgz"; + sha1 = "eff4162e6e08ef7e2ae9b17ad99571876f7d895d"; }; dependencies = [ - sources."basic-auth-1.0.4" - sources."bcryptjs-2.3.0" - sources."body-parser-1.15.2" + sources."basic-auth-1.1.0" + sources."bcryptjs-2.4.0" + (sources."body-parser-1.15.2" // { + dependencies = [ + sources."raw-body-2.1.7" + ]; + }) sources."cheerio-0.22.0" - sources."clone-2.0.0" + sources."clone-2.1.0" sources."cookie-parser-1.4.3" sources."cors-2.8.1" - sources."cron-1.1.1" + sources."cron-1.2.1" sources."express-4.14.0" - sources."follow-redirects-0.2.0" - sources."fs-extra-0.30.0" + (sources."follow-redirects-1.2.1" // { + dependencies = [ + sources."debug-2.6.0" + sources."ms-0.7.2" + ]; + }) + sources."fs-extra-1.0.0" sources."fs.notify-0.0.4" sources."i18next-1.10.6" sources."is-utf8-0.2.1" + sources."js-yaml-3.7.0" + sources."json-stringify-safe-5.0.1" + sources."jsonata-1.0.10" sources."media-typer-0.3.0" - (sources."mqtt-1.14.1" // { - dependencies = [ - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" - ]; - }) - sources."mustache-2.2.1" + sources."mqtt-2.2.1" + sources."mustache-2.3.0" sources."nopt-3.0.6" - sources."oauth2orize-1.5.0" + sources."oauth2orize-1.7.0" sources."on-headers-1.0.1" sources."passport-0.3.2" sources."passport-http-bearer-1.0.1" sources."passport-oauth2-client-password-0.1.2" - sources."raw-body-2.1.7" + (sources."raw-body-2.2.0" // { + dependencies = [ + sources."iconv-lite-0.4.15" + ]; + }) sources."semver-5.3.0" - sources."sentiment-1.0.6" - (sources."uglify-js-2.7.3" // { + sources."sentiment-2.1.0" + (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" ]; }) sources."when-3.7.7" - sources."ws-0.8.1" + sources."ws-1.1.1" sources."xml2js-0.4.17" sources."node-red-node-feedparser-0.1.7" - sources."node-red-node-email-0.1.12" + sources."node-red-node-email-0.1.15" (sources."node-red-node-twitter-0.1.9" // { dependencies = [ sources."request-2.79.0" @@ -23993,12 +23700,7 @@ in ]; }) sources."node-red-node-rbe-0.1.6" - sources."node-red-node-serialport-0.4.1" - (sources."bcrypt-0.8.7" // { - dependencies = [ - sources."nan-2.3.5" - ]; - }) + sources."bcrypt-1.0.2" sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.2.0" @@ -24013,8 +23715,9 @@ in sources."setprototypeof-1.0.2" sources."statuses-1.3.1" sources."ee-first-1.1.1" - sources."mime-types-2.1.13" - sources."mime-db-1.25.0" + sources."unpipe-1.0.0" + sources."mime-types-2.1.14" + sources."mime-db-1.26.0" sources."css-select-1.2.0" (sources."dom-serializer-0.1.0" // { dependencies = [ @@ -24051,8 +23754,8 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."vary-1.1.0" - sources."moment-timezone-0.5.9" - sources."moment-2.17.0" + sources."moment-timezone-0.5.11" + sources."moment-2.17.1" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -24065,86 +23768,55 @@ in sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.2" + sources."proxy-addr-1.1.3" sources."range-parser-1.2.0" sources."send-0.14.1" sources."serve-static-1.11.1" sources."utils-merge-1.0.0" sources."negotiator-0.6.1" - sources."unpipe-1.0.0" sources."forwarded-0.1.0" - sources."ipaddr.js-1.1.1" + sources."ipaddr.js-1.2.0" sources."destroy-1.0.4" sources."mime-1.3.4" - sources."stream-consume-0.1.0" sources."graceful-fs-4.1.11" sources."jsonfile-2.4.0" sources."klaw-1.3.1" - sources."path-is-absolute-1.0.1" - sources."rimraf-2.5.4" - sources."glob-7.1.1" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."minimatch-3.0.3" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" sources."async-0.1.22" sources."retry-0.6.1" sources."cookies-0.6.2" sources."i18next-client-1.10.3" sources."json5-0.2.0" sources."keygrip-1.0.1" + sources."argparse-1.0.9" + sources."esprima-2.7.3" + sources."sprintf-js-1.0.3" sources."commist-1.0.0" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) - (sources."end-of-stream-1.1.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."concat-stream-1.6.0" + sources."end-of-stream-1.1.0" sources."help-me-1.0.1" sources."minimist-1.2.0" - (sources."mqtt-connection-2.1.1" // { - dependencies = [ - sources."through2-0.6.5" - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" - ]; - }) - sources."mqtt-packet-3.4.7" - sources."pump-1.0.1" + sources."mqtt-packet-5.2.1" + sources."pump-1.0.2" sources."reinterval-1.1.0" - sources."split2-2.1.0" - (sources."websocket-stream-3.3.3" // { - dependencies = [ - sources."ws-1.1.1" - ]; - }) + sources."split2-2.1.1" + sources."websocket-stream-3.3.3" sources."xtend-4.0.1" sources."leven-1.0.2" sources."typedarray-0.0.6" + sources."once-1.3.3" + sources."wrappy-1.0.2" sources."callback-stream-1.1.0" (sources."glob-stream-5.3.5" // { dependencies = [ - sources."glob-5.0.15" sources."through2-0.6.5" sources."readable-stream-1.0.34" sources."isarray-0.0.1" ]; }) - (sources."through2-2.0.1" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) + sources."through2-2.0.3" sources."extend-3.0.0" - sources."glob-parent-3.0.1" + sources."glob-5.0.15" + sources."glob-parent-3.1.0" (sources."micromatch-2.3.11" // { dependencies = [ sources."is-extglob-1.0.0" @@ -24154,9 +23826,15 @@ in sources."ordered-read-streams-0.3.0" sources."to-absolute-glob-0.1.1" sources."unique-stream-2.2.1" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."path-is-absolute-1.0.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" sources."is-glob-3.1.0" sources."path-dirname-1.0.2" - sources."is-extglob-2.1.0" + sources."is-extglob-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" sources."braces-1.8.5" @@ -24167,7 +23845,7 @@ in ]; }) sources."filename-regex-2.0.0" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."normalize-path-2.0.1" sources."object.omit-2.0.1" (sources."parse-glob-3.0.4" // { @@ -24184,7 +23862,7 @@ in sources."fill-range-2.2.3" sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."repeat-string-1.6.1" sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.4" @@ -24206,34 +23884,17 @@ in sources."json-stable-stringify-1.0.1" sources."through2-filter-2.0.0" sources."jsonify-0.0.0" - (sources."reduplexer-1.1.0" // { - dependencies = [ - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" - ]; - }) - (sources."bl-0.9.5" // { - dependencies = [ - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" - ]; - }) + sources."bl-1.2.0" (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" - sources."once-1.3.3" ]; }) sources."stream-shift-1.0.0" - sources."options-0.0.6" - sources."ultron-1.0.2" sources."abbrev-1.0.9" sources."uid2-0.0.3" sources."passport-strategy-1.0.0" sources."pause-0.0.1" - sources."lodash.assign-4.0.1" - sources."lodash.keys-4.2.0" - sources."lodash.rest-4.0.5" sources."source-map-0.5.6" sources."uglify-to-browserify-1.0.2" sources."yargs-3.10.0" @@ -24247,13 +23908,11 @@ in sources."align-text-0.1.4" sources."lazy-cache-1.0.4" sources."longest-1.0.1" - sources."bufferutil-1.2.1" - sources."utf-8-validate-1.2.1" - sources."bindings-1.2.1" - sources."nan-2.4.0" + sources."options-0.0.6" + sources."ultron-1.0.2" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.17.2" + sources."lodash-4.17.4" (sources."feedparser-1.1.3" // { dependencies = [ sources."sax-0.6.1" @@ -24284,7 +23943,6 @@ in sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" @@ -24300,11 +23958,11 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" sources."hoek-2.16.3" @@ -24313,7 +23971,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24322,7 +23980,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24333,7 +23991,7 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -24341,7 +23999,7 @@ in sources."nodemailer-1.11.0" sources."poplib-0.1.7" sources."mailparser-0.6.1" - (sources."imap-0.8.18" // { + (sources."imap-0.8.19" // { dependencies = [ sources."readable-stream-1.1.14" sources."isarray-0.0.1" @@ -24381,48 +24039,48 @@ in sources."utf7-1.0.2" sources."twitter-ng-0.6.2" sources."oauth-0.9.14" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."asynckit-0.4.0" - (sources."serialport-4.0.6" // { - dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - ]; - }) - sources."lie-3.1.0" - (sources."node-pre-gyp-0.6.31" // { + sources."bindings-1.2.1" + sources."nan-2.5.0" + (sources."node-pre-gyp-0.6.32" // { dependencies = [ sources."request-2.79.0" sources."form-data-2.1.2" sources."qs-6.3.0" ]; }) - sources."object.assign-4.0.4" - sources."immediate-3.0.6" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."npmlog-4.0.1" + sources."npmlog-4.0.2" sources."rc-1.1.6" + (sources."rimraf-2.5.4" // { + dependencies = [ + sources."glob-7.1.1" + ]; + }) sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ - sources."once-1.3.3" sources."readable-stream-2.1.5" ]; }) sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.1" + (sources."gauge-2.7.2" // { + dependencies = [ + sources."supports-color-0.2.0" + ]; + }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" - sources."has-color-0.1.7" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" @@ -24431,14 +24089,11 @@ in sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-1.0.4" + sources."fs.realpath-1.0.0" sources."block-stream-0.0.9" sources."fstream-1.0.10" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."function-bind-1.1.0" - sources."object-keys-1.0.11" - sources."define-properties-1.1.2" - sources."foreach-2.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -24502,7 +24157,7 @@ in sources."methods-0.0.1" sources."send-0.1.0" sources."cookie-signature-1.0.1" - (sources."debug-2.3.3" // { + (sources."debug-2.6.0" // { dependencies = [ sources."ms-0.7.2" ]; @@ -24512,7 +24167,7 @@ in sources."bytes-0.2.0" sources."pause-0.0.1" sources."mime-1.2.6" - sources."coffee-script-1.11.1" + sources."coffee-script-1.12.2" sources."vows-0.8.1" sources."eyes-0.1.8" sources."diff-1.0.8" @@ -24541,17 +24196,18 @@ in sources."tinycolor-0.0.1" sources."options-0.0.6" sources."zeparser-0.0.5" - sources."mailcomposer-3.12.0" + sources."mailcomposer-4.0.1" sources."simplesmtp-0.3.35" sources."optimist-0.6.1" - sources."buildmail-3.10.0" - sources."libmime-2.1.0" + sources."buildmail-4.0.1" + sources."libmime-3.0.0" sources."addressparser-1.0.1" sources."libbase64-0.1.0" sources."libqp-1.1.0" sources."nodemailer-fetch-1.6.0" sources."nodemailer-shared-1.1.0" - sources."iconv-lite-0.4.13" + sources."punycode-1.4.1" + sources."iconv-lite-0.4.15" sources."rai-0.1.12" sources."xoauth2-0.1.8" sources."wordwrap-0.0.3" @@ -24576,10 +24232,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.0.2"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz"; - sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae"; + url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz"; + sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4"; }; dependencies = [ sources."JSONStream-1.2.1" @@ -24612,7 +24268,7 @@ in sources."glob-6.0.4" ]; }) - sources."lockfile-1.0.2" + sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.5.0" sources."lodash.union-4.6.0" @@ -24622,29 +24278,26 @@ in sources."mkdirp-0.5.1" (sources."node-gyp-3.4.0" // { dependencies = [ + sources."nopt-3.0.6" sources."npmlog-3.1.2" ]; }) - sources."nopt-3.0.6" + sources."nopt-4.0.1" sources."normalize-git-url-3.0.2" sources."normalize-package-data-2.3.5" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.0" - (sources."npm-registry-client-7.3.0" // { - dependencies = [ - sources."npmlog-3.1.2" - ]; - }) + sources."npm-registry-client-7.4.5" sources."npm-user-validate-0.1.5" - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ - sources."gauge-2.7.1" + sources."gauge-2.7.2" ]; }) sources."once-1.4.0" sources."opener-1.4.2" - sources."osenv-0.1.3" + sources."osenv-0.1.4" sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" @@ -24655,10 +24308,10 @@ in ]; }) sources."read-package-tree-5.1.5" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."realize-package-specifier-3.0.3" - sources."request-2.78.0" - sources."retry-0.10.0" + sources."request-2.79.0" + sources."retry-0.10.1" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."sha-2.0.1" @@ -24678,11 +24331,12 @@ in sources."umask-1.1.0" sources."unique-filename-1.1.0" sources."unpipe-1.0.0" + sources."uuid-3.0.1" sources."validate-npm-package-name-2.2.2" sources."which-1.2.12" sources."wrappy-1.0.2" sources."write-file-atomic-1.2.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -24693,7 +24347,7 @@ in sources."lodash.restparam-3.6.1" sources."readdir-scoped-modules-1.0.2" sources."validate-npm-package-license-3.0.1" - sources."jsonparse-1.2.0" + sources."jsonparse-1.3.0" sources."through-2.3.8" sources."wcwidth-1.0.1" sources."defaults-1.0.3" @@ -24709,11 +24363,7 @@ in sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) + sources."concat-stream-1.6.0" (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" @@ -24727,20 +24377,11 @@ in }) sources."flush-write-stream-1.0.2" sources."from2-2.3.0" - sources."pump-1.0.1" + sources."pump-1.0.2" sources."pumpify-1.3.5" sources."stream-each-1.2.0" - (sources."through2-2.0.1" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) + sources."through2-2.0.3" sources."typedarray-0.0.6" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" sources."stream-shift-1.0.0" sources."xtend-4.0.1" sources."minimist-0.0.8" @@ -24751,15 +24392,15 @@ in sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."array-index-1.0.0" - sources."debug-2.3.3" + sources."debug-2.6.0" sources."es6-symbol-3.1.0" sources."ms-0.7.2" sources."d-0.1.1" @@ -24767,13 +24408,19 @@ in sources."es6-iterator-2.0.0" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" + sources."supports-color-0.2.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" sources."util-extend-1.0.3" sources."json-parse-helpfulerror-1.0.3" sources."jju-1.3.0" sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.5.0" sources."caseless-0.11.0" @@ -24787,8 +24434,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -24796,18 +24442,21 @@ in sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" sources."hoek-2.16.3" @@ -24816,7 +24465,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24825,7 +24474,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24836,11 +24485,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" @@ -24896,7 +24545,7 @@ in }) sources."fs.extra-1.3.2" sources."findit-1.2.0" - sources."coffee-script-1.11.1" + sources."coffee-script-1.12.2" sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."request-2.79.0" @@ -24907,7 +24556,7 @@ in sources."rimraf-2.5.4" sources."retry-0.6.0" sources."couch-login-0.1.20" - sources."npmlog-4.0.1" + sources."npmlog-4.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.5.0" sources."caseless-0.11.0" @@ -24921,13 +24570,13 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -24939,11 +24588,11 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -24953,7 +24602,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24962,7 +24611,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24973,11 +24622,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -24992,7 +24641,11 @@ in sources."concat-map-0.0.1" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.1" + (sources."gauge-2.7.2" // { + dependencies = [ + sources."supports-color-0.2.0" + ]; + }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -25003,10 +24656,9 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."aproba-1.0.4" - sources."has-color-0.1.7" sources."has-unicode-2.0.1" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" @@ -25051,13 +24703,13 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.8.6"; + version = "2.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.6.tgz"; - sha1 = "9e3a0865b29dfc9af8c3d53d95b43f4bc6b1f212"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz"; + sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3"; }; dependencies = [ - sources."bluebird-3.4.6" + sources."bluebird-3.4.7" sources."chalk-1.1.3" sources."cint-8.2.1" sources."cli-table-0.3.1" @@ -25066,7 +24718,7 @@ in sources."find-up-1.1.2" sources."get-stdin-5.0.1" sources."json-parse-helpfulerror-1.0.3" - sources."lodash-4.17.2" + sources."lodash-4.17.4" sources."node-alias-1.0.4" sources."npm-3.10.10" (sources."npmi-2.0.1" // { @@ -25078,13 +24730,13 @@ in sources."semver-5.3.0" sources."semver-utils-1.1.1" sources."spawn-please-0.2.0" - sources."update-notifier-1.0.2" + sources."update-notifier-1.0.3" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."colors-1.0.3" sources."graceful-readlink-1.0.1" sources."path-exists-2.1.0" @@ -25120,7 +24772,7 @@ in sources."glob-6.0.4" ]; }) - sources."lockfile-1.0.2" + sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.5.0" sources."lodash.union-4.6.0" @@ -25144,14 +24796,15 @@ in ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-4.0.1" // { + (sources."npmlog-4.0.2" // { dependencies = [ - sources."gauge-2.7.1" + sources."gauge-2.7.2" + sources."supports-color-0.2.0" ]; }) sources."once-1.4.0" sources."opener-1.4.2" - sources."osenv-0.1.3" + sources."osenv-0.1.4" sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" @@ -25165,7 +24818,7 @@ in sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" sources."request-2.75.0" - sources."retry-0.10.0" + sources."retry-0.10.1" sources."rimraf-2.5.4" sources."sha-2.0.1" sources."slide-1.1.6" @@ -25212,15 +24865,15 @@ in sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."array-index-1.0.0" - sources."debug-2.3.3" + sources."debug-2.6.0" sources."es6-symbol-3.1.0" sources."ms-0.7.2" sources."d-0.1.1" @@ -25228,12 +24881,13 @@ in sources."es6-iterator-2.0.0" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" - (sources."concat-stream-1.5.2" // { + (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.0.6" + sources."readable-stream-2.2.2" ]; }) sources."typedarray-0.0.6" + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -25241,9 +24895,8 @@ in sources."util-deprecate-1.0.2" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" sources."util-extend-1.0.3" - sources."buffer-shims-1.0.0" sources."aws-sign2-0.6.0" sources."aws4-1.5.0" (sources."bl-1.1.2" // { @@ -25262,7 +24915,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -25274,7 +24927,7 @@ in sources."is-my-json-valid-2.15.0" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."hoek-2.16.3" @@ -25283,7 +24936,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25292,7 +24945,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25303,11 +24956,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" @@ -25346,7 +24999,7 @@ in sources."node-status-codes-1.0.0" sources."parse-json-2.2.0" sources."read-all-stream-3.1.0" - sources."timed-out-3.0.0" + sources."timed-out-3.1.3" sources."unzip-response-1.0.2" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" @@ -25365,7 +25018,7 @@ in meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; homepage = https://github.com/tjunnone/npm-check-updates; - license = "MIT"; + license = "Apache-2.0"; }; production = true; }; @@ -25380,7 +25033,7 @@ in dependencies = [ sources."async-0.9.2" sources."babybird-0.0.1" - (sources."body-parser-1.15.2" // { + (sources."body-parser-1.16.0" // { dependencies = [ sources."content-type-1.0.2" ]; @@ -25388,6 +25041,8 @@ in (sources."compression-1.6.2" // { dependencies = [ sources."bytes-2.3.0" + sources."debug-2.2.0" + sources."ms-0.7.1" ]; }) sources."connect-busboy-0.0.2" @@ -25399,11 +25054,19 @@ in (sources."express-4.14.0" // { dependencies = [ sources."content-type-1.0.2" + sources."debug-2.2.0" sources."finalhandler-0.5.0" + sources."qs-6.2.0" + sources."ms-0.7.1" ]; }) sources."express-handlebars-3.0.0" - sources."finalhandler-0.5.1" + (sources."finalhandler-0.5.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."gelf-stream-0.2.4" sources."js-yaml-3.7.0" sources."mediawiki-title-0.5.6" @@ -25417,12 +25080,8 @@ in ]; }) sources."semver-5.3.0" - (sources."serve-favicon-2.3.2" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."service-runner-2.1.11" // { + sources."serve-favicon-2.3.2" + (sources."service-runner-2.1.13" // { dependencies = [ sources."gelf-stream-1.1.1" sources."yargs-5.0.0" @@ -25443,28 +25102,28 @@ in sources."asap-2.0.5" sources."is-arguments-1.0.2" sources."bytes-2.4.0" - sources."debug-2.2.0" + sources."debug-2.6.0" sources."depd-1.1.0" sources."http-errors-1.5.1" - sources."iconv-lite-0.4.13" + sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" - sources."qs-6.2.0" - sources."raw-body-2.1.7" + sources."qs-6.2.1" + sources."raw-body-2.2.0" sources."type-is-1.6.14" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."inherits-2.0.3" sources."setprototypeof-1.0.2" sources."statuses-1.3.1" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.13" - sources."mime-db-1.25.0" + sources."mime-types-2.1.14" + sources."mime-db-1.26.0" sources."accepts-1.3.3" sources."compressible-2.0.9" sources."on-headers-1.0.1" sources."vary-1.1.0" - sources."busboy-0.2.13" + sources."busboy-0.2.14" sources."dicer-0.2.5" sources."readable-stream-1.1.14" sources."streamsearch-0.1.2" @@ -25483,13 +25142,18 @@ in sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.2" + sources."proxy-addr-1.1.3" sources."range-parser-1.2.0" - sources."send-0.14.1" + (sources."send-0.14.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."serve-static-1.11.1" sources."utils-merge-1.0.0" sources."forwarded-0.1.0" - sources."ipaddr.js-1.1.1" + sources."ipaddr.js-1.2.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."glob-6.0.4" @@ -25511,7 +25175,7 @@ in sources."concat-map-0.0.1" sources."optimist-0.6.1" sources."source-map-0.4.4" - (sources."uglify-js-2.7.4" // { + (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" sources."source-map-0.5.6" @@ -25534,7 +25198,7 @@ in sources."right-align-0.1.3" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.4" @@ -25563,7 +25227,7 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -25575,11 +25239,11 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -25589,7 +25253,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25598,7 +25262,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25609,12 +25273,12 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" sources."punycode-1.4.1" - sources."bluebird-3.4.6" + sources."bluebird-3.4.7" sources."bunyan-1.8.5" sources."bunyan-syslog-udp-0.1.0" sources."hot-shots-4.3.1" @@ -25627,8 +25291,8 @@ in sources."dtrace-provider-0.8.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" - sources."moment-2.17.0" - sources."nan-2.4.0" + sources."moment-2.17.1" + sources."nan-2.5.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -25665,9 +25329,9 @@ in sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."dom-storage-2.0.2" - (sources."bl-1.1.2" // { + (sources."bl-1.2.0" // { dependencies = [ - sources."readable-stream-2.0.6" + sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) @@ -25686,7 +25350,7 @@ in sources."camelcase-3.0.0" ]; }) - sources."wrap-ansi-2.0.0" + sources."wrap-ansi-2.1.0" sources."lcid-1.0.0" sources."invert-kv-1.0.0" sources."find-up-1.1.2" @@ -25723,23 +25387,23 @@ in peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; - version = "0.36.0"; + version = "0.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.0.tgz"; - sha1 = "fe3b087f07389ca1c2fd3d71e38a7971d5508924"; + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz"; + sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14"; }; dependencies = [ sources."airplayer-2.0.0" sources."clivas-0.2.0" (sources."inquirer-1.2.3" // { dependencies = [ - sources."lodash-4.17.2" + sources."lodash-4.17.4" ]; }) sources."keypress-0.2.1" sources."mime-1.3.4" - sources."network-address-1.1.0" - sources."numeral-1.5.5" + sources."network-address-1.1.2" + sources."numeral-1.5.6" sources."open-0.0.5" (sources."optimist-0.6.1" // { dependencies = [ @@ -25751,7 +25415,7 @@ in sources."get-stdin-5.0.1" ]; }) - sources."pump-1.0.1" + sources."pump-1.0.2" sources."range-parser-1.2.0" sources."rc-1.1.6" (sources."torrent-stream-1.0.3" // { @@ -25775,14 +25439,15 @@ in sources."server-destroy-1.0.1" sources."bplist-creator-0.0.6" sources."bplist-parser-0.1.1" - sources."concat-stream-1.5.2" + sources."concat-stream-1.6.0" sources."plist-1.2.0" sources."reverse-http-1.2.0" sources."stream-buffers-2.2.0" sources."big-integer-1.6.17" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.0.6" + sources."readable-stream-2.2.2" + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -25790,7 +25455,7 @@ in sources."util-deprecate-1.0.2" sources."base64-js-0.0.8" sources."xmlbuilder-4.0.0" - sources."xmldom-0.1.22" + sources."xmldom-0.1.27" sources."lodash-3.10.1" sources."consume-http-header-1.0.0" sources."once-1.4.0" @@ -25806,12 +25471,12 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."string-width-1.0.2" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."array-flatten-2.1.0" + sources."array-flatten-2.1.1" sources."deep-equal-1.0.1" sources."dns-equal-1.0.0" sources."dns-txt-2.0.2" @@ -25827,13 +25492,13 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."normalize-package-data-2.3.5" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -25868,7 +25533,7 @@ in sources."external-editor-1.1.1" sources."figures-1.7.0" sources."mute-stream-0.0.6" - sources."run-async-2.2.0" + sources."run-async-2.3.0" sources."rx-4.1.0" sources."through-2.3.8" sources."restore-cursor-1.0.1" @@ -25883,13 +25548,13 @@ in sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" sources."magnet-uri-5.1.5" - sources."parse-torrent-file-4.0.0" - sources."simple-get-2.3.0" + sources."parse-torrent-file-4.0.1" + sources."simple-get-2.4.0" sources."thirty-two-1.0.2" sources."uniq-1.0.1" - sources."bencode-0.10.0" - sources."simple-sha1-2.0.8" - sources."rusha-0.8.4" + sources."bencode-0.11.0" + sources."simple-sha1-2.1.0" + sources."rusha-0.8.5" sources."simple-concat-1.0.0" sources."unzip-response-2.0.1" (sources."end-of-stream-1.1.0" // { @@ -25917,7 +25582,7 @@ in sources."rimraf-2.5.4" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.0" - (sources."random-access-file-1.3.1" // { + (sources."random-access-file-1.4.0" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.1" @@ -25926,6 +25591,8 @@ in }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" + sources."debug-2.6.0" + sources."ms-0.7.2" sources."flatten-0.0.1" sources."fifo-0.1.4" (sources."peer-wire-protocol-0.7.0" // { @@ -25956,7 +25623,6 @@ in sources."bencode-0.8.0" ]; }) - sources."debug-2.3.3" sources."re-emitter-1.1.3" sources."buffer-equals-1.0.4" sources."k-bucket-0.6.0" @@ -25967,13 +25633,13 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.6.0" + sources."k-rpc-socket-1.6.1" sources."bn.js-4.11.6" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" - sources."simple-peer-6.0.7" - sources."simple-websocket-4.1.0" + sources."simple-peer-6.2.1" + sources."simple-websocket-4.2.0" sources."string2compact-1.2.2" sources."ws-1.1.1" sources."ipaddr.js-1.2.0" @@ -25981,7 +25647,6 @@ in sources."addr-to-ip-port-1.4.2" sources."options-0.0.6" sources."ultron-1.0.2" - sources."ms-0.7.2" ]; buildInputs = globalBuildInputs; meta = { @@ -25994,10 +25659,10 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz"; - sha1 = "683d54067d44699b2eff8bfc793e780df2912666"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz"; + sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6"; }; dependencies = [ sources."connect-multiparty-1.2.5" @@ -26009,10 +25674,10 @@ in }) sources."lodash-2.4.2" sources."mkdirp-0.5.1" - sources."pump-1.0.1" + sources."pump-1.0.2" sources."range-parser-1.2.0" sources."read-torrent-1.3.0" - (sources."socket.io-1.6.0" // { + (sources."socket.io-1.7.2" // { dependencies = [ sources."debug-2.3.3" ]; @@ -26131,8 +25796,8 @@ in sources."parse-torrent-file-2.1.4" sources."flatten-0.0.1" sources."bencode-0.7.0" - sources."simple-sha1-2.0.8" - sources."rusha-0.8.4" + sources."simple-sha1-2.1.0" + sources."rusha-0.8.5" sources."form-data-0.0.10" sources."hawk-0.10.2" sources."node-uuid-1.4.7" @@ -26149,7 +25814,7 @@ in sources."boom-0.3.8" sources."cryptiles-0.1.3" sources."sntp-0.1.4" - (sources."engine.io-1.8.0" // { + (sources."engine.io-1.8.2" // { dependencies = [ sources."debug-2.3.3" sources."cookie-0.3.1" @@ -26162,7 +25827,7 @@ in sources."debug-2.3.3" ]; }) - (sources."socket.io-client-1.6.0" // { + (sources."socket.io-client-1.7.2" // { dependencies = [ sources."debug-2.3.3" ]; @@ -26177,19 +25842,15 @@ in sources."ms-0.7.2" (sources."accepts-1.3.3" // { dependencies = [ - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."negotiator-0.6.1" - sources."mime-db-1.25.0" - ]; - }) - sources."base64id-0.1.0" - (sources."engine.io-parser-1.3.1" // { - dependencies = [ - sources."has-binary-0.1.6" + sources."mime-db-1.26.0" ]; }) + sources."base64id-1.0.0" + sources."engine.io-parser-1.3.2" sources."ws-1.1.1" - sources."after-0.8.1" + sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" @@ -26199,7 +25860,7 @@ in sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - (sources."engine.io-client-1.8.0" // { + (sources."engine.io-client-1.8.2" // { dependencies = [ sources."debug-2.3.3" ]; @@ -26220,13 +25881,13 @@ in sources."bitfield-0.1.0" (sources."bittorrent-dht-3.2.6" // { dependencies = [ - sources."debug-2.3.3" + sources."debug-2.6.0" ]; }) (sources."bittorrent-tracker-2.12.1" // { dependencies = [ sources."bencode-0.6.0" - sources."debug-2.3.3" + sources."debug-2.6.0" ]; }) sources."bncode-0.5.3" @@ -26246,7 +25907,7 @@ in sources."buffer-equal-0.0.1" sources."is-ip-1.0.0" sources."k-bucket-0.5.0" - sources."network-address-1.1.0" + sources."network-address-1.1.2" sources."run-parallel-1.1.6" sources."simple-get-1.4.3" sources."string2compact-1.2.2" @@ -26342,7 +26003,7 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."node-uuid-1.4.7" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -26357,11 +26018,11 @@ in sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" sources."async-2.1.4" - sources."lodash-4.17.2" - sources."mime-db-1.25.0" + sources."lodash-4.17.4" + sources."mime-db-1.26.0" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26370,7 +26031,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26381,7 +26042,7 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -26398,11 +26059,11 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."throttleit-1.0.0" @@ -26439,7 +26100,7 @@ in sources."mkdirp-0.5.1" sources."private-0.1.6" sources."q-1.4.1" - sources."recast-0.11.17" + sources."recast-0.11.20" sources."graceful-readlink-1.0.1" sources."acorn-3.3.0" sources."defined-1.0.0" @@ -26453,8 +26114,8 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" - sources."ast-types-0.9.2" - sources."esprima-3.1.1" + sources."ast-types-0.9.4" + sources."esprima-3.1.3" sources."source-map-0.5.6" sources."base62-0.1.1" sources."esprima-fb-13001.1001.0-dev-harmony-fb" @@ -26518,7 +26179,7 @@ in sources."methods-0.1.0" sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-2.3.3" + sources."debug-2.6.0" sources."qs-0.6.5" sources."bytes-0.2.1" sources."pause-0.0.1" @@ -26564,12 +26225,12 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -26580,11 +26241,11 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -26594,7 +26255,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26603,7 +26264,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26614,11 +26275,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."events.node-0.4.9" ]; @@ -26654,13 +26315,15 @@ in dependencies = [ sources."express-5.0.0-alpha.2" sources."express-json5-0.1.0" - (sources."body-parser-1.15.2" // { + (sources."body-parser-1.16.0" // { dependencies = [ sources."bytes-2.4.0" + sources."debug-2.6.0" sources."depd-1.1.0" - sources."iconv-lite-0.4.13" - sources."qs-6.2.0" - sources."raw-body-2.1.7" + sources."iconv-lite-0.4.15" + sources."qs-6.2.1" + sources."raw-body-2.2.0" + sources."ms-0.7.2" ]; }) (sources."compression-1.6.2" // { @@ -26693,7 +26356,7 @@ in sources."lunr-0.7.2" sources."render-readme-1.3.1" sources."jju-1.3.0" - sources."JSONStream-1.2.1" + sources."JSONStream-1.3.0" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" (sources."http-errors-1.5.1" // { @@ -26753,9 +26416,9 @@ in sources."type-is-1.6.14" sources."vary-1.0.1" sources."utils-merge-1.0.0" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."negotiator-0.5.3" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."ms-0.7.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" @@ -26794,7 +26457,7 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -26805,10 +26468,10 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -26818,7 +26481,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26827,7 +26490,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26838,7 +26501,7 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -26848,8 +26511,8 @@ in sources."dtrace-provider-0.8.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" - sources."moment-2.17.0" - sources."nan-2.4.0" + sources."moment-2.17.1" + sources."nan-2.5.0" sources."ncp-2.0.0" sources."rimraf-2.4.5" (sources."glob-6.0.4" // { @@ -26873,7 +26536,7 @@ in sources."source-map-0.1.43" sources."amdefine-1.0.1" sources."markdown-it-4.4.0" - sources."sanitize-html-1.13.0" + sources."sanitize-html-1.14.1" sources."entities-1.1.1" sources."linkify-it-1.2.4" sources."mdurl-1.0.1" @@ -26898,7 +26561,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."jsonparse-1.2.0" + sources."jsonparse-1.3.0" sources."through-2.3.8" sources."minimist-0.0.8" ]; @@ -27012,7 +26675,7 @@ in sources."backoff-2.5.0" sources."csv-0.4.6" sources."escape-regexp-component-1.0.2" - sources."formidable-1.0.17" + sources."formidable-1.1.1" sources."http-signature-0.11.0" sources."keep-alive-agent-0.0.1" sources."mime-1.3.4" @@ -27031,7 +26694,7 @@ in sources."dtrace-provider-0.6.0" sources."precond-0.2.3" sources."csv-generate-0.0.6" - sources."csv-parse-1.1.7" + sources."csv-parse-1.1.10" sources."stream-transform-0.1.1" sources."csv-stringify-0.0.8" sources."asn1-0.1.11" @@ -27039,7 +26702,7 @@ in sources."wrappy-1.0.2" sources."extsprintf-1.2.0" sources."core-util-is-1.0.2" - sources."nan-2.4.0" + sources."nan-2.5.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" sources."mkdirp-0.5.1" @@ -27059,7 +26722,7 @@ in dependencies = [ sources."asn1-0.2.3" sources."assert-plus-0.2.0" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27080,7 +26743,7 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" ]; @@ -27102,7 +26765,7 @@ in dependencies = [ sources."css-parse-1.7.0" sources."mkdirp-0.5.1" - sources."debug-2.3.3" + sources."debug-2.6.0" sources."sax-0.5.8" sources."glob-7.0.6" sources."source-map-0.1.43" @@ -27149,7 +26812,7 @@ in sources."esprima-2.7.3" sources."sprintf-js-1.0.3" sources."minimist-0.0.8" - sources."clap-1.1.1" + sources."clap-1.1.2" sources."source-map-0.5.6" sources."chalk-1.1.3" sources."ansi-styles-2.2.1" @@ -27157,7 +26820,7 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -27211,7 +26874,7 @@ in ]; }) sources."wrench-1.5.9" - sources."lodash-4.17.2" + sources."lodash-4.17.4" sources."keypress-0.2.1" sources."source-map-support-0.3.2" sources."source-map-0.1.32" @@ -27243,7 +26906,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.0.2" sources."stringstream-0.0.5" @@ -27266,11 +26929,11 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" @@ -27280,7 +26943,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27289,7 +26952,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27300,11 +26963,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."uglify-to-browserify-1.0.2" sources."yargs-3.10.0" sources."camelcase-1.2.1" @@ -27319,7 +26982,7 @@ in sources."right-align-0.1.3" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.4" @@ -27343,10 +27006,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.0.10"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz"; - sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz"; + sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a"; }; buildInputs = globalBuildInputs; meta = { @@ -27359,10 +27022,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.4"; + version = "2.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz"; - sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; + sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; }; dependencies = [ sources."async-0.2.10" @@ -27378,7 +27041,7 @@ in sources."wordwrap-0.0.2" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.4" @@ -27394,53 +27057,46 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "0.10.3"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-0.10.3.tgz"; - sha1 = "7d4635b9a359c8db06c313374544f27a3890f63c"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz"; + sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418"; }; dependencies = [ - sources."async-2.0.1" - sources."bluebird-3.3.5" - sources."blueimp-md5-2.3.1" + sources."async-2.1.4" + sources."bluebird-3.4.7" + sources."blueimp-md5-2.6.0" sources."body-parser-1.15.2" - sources."color-0.11.4" + sources."color-1.0.3" sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" - sources."diff2html-1.2.0" - (sources."express-4.13.4" // { - dependencies = [ - sources."cookie-0.1.5" - sources."qs-4.0.0" - ]; - }) - (sources."express-session-1.13.0" // { - dependencies = [ - sources."cookie-0.2.3" - ]; - }) + sources."diff2html-2.0.12" + sources."express-4.14.0" + sources."express-session-1.14.2" sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" + sources."ignore-3.2.0" sources."keen.io-0.1.3" sources."knockout-3.4.1" - sources."lodash-4.12.0" + sources."lodash-4.17.4" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."moment-2.13.0" - (sources."npm-3.9.6" // { + sources."moment-2.17.1" + (sources."npm-4.1.2" // { dependencies = [ - sources."request-2.72.0" + sources."nopt-4.0.1" + sources."request-2.79.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.1.2" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."qs-6.1.0" + sources."qs-6.3.0" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."hoek-2.16.3" @@ -27449,10 +27105,9 @@ in sources."sntp-1.0.9" ]; }) - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.4.5" // { dependencies = [ sources."request-2.79.0" - sources."retry-0.8.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" sources."form-data-2.1.2" @@ -27460,7 +27115,6 @@ in sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" sources."qs-6.3.0" - sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."hoek-2.16.3" @@ -27474,10 +27128,10 @@ in sources."os-homedir-1.0.2" sources."passport-0.3.2" sources."passport-local-1.0.0" - (sources."raven-0.11.0" // { + (sources."raven-1.1.1" // { dependencies = [ - sources."cookie-0.1.0" - sources."stack-trace-0.0.7" + sources."json-stringify-safe-5.0.1" + sources."uuid-3.0.0" ]; }) (sources."rc-1.1.6" // { @@ -27486,21 +27140,22 @@ in ]; }) sources."rimraf-2.5.4" - sources."semver-5.1.1" - (sources."serve-static-1.10.3" // { - dependencies = [ - sources."send-0.13.2" - sources."http-errors-1.3.1" - sources."statuses-1.2.1" - ]; - }) + sources."semver-5.3.0" + sources."serve-static-1.11.1" sources."signals-1.0.0" sources."snapsvg-0.4.0" - sources."socket.io-1.4.8" + (sources."socket.io-1.7.2" // { + dependencies = [ + sources."debug-2.3.3" + sources."object-assign-4.1.0" + sources."ms-0.7.2" + ]; + }) (sources."superagent-0.21.0" // { dependencies = [ sources."qs-1.2.0" sources."mime-1.2.11" + sources."component-emitter-1.1.2" sources."methods-1.0.1" sources."extend-1.2.1" sources."form-data-0.1.3" @@ -27514,14 +27169,13 @@ in sources."rimraf-2.2.8" ]; }) - (sources."winston-2.2.0" // { + (sources."winston-2.3.1" // { dependencies = [ sources."async-1.0.0" sources."colors-1.0.3" - sources."pkginfo-0.3.1" ]; }) - sources."yargs-4.7.1" + sources."yargs-6.6.0" sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.2.0" @@ -27539,45 +27193,51 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.13" - sources."mime-db-1.25.0" - sources."clone-1.0.2" - sources."color-convert-1.8.2" - sources."color-string-0.3.0" + sources."mime-types-2.1.14" + sources."mime-db-1.26.0" + sources."color-convert-1.9.0" + sources."color-string-1.4.0" sources."color-name-1.1.1" + sources."simple-swizzle-0.2.2" + sources."is-arrayish-0.3.1" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."diff-2.2.3" - sources."accepts-1.2.13" + sources."diff-3.2.0" + (sources."hogan.js-3.0.2" // { + dependencies = [ + sources."mkdirp-0.3.0" + ]; + }) + sources."whatwg-fetch-2.0.2" + sources."nopt-1.0.10" + sources."abbrev-1.0.9" + sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" + sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - sources."finalhandler-0.4.1" + sources."finalhandler-0.5.0" sources."fresh-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.0.10" - sources."range-parser-1.0.3" - (sources."send-0.13.1" // { - dependencies = [ - sources."http-errors-1.3.1" - sources."statuses-1.2.1" - ]; - }) + sources."proxy-addr-1.1.3" + sources."range-parser-1.2.0" + sources."send-0.14.1" sources."utils-merge-1.0.0" - sources."vary-1.0.1" - sources."negotiator-0.5.3" + sources."vary-1.1.0" + sources."negotiator-0.6.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.0.5" + sources."ipaddr.js-1.2.0" sources."destroy-1.0.4" sources."mime-1.3.4" - sources."crc-3.4.0" + sources."crc-3.4.1" sources."on-headers-1.0.1" - sources."uid-safe-2.0.0" - sources."base64-url-1.2.1" + sources."uid-safe-2.1.3" + sources."base64-url-1.3.3" + sources."random-bytes-1.0.0" (sources."broadway-0.2.10" // { dependencies = [ sources."winston-0.7.2" @@ -27654,13 +27314,14 @@ in sources."extract-opts-3.3.1" sources."eachr-3.2.0" sources."editions-1.3.3" - sources."typechecker-4.4.0" + sources."typechecker-4.4.1" sources."underscore-1.5.2" - sources."abbrev-1.0.9" + sources."JSONStream-1.3.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" + sources."asap-2.0.5" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" @@ -27670,8 +27331,8 @@ in sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - sources."fstream-npm-1.1.1" - (sources."glob-7.0.6" // { + sources."fstream-npm-1.2.0" + (sources."glob-7.1.1" // { dependencies = [ sources."minimatch-3.0.3" ]; @@ -27687,34 +27348,29 @@ in sources."minimatch-3.0.3" ]; }) - sources."lockfile-1.0.2" + sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" - sources."lodash.clonedeep-4.3.2" - sources."lodash.union-4.4.0" - sources."lodash.uniq-4.3.0" - sources."lodash.without-4.2.0" - (sources."node-gyp-3.3.1" // { + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" + sources."mississippi-1.2.0" + (sources."node-gyp-3.5.0" // { dependencies = [ - (sources."glob-4.5.3" // { - dependencies = [ - sources."minimatch-2.0.10" - ]; - }) - sources."minimatch-1.0.0" - sources."lru-cache-2.7.3" + sources."minimatch-3.0.3" + sources."nopt-3.0.6" ]; }) - sources."nopt-3.0.6" sources."normalize-git-url-3.0.2" sources."normalize-package-data-2.3.5" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" - sources."npm-package-arg-4.1.1" + sources."npm-package-arg-4.2.0" sources."npm-user-validate-0.1.5" - sources."npmlog-2.0.4" - sources."once-1.3.3" + sources."npmlog-4.0.2" + sources."once-1.4.0" sources."opener-1.4.2" - sources."osenv-0.1.3" + sources."osenv-0.1.4" sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" @@ -27726,23 +27382,31 @@ in ]; }) sources."read-package-tree-5.1.5" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."realize-package-specifier-3.0.3" - sources."retry-0.9.0" + sources."retry-0.10.1" sources."sha-2.0.1" sources."slide-1.1.6" sources."sorted-object-2.0.1" + (sources."sorted-union-stream-2.1.3" // { + dependencies = [ + sources."from2-1.3.0" + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + ]; + }) sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unique-filename-1.1.0" + sources."uuid-3.0.1" sources."validate-npm-package-name-2.2.2" sources."which-1.2.12" sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" - sources."ansi-regex-2.0.0" + sources."write-file-atomic-1.3.1" + sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -27753,10 +27417,12 @@ in sources."lodash.restparam-3.6.1" sources."readdir-scoped-modules-1.0.2" sources."validate-npm-package-license-3.0.1" + sources."jsonparse-1.3.0" + sources."through-2.3.8" sources."wcwidth-1.0.1" sources."defaults-1.0.3" + sources."clone-1.0.2" sources."proto-list-1.2.4" - sources."asap-2.0.5" (sources."fstream-ignore-1.0.5" // { dependencies = [ sources."minimatch-3.0.3" @@ -27770,28 +27436,44 @@ in sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" - sources."lodash._baseclone-4.5.7" - sources."lodash._baseflatten-4.2.1" - sources."lodash.rest-4.0.5" - sources."lodash._basedifference-4.5.0" - sources."path-array-1.0.1" - sources."sigmund-1.0.1" - sources."array-index-1.0.0" - sources."es6-symbol-3.1.0" - sources."d-0.1.1" - sources."es5-ext-0.10.12" - sources."es6-iterator-2.0.0" + sources."concat-stream-1.6.0" + (sources."duplexify-3.5.0" // { + dependencies = [ + sources."end-of-stream-1.0.0" + sources."once-1.3.3" + ]; + }) + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."flush-write-stream-1.0.2" + sources."from2-2.3.0" + sources."pump-1.0.2" + sources."pumpify-1.3.5" + sources."stream-each-1.2.0" + sources."through2-2.0.3" + sources."typedarray-0.0.6" + sources."stream-shift-1.0.0" + sources."xtend-4.0.1" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" - sources."ansi-0.3.1" sources."are-we-there-yet-1.1.2" - sources."gauge-1.2.7" + sources."console-control-strings-1.1.0" + sources."gauge-2.7.2" + sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."lodash.pad-4.5.1" - sources."lodash.padend-4.6.1" - sources."lodash.padstart-4.6.1" + sources."supports-color-0.2.0" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."wide-align-1.1.0" + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" sources."os-tmpdir-1.0.2" - sources."mute-stream-0.0.6" + sources."mute-stream-0.0.7" sources."util-extend-1.0.3" sources."json-parse-helpfulerror-1.0.3" sources."jju-1.3.0" @@ -27803,11 +27485,6 @@ in sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.5.0" - (sources."bl-1.1.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) sources."caseless-0.11.0" sources."extend-3.0.0" sources."har-validator-2.0.6" @@ -27815,25 +27492,28 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" - sources."chalk-1.1.3" + sources."tough-cookie-2.3.2" + sources."asynckit-0.4.0" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" - sources."xtend-4.0.1" + sources."jsonpointer-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27842,7 +27522,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27853,10 +27533,12 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" + sources."punycode-1.4.1" + sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" sources."builtins-0.0.7" @@ -27864,48 +27546,16 @@ in sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) - sources."typedarray-0.0.6" - sources."uuid-3.0.0" - sources."asynckit-0.4.0" - sources."punycode-1.4.1" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" sources."deep-extend-0.4.1" sources."strip-json-comments-1.0.4" sources."eve-0.4.2" - (sources."engine.io-1.6.11" // { + (sources."engine.io-1.8.2" // { dependencies = [ - sources."accepts-1.1.4" - sources."mime-types-2.0.14" - sources."negotiator-0.4.9" - sources."mime-db-1.12.0" - ]; - }) - (sources."socket.io-parser-2.2.6" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) - (sources."socket.io-client-1.4.8" // { - dependencies = [ - sources."component-emitter-1.2.0" - ]; - }) - (sources."socket.io-adapter-0.4.0" // { - dependencies = [ - (sources."socket.io-parser-2.2.2" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - sources."json3-3.2.6" - sources."isarray-0.0.1" + sources."debug-2.3.3" + sources."ms-0.7.2" ]; }) (sources."has-binary-0.1.7" // { @@ -27913,78 +27563,87 @@ in sources."isarray-0.0.1" ]; }) - sources."base64id-0.1.0" - sources."ws-1.1.0" - (sources."engine.io-parser-1.2.4" // { + (sources."socket.io-adapter-0.5.0" // { dependencies = [ - sources."has-binary-0.1.6" + sources."debug-2.3.3" + sources."ms-0.7.2" + ]; + }) + (sources."socket.io-client-1.7.2" // { + dependencies = [ + sources."debug-2.3.3" + sources."ms-0.7.2" + ]; + }) + (sources."socket.io-parser-2.3.1" // { + dependencies = [ + sources."component-emitter-1.1.2" sources."isarray-0.0.1" ]; }) + sources."base64id-1.0.0" + sources."engine.io-parser-1.3.2" + sources."ws-1.1.1" + sources."after-0.8.2" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + sources."wtf-8-1.0.0" sources."options-0.0.6" sources."ultron-1.0.2" - sources."after-0.8.1" - sources."arraybuffer.slice-0.0.6" - sources."base64-arraybuffer-0.1.2" - sources."blob-0.0.4" - sources."utf8-2.1.0" - sources."json3-3.3.2" - sources."component-emitter-1.1.2" - sources."benchmark-1.0.0" - (sources."engine.io-client-1.6.11" // { + sources."backo2-1.0.2" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + (sources."engine.io-client-1.8.2" // { dependencies = [ - sources."ws-1.0.1" + sources."debug-2.3.3" + sources."ms-0.7.2" ]; }) - sources."component-bind-1.0.0" - sources."object-component-0.0.3" sources."indexof-0.0.1" - sources."parseuri-0.0.4" + sources."object-component-0.0.3" + sources."parseuri-0.0.5" sources."to-array-0.1.4" - sources."backo2-1.0.2" - sources."has-cors-1.1.0" - sources."xmlhttprequest-ssl-1.5.1" - sources."parsejson-0.0.1" - sources."parseqs-0.0.2" sources."component-inherit-0.0.3" + sources."has-cors-1.1.0" + sources."parsejson-0.0.3" + sources."parseqs-0.0.5" + sources."xmlhttprequest-ssl-1.5.3" sources."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" + sources."json3-3.3.2" sources."formidable-1.0.14" sources."cookiejar-2.0.1" sources."reduce-component-1.0.1" sources."camelcase-3.0.0" sources."cliui-3.2.0" sources."decamelize-1.2.0" - sources."lodash.assign-4.2.0" + sources."get-caller-file-1.0.2" sources."os-locale-1.4.0" - sources."pkg-conf-1.1.3" sources."read-pkg-up-1.0.1" + sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."set-blocking-1.0.0" - sources."string-width-1.0.2" - sources."window-size-0.2.0" + sources."which-module-1.0.0" sources."y18n-3.2.1" - sources."yargs-parser-2.4.1" - sources."wrap-ansi-2.0.0" + sources."yargs-parser-4.2.1" + sources."wrap-ansi-2.1.0" sources."lcid-1.0.0" sources."invert-kv-1.0.0" sources."find-up-1.1.2" - sources."load-json-file-1.1.0" - sources."object-assign-4.1.0" - sources."symbol-0.2.3" + sources."read-pkg-1.1.0" sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.0" - sources."is-arrayish-0.2.1" + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) sources."is-utf8-0.2.1" - sources."read-pkg-1.1.0" - sources."path-type-1.1.0" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -28073,7 +27732,7 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."node-uuid-1.4.7" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -28088,11 +27747,11 @@ in sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" sources."async-2.1.4" - sources."lodash-4.17.2" - sources."mime-db-1.25.0" + sources."lodash-4.17.4" + sources."mime-db-1.26.0" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28101,7 +27760,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28112,7 +27771,7 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" @@ -28129,11 +27788,11 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."throttleit-1.0.0" @@ -28152,12 +27811,13 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "1.13.3"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-1.13.3.tgz"; - sha1 = "e79c46fe5a37c5ca70084ba0894c595cdcb42815"; + url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz"; + sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823"; }; dependencies = [ + sources."acorn-3.3.0" sources."async-1.5.2" sources."clone-1.0.2" (sources."enhanced-resolve-0.9.1" // { @@ -28165,21 +27825,15 @@ in sources."memory-fs-0.2.0" ]; }) - sources."acorn-3.3.0" sources."interpret-0.6.6" sources."loader-utils-0.2.16" sources."memory-fs-0.3.0" sources."mkdirp-0.5.1" - (sources."node-libs-browser-0.6.0" // { - dependencies = [ - sources."readable-stream-1.1.14" - sources."isarray-0.0.1" - ]; - }) + sources."node-libs-browser-0.7.0" sources."optimist-0.6.1" - sources."supports-color-3.1.2" + sources."supports-color-3.2.3" sources."tapable-0.1.10" - (sources."uglify-js-2.7.4" // { + (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" ]; @@ -28189,7 +27843,7 @@ in sources."async-0.9.2" ]; }) - (sources."webpack-core-0.6.8" // { + (sources."webpack-core-0.6.9" // { dependencies = [ sources."source-map-0.4.4" ]; @@ -28197,8 +27851,8 @@ in sources."graceful-fs-4.1.11" sources."big.js-3.1.3" sources."emojis-list-2.1.0" - sources."json5-0.5.0" - sources."object-assign-4.1.0" + sources."json5-0.5.1" + sources."object-assign-4.1.1" sources."errno-0.1.4" sources."readable-stream-2.2.2" sources."prr-0.0.0" @@ -28214,26 +27868,21 @@ in sources."browserify-zlib-0.1.4" sources."buffer-4.9.1" sources."console-browserify-1.1.0" - sources."constants-browserify-0.0.1" - sources."crypto-browserify-3.2.8" + sources."constants-browserify-1.0.0" + sources."crypto-browserify-3.3.0" sources."domain-browser-1.1.7" sources."events-1.1.1" - sources."http-browserify-1.7.0" - sources."https-browserify-0.0.0" - sources."os-browserify-0.1.2" + sources."https-browserify-0.0.1" + sources."os-browserify-0.2.1" sources."path-browserify-0.0.0" sources."process-0.11.9" sources."punycode-1.4.1" sources."querystring-es3-0.2.1" - (sources."stream-browserify-1.0.0" // { - dependencies = [ - sources."readable-stream-1.1.14" - sources."isarray-0.0.1" - ]; - }) - sources."timers-browserify-1.4.2" + sources."stream-browserify-2.0.1" + sources."stream-http-2.6.3" + sources."timers-browserify-2.0.2" sources."tty-browserify-0.0.0" - (sources."url-0.10.3" // { + (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; @@ -28251,7 +27900,11 @@ in sources."pbkdf2-compat-2.0.1" sources."ripemd160-0.2.0" sources."sha.js-2.2.6" - sources."Base64-0.2.1" + sources."browserify-aes-0.4.0" + sources."builtin-status-codes-3.0.0" + sources."to-arraybuffer-1.0.1" + sources."xtend-4.0.1" + sources."setimmediate-1.0.5" sources."querystring-0.2.0" sources."indexof-0.0.1" sources."wordwrap-0.0.3" @@ -28271,7 +27924,7 @@ in sources."right-align-0.1.3" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" - sources."kind-of-3.0.4" + sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.4" @@ -28283,7 +27936,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.15" + sources."fsevents-1.0.17" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -28304,7 +27957,7 @@ in sources."fill-range-2.2.3" sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.5" + sources."randomatic-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.4" sources."is-extendable-0.1.1" @@ -28313,16 +27966,16 @@ in sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.7.0" + sources."binary-extensions-1.8.0" sources."minimatch-3.0.3" sources."set-immediate-shim-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."nan-2.4.0" - sources."node-pre-gyp-0.6.31" + sources."nan-2.5.0" + sources."node-pre-gyp-0.6.32" sources."nopt-3.0.6" - sources."npmlog-4.0.1" + sources."npmlog-4.0.2" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" @@ -28341,20 +27994,23 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.1" + (sources."gauge-2.7.2" // { + dependencies = [ + sources."supports-color-0.2.0" + ]; + }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" - sources."has-color-0.1.7" sources."has-unicode-2.0.1" - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-1.0.4" @@ -28371,13 +28027,13 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" (sources."chalk-1.1.3" // { @@ -28394,8 +28050,7 @@ in sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" - sources."xtend-4.0.1" + sources."jsonpointer-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" sources."hoek-2.16.3" @@ -28404,7 +28059,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28413,7 +28068,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28424,11 +28079,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."glob-7.1.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -28440,7 +28095,7 @@ in sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" sources."ms-0.7.1" - sources."source-list-map-0.1.6" + sources."source-list-map-0.1.8" sources."amdefine-1.0.1" ]; buildInputs = globalBuildInputs; @@ -28470,20 +28125,20 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.17.8"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz"; - sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.19.1.tgz"; + sha1 = "102ca03ce7fc910a73f719c70bba9e9f9e3b2b4d"; }; dependencies = [ - sources."babel-runtime-6.18.0" + sources."babel-runtime-6.22.0" sources."bytes-2.4.0" sources."camelcase-3.0.0" sources."chalk-1.1.3" sources."cmd-shim-2.0.2" sources."commander-2.9.0" - sources."death-1.0.0" - sources."debug-2.3.3" + sources."death-1.1.0" + sources."debug-2.6.0" sources."defaults-1.0.3" sources."detect-indent-4.0.0" sources."diff-2.2.3" @@ -28496,10 +28151,10 @@ in sources."loud-rejection-1.6.0" sources."minimatch-3.0.3" sources."mkdirp-0.5.1" - sources."node-emoji-1.4.1" - sources."node-gyp-3.4.0" + sources."node-emoji-1.5.1" + sources."node-gyp-3.5.0" sources."object-path-0.11.3" - sources."proper-lockfile-1.2.0" + sources."proper-lockfile-2.0.0" sources."read-1.0.7" sources."repeating-2.0.1" sources."request-2.79.0" @@ -28513,13 +28168,13 @@ in sources."user-home-2.0.0" sources."validate-npm-package-license-3.0.1" sources."core-js-2.4.1" - sources."regenerator-runtime-0.9.6" + sources."regenerator-runtime-0.10.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" sources."graceful-fs-4.1.11" sources."graceful-readlink-1.0.1" sources."ms-0.7.2" @@ -28529,10 +28184,10 @@ in sources."cli-width-2.1.0" sources."external-editor-1.1.1" sources."figures-1.7.0" - sources."lodash-4.17.2" + sources."lodash-4.17.4" sources."mute-stream-0.0.6" sources."pinkie-promise-2.0.1" - sources."run-async-2.2.0" + sources."run-async-2.3.0" sources."rx-4.1.0" sources."string-width-1.0.2" sources."through-2.3.8" @@ -28542,29 +28197,30 @@ in sources."extend-3.0.0" sources."spawn-sync-1.0.15" sources."tmp-0.0.29" - sources."concat-stream-1.5.2" + sources."concat-stream-1.6.0" sources."os-shim-0.1.3" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.0.6" + sources."readable-stream-2.2.2" + sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."os-tmpdir-1.0.2" - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" sources."pinkie-2.0.4" sources."is-promise-2.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."loose-envify-1.3.0" - sources."js-tokens-2.0.0" + sources."loose-envify-1.3.1" + sources."js-tokens-3.0.0" sources."builtin-modules-1.1.1" sources."ci-info-1.0.0" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -28574,9 +28230,8 @@ in sources."fstream-1.0.10" sources."glob-7.1.1" sources."nopt-3.0.6" - sources."npmlog-3.1.2" - sources."osenv-0.1.3" - sources."path-array-1.0.1" + sources."npmlog-4.0.2" + sources."osenv-0.1.4" sources."which-1.2.12" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -28586,22 +28241,19 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + (sources."gauge-2.7.2" // { + dependencies = [ + sources."supports-color-0.2.0" + ]; + }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" - sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."wide-align-1.1.0" sources."os-homedir-1.0.2" - sources."array-index-1.0.0" - sources."es6-symbol-3.1.0" - sources."d-0.1.1" - sources."es5-ext-0.10.12" - sources."es6-iterator-2.0.0" sources."isexe-1.1.2" - sources."err-code-1.1.1" - sources."retry-0.10.0" + sources."retry-0.10.1" sources."is-finite-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -28615,19 +28267,19 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.13" + sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.0" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."is-my-json-valid-2.15.0" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."hoek-2.16.3" @@ -28636,7 +28288,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.1" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28645,7 +28297,7 @@ in sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { + (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28656,15 +28308,15 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.14.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.25.0" + sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."is-utf8-0.2.1" sources."block-stream-0.0.9" - sources."bl-1.1.2" + sources."bl-1.2.0" (sources."end-of-stream-1.1.0" // { dependencies = [ sources."once-1.3.3" diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 293faad2301d..f3c9f4cecefe 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,37 +1,31 @@ -{ buildOcaml, stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, +{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, - reactivedata, opam, ppx_tools, ppx_deriving, camlp4}: + reactivedata, opam, ppx_tools, ppx_deriving, findlib +}: -let ocamlVersion = (stdenv.lib.getVersion ocaml); in -buildOcaml rec +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; + +stdenv.mkDerivation rec { pname = "eliom"; - version = "5.0.0"; + version = "6.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "1g9wq2qpn0sgzyb6iq0h9afq5p68il4h8pc7jppqsislk87m09k7"; + sha256 = "1yaqi5fdzvi2ga412chw5rk3533a3xamwfmias1crk793d43cmpc"; }; patches = [ ./camlp4.patch ]; - buildInputs = [ which ocaml_optcomp opam ppx_tools camlp4 ]; + buildInputs = [ ocaml which findlib ocaml_optcomp opam ppx_tools ]; propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving ocsigen_deriving js_of_ocaml calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ]; - preConfigure = stdenv.lib.optionalString (!stdenv.lib.versionAtLeast ocamlVersion "4.02") '' - export PPX=false - ''; - - installPhase = - ''opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocamlVersion}/site-lib/ - ''; + installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index f473527c15c8..fb73df808fe7 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, uutf }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, uutf }: -let version = "0.9.1"; in +let version = "1.0.0"; in stdenv.mkDerivation { - name = "ocaml-jsonm-${version}"; + name = "ocaml${ocaml.version}-jsonm-${version}"; src = fetchurl { url = "http://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz"; - sha256 = "0wszqrmx8iqlwzvs76fjf4sqh15mv20yjrbyhkd348yq8nhdrm1z"; + sha256 = "1v3ln6d965lplj28snjdqdqablpp1kx8bw2cfx0m6i157mqyln62"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; propagatedBuildInputs = [ uutf ]; unpackCmd = "tar xjf $src"; - configurePhase = "ocaml setup.ml -configure --prefix $prefix"; - buildPhase = "ocaml setup.ml -build"; createFindlibDestdir = true; - installPhase = "ocaml setup.ml -install"; + + inherit (topkg) buildPhase installPhase; meta = { description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format"; diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index a177ae240d14..3ee84d0d1b1c 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, uutf, lwt }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, lwt }: stdenv.mkDerivation rec { - pname = "ocaml-markup"; - version = "0.7.2"; - name = "${pname}-${version}"; + pname = "markup"; + version = "0.7.4"; + name = "ocaml${ocaml.version}-${pname}-${version}"; - src = fetchurl { + src = fetchzip { url = "http://github.com/aantron/markup.ml/archive/${version}.tar.gz"; - sha256 = "0d3wi22v7h0iqzq8dgl0g4fj2wb67gvmbzdckacifghinrx762k3"; + sha256 = "1hchlqzsy9pax91gcdmxzakfm22fbvhxzwyzpvz8fqkx4372zs37"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index 3178789c3993..b967728d048c 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchFromGitHub, findlib +{ stdenv, buildOcaml, fetchpatch, fetchFromGitHub, findlib, topkg, opam, ocb-stubblr , result, uucp, uuseg, uutf , lwt ? null }: @@ -7,7 +7,7 @@ with stdenv.lib; let withLwt = lwt != null; in buildOcaml rec { - version = "0.1.1"; + version = "0.1.1a"; name = "notty"; minimumSupportedOcamlVersion = "4.02"; @@ -15,18 +15,23 @@ buildOcaml rec { src = fetchFromGitHub { owner = "pqwy"; repo = "notty"; - rev = "v${version}"; - sha256 = "0bw3bq8z2y1rhc20zn13s78sazywyzpg8nmyjch33p7ypxfglf01"; + rev = "53f5946653490fce980dc5d8cadf8b122cff4f19"; + sha256 = "0qmwb1hrp04py2i5spy0yd6c5jqxyss3wzvlkgxyl9r07kvsx6xf"; }; - buildInputs = [ findlib ]; + patches = [ (fetchpatch { + url = https://github.com/dbuenzli/notty/commit/b0e12930acc26d030a74d6d63d622ae220b12c92.patch; + sha256 = "0pklplbnjbsjriqj73pc8fsadg404px534w7zknz2617zb44m6x6"; + })]; + + buildInputs = [ findlib opam topkg ocb-stubblr ]; propagatedBuildInputs = [ result uucp uuseg uutf ] ++ - optional withLwt [ lwt ]; + optional withLwt lwt; - configureFlags = [ "--enable-unix" ] ++ - (if withLwt then ["--enable-lwt"] else ["--disable-lwt"]); + buildPhase = topkg.buildPhase + + " --with-lwt ${if withLwt then "true" else "false"}"; - configurePhase = "./configure --prefix $out $configureFlags"; + inherit (topkg) installPhase; meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix new file mode 100644 index 000000000000..bb4b24cec67d --- /dev/null +++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, opam, topkg, astring }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-ocb-stubblr-0.1.0"; + src = fetchzip { + url = http://github.com/pqwy/ocb-stubblr/releases/download/v0.1.0/ocb-stubblr-0.1.0.tbz; + name = "src.tar.bz"; + sha256 = "0hpds1lkq4j8wgslv7hnirgfrjmqi36h5rarpw9mwf24gfp5ays2"; + }; + + patches = [ ./pkg-config.patch ]; + + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + + propagatedBuildInputs = [ astring ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "OCamlbuild plugin for C stubs"; + homepage = https://github.com/pqwy/ocb-stubblr; + license = stdenv.lib.licenses.isc; + inherit (ocaml.meta) platforms; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch b/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch new file mode 100644 index 000000000000..d86b3f8da9f1 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch @@ -0,0 +1,25 @@ +--- a/src/ocb_stubblr.ml 1970-01-01 00:00:01.000000000 +0000 ++++ b/src/ocb_stubblr.ml 2016-12-04 11:10:10.000000000 +0000 +@@ -31,20 +31,9 @@ + + (* XXX Would be nice to move pkg-config results to a build artefact. *) + +- let opam_prefix = +- let cmd = "opam config var prefix" in +- lazy ( try run_and_read cmd with Failure _ -> +- error_msgf "error running opam") +- +- let var = "PKG_CONFIG_PATH" +- +- let path () = +- Lazy.force opam_prefix / "lib" / "pkgconfig" :: +- (try [Sys.getenv var] with Not_found -> []) |> String.concat ~sep:":" +- + let run ~flags package = +- let cmd = strf "%s=%s pkg-config %s %s 2>/dev/null" +- var (path ()) package (String.concat ~sep:" " flags) in ++ let cmd = strf "pkg-config %s %s 2>/dev/null" ++ package (String.concat ~sep:" " flags) in + try `Res (run_and_read cmd) with Failure _ -> `Nonexistent + end + diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index e5c5439fda33..5c424cfe0599 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -9,11 +9,11 @@ let mkpath = p: n: in stdenv.mkDerivation { - name = "ocsigenserver-2.7"; + name = "ocsigenserver-2.8"; src = fetchurl { - url = https://github.com/ocsigen/ocsigenserver/archive/2.7.tar.gz; - sha256 = "0gv9nchsx9z74hh46gn7bd0053j4694fhxriannf13sqh2qpg901"; + url = https://github.com/ocsigen/ocsigenserver/archive/2.8.tar.gz; + sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; }; buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 30946da1c0b2..5deef60520bd 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uutf }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uutf, result }: let - inherit (stdenv.lib) getVersion versionAtLeast; - pname = "otfm"; - version = "0.2.0"; + version = "0.3.0"; webpage = "http://erratique.ch/software/${pname}"; in -assert versionAtLeast (getVersion ocaml) "4.01.0"; +assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; stdenv.mkDerivation rec { @@ -16,23 +14,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1wgi9plf98gd7x3b7fzjxds089sivsap97bl1bw2lj73nxwnyb9c"; + sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k"; }; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; - propagatedBuildInputs = [ uutf ]; + propagatedBuildInputs = [ uutf result ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { description = "OpenType font decoder for OCaml"; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index cd64e6578c16..828a3fb60683 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -1,28 +1,20 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, camlp4, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, opam }: -let - ocamlVersion = stdenv.lib.getVersion ocaml; -in - -assert stdenv.lib.versionAtLeast ocamlVersion "3.11"; +assert stdenv.lib.versionAtLeast ocaml.version "3.11"; stdenv.mkDerivation { - name = "ocaml-reactiveData-0.2"; + name = "ocaml${ocaml.version}-reactiveData-0.2.1"; src = fetchurl { - url = https://github.com/ocsigen/reactiveData/archive/0.2.tar.gz; - sha256 = "0rskcxnyjn8sxqnncdm6rh9wm99nha5m5sc83fywgzs64xfl43fq"; + url = https://github.com/ocsigen/reactiveData/archive/0.2.1.tar.gz; + sha256 = "0wcs0z50nia1cpk8mh6i5qbc6sff9cc8x7s7q1q89d7m73bnv4vf"; }; - buildInputs = [ ocaml findlib ocamlbuild opam camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; propagatedBuildInputs = [ocaml_react]; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - installPhase = '' - opam-installer --script --prefix=$out reactiveData.install > install.sh - sed -i s!lib/reactiveData!lib/ocaml/${ocamlVersion}/site-lib/reactiveData! install.sh - sh install.sh - ''; + installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; meta = with stdenv.lib; { description = "An OCaml module for functional reactive programming (FRP) based on React"; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 23bcc2670661..f343eed6b467 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-topkg-${version}"; - version = "0.7.8"; + version = "0.8.1"; src = fetchurl { url = "http://erratique.ch/software/topkg/releases/topkg-${version}.tbz"; - sha256 = "029lbmabczpmcgkj53mc20vmpcn3f7rf7xms4xf0nywswfzsash6"; + sha256 = "18rrh6fmf708z7dd30amljmcgaypj3kk49jrmrj68r4wnw8004j8"; }; nativeBuildInputs = [ opam ]; diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index b8c415b75669..49cc56a1db6a 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,14 +1,22 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re }: +{ stdenv, fetchzip, fetchpatch, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re +}: + +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; stdenv.mkDerivation rec { pname = "tyxml"; - version = "3.6.0"; - name = "${pname}-${version}"; + version = "4.0.1"; + name = "ocaml${ocaml.version}-${pname}-${version}"; - src = fetchurl { + src = fetchzip { url = "http://github.com/ocsigen/tyxml/archive/${version}.tar.gz"; - sha256 = "1rz0f48x8p1m30723rn5v85pp7rd0spr04sd7gzryy99vn3ianga"; - }; + sha256 = "1mwkjvl78gvw7pvql5qp64cfjjca6aqsb04999qkllifyicaaq8y"; + }; + + patches = [ (fetchpatch { + url = https://github.com/dbuenzli/tyxml/commit/a2bf5ccc0b6e684e7b81274ff19df8d72e2def8d.diff; + sha256 = "11sidgiwz3zqw815vlslbfzb456z0lndkh425mlmvnmck4d2v2i3"; + })]; buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 456fc8a19761..db0b29d94c50 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -1,36 +1,31 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar }: let - inherit (stdenv.lib) getVersion versionAtLeast; - pname = "uucp"; - version = "1.1.0"; + version = "2.0.0"; webpage = "http://erratique.ch/software/${pname}"; in -assert versionAtLeast (getVersion ocaml) "4.00"; +assert stdenv.lib.versionAtLeast ocaml.version "4.01"; stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1vm5f2ppdrnk19j0ppjiqz56qf5bzyk26gs0lz071s7iblk459jz"; + sha256 = "07m7pfpcf03dqsbvqpq88y9hzic8fighlp4fgbav6n6xla35mk5k"; }; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + + propagatedBuildInputs = [ uchar ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 11ff9a36a41c..a9c7add6129b 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,33 +1,29 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uutf, cmdliner }: let pname = "uunf"; webpage = "http://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "4.01"; stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "0.9.3"; + version = "2.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "16cgjy1m0m61srv1pmlc3gr0y40kd4724clvpagdnz68raz4zmn0"; + sha256 = "1i132168949vdc8magycgf9mdysf50vvr7zngnjl4vi3zdayq20c"; }; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf cmdliner ]; + + propagatedBuildInputs = [ uchar ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = "./pkg/build true false"; - - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { description = "An OCaml module for normalizing Unicode text"; diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 92777129ca03..d1e958144612 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,39 +1,28 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uucp, uutf, cmdliner }: let pname = "uuseg"; webpage = "http://erratique.ch/software/${pname}"; in -buildOcaml rec { +stdenv.mkDerivation rec { - minimumSupportedOcamlVersion = "4.01"; - - name = pname; - version = "0.9.0"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "1.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "00n4zi8dyw2yzi4nr2agcrr33b0q4dr9mgnkczipf4c0gm5cm50h"; + sha256 = "0m5n0kn70w862g5dhfkfvrnmb98z1r02g21ap7l81hy8sn08cbsz"; }; - buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; - propagatedBuildInputs = [ uucp uutf ]; + buildInputs = [ ocaml findlib ocamlbuild opam cmdliner topkg uutf ]; + propagatedBuildInputs = [ uucp uchar ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = '' - ocaml pkg/build.ml \ - native=true native-dynlink=true \ - uutf=true cmdliner=true - ''; - - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/${pname} - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { description = "An OCaml library for segmenting Unicode text"; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index a08e0ccbf74e..feb197defc32 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,37 +1,26 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner , topkg, uchar }: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; in -buildOcaml rec { - name = pname; - version = "0.9.4"; - - minimumSupportedOcamlVersion = "4.00.0"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "1.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1f71fyawxal42x6g82539bv0ava2smlar6rmxxz1cyq3l0i6fw0k"; + sha256 = "08i0cw02cxw4mi2rs01v9xi307qshs6fnd1dlqyb52kcxzblpp37"; }; - buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ]; + propagatedBuildInputs = [ uchar ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = '' - ocaml pkg/build.ml \ - native=true \ - native-dynlink=true \ - cmdliner=true - ''; - - installPhase = '' - opam-installer --prefix=$out --script ${pname}.install | sh - ln -s $out/lib/uutf $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { description = "Non-blocking streaming Unicode codec for OCaml"; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 17bb8eeb4645..aa6047c79014 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, gg, uutf, otfm, js_of_ocaml, +{ stdenv, fetchurl, ocaml, findlib, opam, topkg +, uchar, result, gg, uutf, otfm, js_of_ocaml, pdfBackend ? true, # depends on uutf and otfm htmlcBackend ? true # depends on js_of_ocaml }: let - inherit (stdenv.lib) getVersion optionals versionAtLeast; + inherit (stdenv.lib) optionals versionAtLeast; pname = "vg"; - version = "0.8.1"; + version = "0.9.0"; webpage = "http://erratique.ch/software/${pname}"; + sob = b: if b then "true" else "false"; in -assert versionAtLeast (getVersion ocaml) "4.01.0"; +assert versionAtLeast ocaml.version "4.02.0"; stdenv.mkDerivation rec { @@ -19,12 +21,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1cdcvsr5z8845ndilnrz7p4n6yn4gv2p91z2mgi4vrailcmn5vzd"; + sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib opam topkg ]; - propagatedBuildInputs = [ gg ] + propagatedBuildInputs = [ uchar result gg ] ++ optionals pdfBackend [ uutf otfm ] ++ optionals htmlcBackend [ js_of_ocaml ]; @@ -32,16 +34,12 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true" - + (if pdfBackend then " uutf=true otfm=true" - else " uutf=false otfm=false") - + (if htmlcBackend then " jsoo=true" - else " jsoo=false"); + buildPhase = topkg.buildPhase + + " --with-uutf ${sob pdfBackend} --with-otfm ${sob pdfBackend}" + + " --with-js_of_ocaml ${sob htmlcBackend}" + + " --with-cairo2 false"; - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} - ''; + inherit (topkg) installPhase; meta = with stdenv.lib; { description = "Declarative 2D vector graphics for OCaml"; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 6025956261e5..c4f92caf8d59 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,13 +11,13 @@ let pname = "discord.py"; - version = "0.16.0"; + version = "0.16.4"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "0r3qqvx36vywjyjk1nh11ymmr8y81sb45nk63665kcjagx8qnmfx"; + sha256 = "04q4gknv9lb8r2sdnsqs5nfcyyl850j4pcqcs0xjvmqhd7axa5ai"; }; propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index 82d6492ce18b..c35002c33110 100644 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -7,12 +7,12 @@ }: mkDerivation { pname = "tinc"; - version = "20161102"; + version = "20161119"; src = fetchFromGitHub { owner = "sol"; repo = "tinc"; - rev = "411d0f319717d01dc71bd5c1faef8035656eaf3d"; - sha256 = "040vyg9n7ihnqs6fyhhr5p4xscfxhji02wsfw4nncpxflzaciji5"; + rev = "8e31ed920ad1660b3bc458b4f6b281bacaf4bd14"; + sha256 = "0y9pvr20p9z4dddbfxgy9hl3ny7pxixxjg8ij7g8l14br6mcak30"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix new file mode 100644 index 000000000000..ac5495b98d90 --- /dev/null +++ b/pkgs/development/tools/irony-server/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, cmake, llvmPackages, irony }: + +stdenv.mkDerivation rec { + name = "irony-server-${version}"; + inherit (irony) version; + + buildInputs = [ cmake llvmPackages.clang ]; + + dontUseCmakeBuildDir = true; + + cmakeDir = "server"; + + cmakeFlags = [ + ''-DCMAKE_PREFIX_PATH=${llvmPackages.clang.cc}'' + ]; + + src = irony.src; + + meta = { + description = "The server part of irony."; + homepage = "https://melpa.org/#/irony"; + maintainers = [ stdenv.lib.maintainers.deepfire ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.free; + }; +} diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix new file mode 100644 index 000000000000..d83be1c14313 --- /dev/null +++ b/pkgs/development/tools/msgpack-tools/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "msgpack-tools-${version}"; + version = "v0.6"; + + src = fetchFromGitHub { + owner = "ludocode"; + repo = "msgpack-tools"; + rev = version; + sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Command-line tools for converting between MessagePack and JSON"; + homepage = https://github.com/ludocode/msgpack-tools; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ alibabzo ]; + }; +} diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 33a7fe52c394..d88dd9eb8964 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, - cmdliner, tyxml, reactivedata, cppo, which, base64}: +{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4 +, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar +}: + +let version = if stdenv.lib.versionAtLeast ocaml.version "4.02" + then "2.8.3" else "2.7"; +in stdenv.mkDerivation { - name = "js_of_ocaml-2.7"; + name = "js_of_ocaml-${version}"; src = fetchurl { - url = https://github.com/ocsigen/js_of_ocaml/archive/2.7.tar.gz; - sha256 = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; - }; + url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz"; + sha256 = { + "2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; + "2.8.3" = "0xrw215w5saqdcdd9ipjhvg8f982z63znsds9ih445s3jr49szm7"; + }."${version}"; + }; buildInputs = [ ocaml findlib menhir ocsigen_deriving - cmdliner tyxml reactivedata cppo which base64]; - propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ]; + cmdliner reactivedata cppo which base64 ] + ++ stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.02") tyxml; + propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ] + ++ stdenv.lib.optional (version == "2.8.3") uchar; patches = [ ./Makefile.conf.diff ]; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index f8f9646182b1..44f922906e89 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtags-${version}"; - version = "2.3"; + version = "2.8-p1"; buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ] - ++ lib.optional stdenv.isDarwin apple_sdk.sdk; + ++ lib.optionals stdenv.isDarwin [ apple_sdk.sdk apple_sdk.frameworks.CoreServices ]; preConfigure = '' - export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) " \ + export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \ LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" \ '' + lib.optionalString stdenv.isDarwin '' @@ -17,10 +17,11 @@ stdenv.mkDerivation rec { ''; src = fetchgit { - rev = "refs/tags/v${version}"; + # rev = "refs/tags/v${version}"; # TODO Renable if sha1 below is tagged as release + rev = "f85bd60f00d51748ea159b00fda7b5bfa78ef571"; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "05kzch88x2wiimygfli6vsr9i5hzgkybsya8qx4zvb6daip4b7yf"; + sha256 = "0g9sgc763c5d695hjffhis19sbaqk8z4884szljf7kbrjxl17y78"; }; meta = { diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index f6b9f901ec8f..7e8a3160b31f 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -1,34 +1,34 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! -{nodeEnv, fetchurl, fetchgit}: +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "JSONStream-1.1.4" = { + "JSONStream-1.3.0" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; - sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; - }; - }; - "assert-1.3.0" = { - name = "assert"; - packageName = "assert"; version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; - sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz"; + sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5"; }; }; - "browser-pack-6.0.1" = { + "assert-1.4.1" = { + name = "assert"; + packageName = "assert"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; + sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + }; + }; + "browser-pack-6.0.2" = { name = "browser-pack"; packageName = "browser-pack"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.1.tgz"; - sha1 = "779887c792eaa1f64a46a22c8f1051cdcd96755f"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz"; + sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531"; }; }; "browser-resolve-1.11.2" = { @@ -58,6 +58,15 @@ let sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; + "cached-path-relative-1.0.0" = { + name = "cached-path-relative"; + packageName = "cached-path-relative"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.0.tgz"; + sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4"; + }; + }; "concat-stream-1.5.2" = { name = "concat-stream"; packageName = "concat-stream"; @@ -139,13 +148,13 @@ let sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; }; }; - "glob-5.0.15" = { + "glob-7.1.1" = { name = "glob"; packageName = "glob"; - version = "5.0.15"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; - sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; + sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; }; }; "has-1.0.1" = { @@ -175,13 +184,13 @@ let sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; }; }; - "inherits-2.0.1" = { + "inherits-2.0.3" = { name = "inherits"; packageName = "inherits"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; "insert-module-globals-7.0.1" = { @@ -202,13 +211,13 @@ let sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; }; }; - "module-deps-4.0.7" = { + "module-deps-4.0.8" = { name = "module-deps"; packageName = "module-deps"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.7.tgz"; - sha1 = "edfeb3937be7359bc14a6672c22ef124887f6ed2"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.8.tgz"; + sha1 = "55fd70623399706c3288bef7a609ff1e8c0ed2bb"; }; }; "os-browserify-0.1.2" = { @@ -274,22 +283,22 @@ let sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; }; }; - "readable-stream-2.1.5" = { + "readable-stream-2.2.2" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.1.5"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; - sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; + sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; }; }; - "resolve-1.1.7" = { + "resolve-1.2.0" = { name = "resolve"; packageName = "resolve"; - version = "1.1.7"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz"; + sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c"; }; }; "shasum-1.0.2" = { @@ -319,13 +328,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.3.1" = { + "stream-http-2.6.3" = { name = "stream-http"; packageName = "stream-http"; - version = "2.3.1"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.3.1.tgz"; - sha1 = "7e1dc87102c3e31b32e660f04ca31f23ddbd1d52"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz"; + sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"; }; }; "string_decoder-0.10.31" = { @@ -355,13 +364,13 @@ let sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710"; }; }; - "through2-2.0.1" = { + "through2-2.0.3" = { name = "through2"; packageName = "through2"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz"; - sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9"; + url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; + sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; }; }; "timers-browserify-1.4.2" = { @@ -418,13 +427,13 @@ let sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; }; - "jsonparse-1.2.0" = { + "jsonparse-1.3.0" = { name = "jsonparse"; packageName = "jsonparse"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"; - sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz"; + sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8"; }; }; "through-2.3.8" = { @@ -490,6 +499,15 @@ let sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; }; }; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -499,22 +517,22 @@ let sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; }; }; - "base64-js-1.1.2" = { + "base64-js-1.2.0" = { name = "base64-js"; packageName = "base64-js"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; - sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; }; }; - "ieee754-1.1.6" = { + "ieee754-1.1.8" = { name = "ieee754"; packageName = "ieee754"; - version = "1.1.6"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"; - sha1 = "2e1013219c6d6712973ec54d981ec19e5579de97"; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; + sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; }; }; "isarray-1.0.0" = { @@ -634,13 +652,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.4" = { + "pbkdf2-3.0.9" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.4"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"; - sha1 = "12c8bfaf920543786a85150b03f68d5f1aa982fc"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.9.tgz"; + sha1 = "f2c4b25a600058b3c3773c086c37dbbee1ffe693"; }; }; "public-encrypt-4.0.0" = { @@ -697,13 +715,13 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "cipher-base-1.0.2" = { + "cipher-base-1.0.3" = { name = "cipher-base"; packageName = "cipher-base"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"; - sha1 = "54ac1d1ebdf6a1bcd3559e6f369d72697f2cab8f"; + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; + sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; }; }; "des.js-1.0.0" = { @@ -742,13 +760,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.1" = { + "elliptic-6.3.2" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.1.tgz"; - sha1 = "17781f2109ab0ec686b146bdcff5d2e8c6aeceda"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; + sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; }; }; "parse-asn1-5.0.0" = { @@ -760,13 +778,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.5" = { + "brorand-1.0.6" = { name = "brorand"; packageName = "brorand"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"; - sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; + sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; }; }; "hash.js-1.0.3" = { @@ -778,13 +796,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "asn1.js-4.8.0" = { + "asn1.js-4.9.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.8.0"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.0.tgz"; - sha1 = "e0e04e9923319163be46aed9e5378973b161ef13"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz"; + sha1 = "48ba240b45a9280e94748990ba597d216617fd40"; }; }; "ripemd160-1.0.1" = { @@ -796,13 +814,13 @@ let sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"; }; }; - "sha.js-2.4.5" = { + "sha.js-2.4.8" = { name = "sha.js"; packageName = "sha.js"; - version = "2.4.5"; + version = "2.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz"; - sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"; + sha1 = "37068c2c476b6baf402d14a49c67f597921f634f"; }; }; "miller-rabin-4.0.0" = { @@ -814,13 +832,22 @@ let sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"; }; }; - "inflight-1.0.5" = { + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"; - sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a"; + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; "minimatch-3.0.3" = { @@ -832,22 +859,22 @@ let sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; }; }; - "once-1.3.3" = { + "once-1.4.0" = { name = "once"; packageName = "once"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "path-is-absolute-1.0.0" = { + "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; - sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; "wrappy-1.0.2" = { @@ -949,13 +976,13 @@ let sha1 = "1b63be438a133e4b671cc1935197600175910d83"; }; }; - "detective-4.3.1" = { + "detective-4.3.2" = { name = "detective"; packageName = "detective"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz"; - sha1 = "9fb06dd1ee8f0ea4dbcc607cda39d9ce1d4f726f"; + url = "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz"; + sha1 = "77697e2e7947ac3fe7c8e26a6d6f115235afa91c"; }; }; "stream-combiner2-1.1.1" = { @@ -967,6 +994,15 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; + "acorn-3.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + }; "path-platform-0.11.15" = { name = "path-platform"; packageName = "path-platform"; @@ -1030,13 +1066,13 @@ let sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; }; }; - "builtin-status-codes-2.0.0" = { + "builtin-status-codes-3.0.0" = { name = "builtin-status-codes"; packageName = "builtin-status-codes"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz"; - sha1 = "6f22003baacf003ccd287afe6872151fddc58579"; + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; "to-arraybuffer-1.0.1" = { @@ -1084,6 +1120,15 @@ let sha1 = "b209849203bb25df820da756e747005878521620"; }; }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; "indexof-0.0.1" = { name = "indexof"; packageName = "indexof"; @@ -1201,13 +1246,13 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; - "kind-of-3.0.4" = { + "kind-of-3.1.0" = { name = "kind-of"; packageName = "kind-of"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"; - sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74"; + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; + sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; }; }; "longest-1.0.1" = { @@ -1219,13 +1264,13 @@ let sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; }; }; - "repeat-string-1.5.4" = { + "repeat-string-1.6.1" = { name = "repeat-string"; packageName = "repeat-string"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz"; - sha1 = "64ec0c91e0f4b475f90d5b643651e3e6e5b6c2d5"; + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; "errno-0.1.4" = { @@ -1237,22 +1282,22 @@ let sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"; }; }; - "graceful-fs-4.1.6" = { + "graceful-fs-4.1.11" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.6"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz"; - sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; - "image-size-0.5.0" = { + "image-size-0.5.1" = { name = "image-size"; packageName = "image-size"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/image-size/-/image-size-0.5.0.tgz"; - sha1 = "be7aed1c37b5ac3d9ba1d66a24b4c47ff8397651"; + url = "https://registry.npmjs.org/image-size/-/image-size-0.5.1.tgz"; + sha1 = "28eea8548a4b1443480ddddc1e083ae54652439f"; }; }; "mime-1.3.4" = { @@ -1282,6 +1327,15 @@ let sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; }; }; + "request-2.79.0" = { + name = "request"; + packageName = "request"; + version = "2.79.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; + }; + }; "prr-0.0.0" = { name = "prr"; packageName = "prr"; @@ -1300,22 +1354,220 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "asap-2.0.4" = { + "asap-2.0.5" = { name = "asap"; packageName = "asap"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz"; - sha1 = "b391bf7f6bfbc65706022fec8f49c4b07fecf589"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; + sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; }; }; - "browser-stdout-1.3.0" = { - name = "browser-stdout"; - packageName = "browser-stdout"; - version = "1.3.0"; + "aws-sign2-0.6.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; - sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; + sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + }; + }; + "aws4-1.5.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; + sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; + }; + }; + "caseless-0.11.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; + sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + }; + }; + "combined-stream-1.0.5" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; + sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + }; + }; + "extend-3.0.0" = { + name = "extend"; + packageName = "extend"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; + sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.1.2" = { + name = "form-data"; + packageName = "form-data"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; + sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; + }; + }; + "har-validator-2.0.6" = { + name = "har-validator"; + packageName = "har-validator"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; + sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + }; + }; + "hawk-3.1.3" = { + name = "hawk"; + packageName = "hawk"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + }; + }; + "http-signature-1.1.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; + sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "mime-types-2.1.14" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; + sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; + }; + }; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + }; + }; + "qs-6.3.0" = { + name = "qs"; + packageName = "qs"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"; + sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; + }; + }; + "stringstream-0.0.5" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + }; + "tough-cookie-2.3.2" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"; + sha1 = "f081f76e4c85720e6c37a5faced737150d84072a"; + }; + }; + "tunnel-agent-0.4.3" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; + sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + }; + }; + "uuid-3.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; + sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; "commander-2.9.0" = { @@ -1327,6 +1579,321 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; + "is-my-json-valid-2.15.0" = { + name = "is-my-json-valid"; + packageName = "is-my-json-valid"; + version = "2.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"; + sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "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"; + }; + }; + "jsonpointer-4.0.1" = { + name = "jsonpointer"; + packageName = "jsonpointer"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; + sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; + }; + }; + "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"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "hoek-2.16.3" = { + name = "hoek"; + packageName = "hoek"; + version = "2.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; + sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + }; + }; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + }; + }; + "cryptiles-2.0.5" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; + sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + }; + }; + "sntp-1.0.9" = { + name = "sntp"; + packageName = "sntp"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + }; + "assert-plus-0.2.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; + sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + }; + }; + "jsprim-1.3.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + }; + }; + "sshpk-1.10.2" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"; + sha1 = "d5a804ce22695515638e798dbe23273de070a5fa"; + }; + }; + "extsprintf-1.0.2" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "verror-1.3.6" = { + name = "verror"; + packageName = "verror"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + }; + }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "getpass-0.1.6" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; + sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + }; + }; + "jsbn-0.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; + sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "jodid25519-1.0.2" = { + name = "jodid25519"; + packageName = "jodid25519"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; + sha1 = "06d4912255093419477d425633606e0e90782967"; + }; + }; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + }; + "bcrypt-pbkdf-1.0.0" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; + sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + }; + }; + "mime-db-1.26.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; + sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; + }; + }; + "browser-stdout-1.3.0" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; + sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + }; + }; "debug-2.2.0" = { name = "debug"; packageName = "debug"; @@ -1345,15 +1912,6 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; "glob-7.0.5" = { name = "glob"; packageName = "glob"; @@ -1399,15 +1957,6 @@ let sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; }; }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - }; "ms-0.7.1" = { name = "ms"; packageName = "ms"; @@ -1417,15 +1966,6 @@ let sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; "lodash._baseassign-3.2.0" = { name = "lodash._baseassign"; packageName = "lodash._baseassign"; @@ -1615,13 +2155,13 @@ let sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; }; }; - "config-chain-1.1.10" = { + "config-chain-1.1.11" = { name = "config-chain"; packageName = "config-chain"; - version = "1.1.10"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz"; - sha1 = "7fc383de0fcc84d711cb465bd176579cad612346"; + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; + sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; }; }; "inherits-1.0.2" = { @@ -1714,15 +2254,6 @@ let sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; }; }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; "mime-1.2.11" = { name = "mime"; packageName = "mime"; @@ -1750,15 +2281,6 @@ let sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; }; }; - "tough-cookie-2.3.1" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; - sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; - }; - }; "form-data-0.1.4" = { name = "form-data"; packageName = "form-data"; @@ -1768,15 +2290,6 @@ let sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; }; }; - "tunnel-agent-0.4.3" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; - }; - }; "http-signature-0.10.1" = { name = "http-signature"; packageName = "http-signature"; @@ -1921,13 +2434,13 @@ let sha1 = "0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7"; }; }; - "should-format-3.0.1" = { + "should-format-3.0.2" = { name = "should-format"; packageName = "should-format"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/should-format/-/should-format-3.0.1.tgz"; - sha1 = "3249b719c0921b4d7b26d347d1b0cc6e232ad324"; + url = "https://registry.npmjs.org/should-format/-/should-format-3.0.2.tgz"; + sha1 = "1a543ad3abfea5dc2bea4a0ba875ede60fe22b19"; }; }; "should-type-1.4.0" = { @@ -1939,13 +2452,13 @@ let sha1 = "0756d8ce846dfd09843a6947719dfa0d4cff5cf3"; }; }; - "should-type-adaptors-1.0.0" = { + "should-type-adaptors-1.0.1" = { name = "should-type-adaptors"; packageName = "should-type-adaptors"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.0.0.tgz"; - sha1 = "034b2843b8c151bb7b66e6350eba00543e797500"; + url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.0.1.tgz"; + sha1 = "efe5553cdf68cff66e5c5f51b712dc351c77beaa"; }; }; "should-util-1.0.0" = { @@ -1984,13 +2497,13 @@ let sha1 = "bec11fdc83a9fda063401210e40176c3024d1567"; }; }; - "cli-1.0.0" = { + "cli-1.0.1" = { name = "cli"; packageName = "cli"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz"; - sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d"; + url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz"; + sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; "exit-0.1.2" = { @@ -2038,15 +2551,6 @@ let sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; }; }; - "glob-7.0.6" = { - name = "glob"; - packageName = "glob"; - version = "7.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; - sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; - }; - }; "domhandler-2.3.0" = { name = "domhandler"; packageName = "domhandler"; @@ -2148,6 +2652,7 @@ in url = "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz"; sha1 = "b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"; }; + buildInputs = globalBuildInputs; meta = { description = "A markdown parser built for speed"; homepage = https://github.com/chjj/marked; @@ -2158,20 +2663,20 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "13.1.0"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz"; - sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; + url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; + sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; }; dependencies = [ - (sources."JSONStream-1.1.4" // { + (sources."JSONStream-1.3.0" // { dependencies = [ - sources."jsonparse-1.2.0" + sources."jsonparse-1.3.0" sources."through-2.3.8" ]; }) - sources."assert-1.3.0" - (sources."browser-pack-6.0.1" // { + sources."assert-1.4.1" + (sources."browser-pack-6.0.2" // { dependencies = [ (sources."combine-source-map-0.7.2" // { dependencies = [ @@ -2184,7 +2689,11 @@ in sources."umd-3.0.1" ]; }) - sources."browser-resolve-1.11.2" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) (sources."browserify-zlib-0.1.4" // { dependencies = [ sources."pako-0.2.9" @@ -2192,11 +2701,12 @@ in }) (sources."buffer-4.9.1" // { dependencies = [ - sources."base64-js-1.1.2" - sources."ieee754-1.1.6" + sources."base64-js-1.2.0" + sources."ieee754-1.1.8" sources."isarray-1.0.0" ]; }) + sources."cached-path-relative-1.0.0" (sources."concat-stream-1.5.2" // { dependencies = [ sources."typedarray-0.0.6" @@ -2223,12 +2733,12 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) (sources."browserify-des-1.0.0" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" (sources."des.js-1.0.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" @@ -2243,15 +2753,15 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.1" // { + (sources."elliptic-6.3.2" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.0" // { + (sources."asn1.js-4.9.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -2259,7 +2769,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -2270,9 +2780,9 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.1" // { + (sources."elliptic-6.3.2" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) @@ -2280,9 +2790,9 @@ in }) (sources."create-hash-1.1.2" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."ripemd160-1.0.1" - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" ]; }) sources."create-hmac-1.1.4" @@ -2291,19 +2801,19 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" ]; }) ]; }) - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.9" (sources."public-encrypt-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.0" // { + (sources."asn1.js-4.9.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -2311,7 +2821,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -2327,9 +2837,10 @@ in sources."domain-browser-1.1.7" sources."duplexer2-0.1.4" sources."events-1.1.1" - (sources."glob-5.0.15" // { + (sources."glob-7.1.1" // { dependencies = [ - (sources."inflight-1.0.5" // { + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -2344,12 +2855,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."has-1.0.1" // { @@ -2359,7 +2870,7 @@ in }) sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."insert-module-globals-7.0.1" // { dependencies = [ (sources."combine-source-map-0.7.2" // { @@ -2388,11 +2899,11 @@ in sources."stream-splicer-2.0.0" ]; }) - (sources."module-deps-4.0.7" // { + (sources."module-deps-4.0.8" // { dependencies = [ - (sources."detective-4.3.1" // { + (sources."detective-4.3.2" // { dependencies = [ - sources."acorn-1.2.2" + sources."acorn-3.3.0" ]; }) sources."stream-combiner2-1.1.1" @@ -2409,7 +2920,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -2418,7 +2929,7 @@ in sources."util-deprecate-1.0.2" ]; }) - sources."resolve-1.1.7" + sources."resolve-1.2.0" (sources."shasum-1.0.2" // { dependencies = [ (sources."json-stable-stringify-0.0.1" // { @@ -2426,7 +2937,7 @@ in sources."jsonify-0.0.0" ]; }) - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" ]; }) (sources."shell-quote-1.6.1" // { @@ -2438,9 +2949,9 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.3.1" // { + (sources."stream-http-2.6.3" // { dependencies = [ - sources."builtin-status-codes-2.0.0" + sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" ]; }) @@ -2455,18 +2966,7 @@ in sources."acorn-2.7.0" ]; }) - (sources."through2-2.0.1" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."tty-browserify-0.0.0" (sources."url-0.11.0" // { @@ -2475,7 +2975,11 @@ in sources."querystring-0.2.0" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) (sources."vm-browserify-0.0.4" // { dependencies = [ sources."indexof-0.0.1" @@ -2483,6 +2987,7 @@ in }) sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "browser-side require() the node way"; homepage = "https://github.com/substack/node-browserify#readme"; @@ -2493,10 +2998,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.3"; + version = "2.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz"; - sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; + sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; }; dependencies = [ sources."async-0.2.10" @@ -2511,13 +3016,13 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; }) sources."longest-1.0.1" - sources."repeat-string-1.5.4" + sources."repeat-string-1.6.1" ]; }) sources."lazy-cache-1.0.4" @@ -2527,13 +3032,13 @@ in dependencies = [ (sources."align-text-0.1.4" // { dependencies = [ - (sources."kind-of-3.0.4" // { + (sources."kind-of-3.1.0" // { dependencies = [ sources."is-buffer-1.1.4" ]; }) sources."longest-1.0.1" - sources."repeat-string-1.5.4" + sources."repeat-string-1.6.1" ]; }) ]; @@ -2546,6 +3051,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; homepage = http://lisperator.net/uglifyjs; @@ -2556,10 +3062,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-2.7.1.tgz"; - sha1 = "6cbfea22b3b830304e9a5fb371d54fa480c9d7cf"; + url = "https://registry.npmjs.org/less/-/less-2.7.2.tgz"; + sha1 = "368d6cc73e1fb03981183280918743c5dcf9b3df"; }; dependencies = [ (sources."errno-0.1.4" // { @@ -2567,8 +3073,8 @@ in sources."prr-0.0.0" ]; }) - sources."graceful-fs-4.1.6" - sources."image-size-0.5.0" + sources."graceful-fs-4.1.11" + sources."image-size-0.5.1" sources."mime-1.3.4" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -2577,11 +3083,125 @@ in }) (sources."promise-7.1.1" // { dependencies = [ - sources."asap-2.0.4" + sources."asap-2.0.5" ]; }) sources."source-map-0.5.6" + (sources."request-2.79.0" // { + dependencies = [ + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + (sources."combined-stream-1.0.5" // { + dependencies = [ + sources."delayed-stream-1.0.0" + ]; + }) + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + (sources."form-data-2.1.2" // { + dependencies = [ + sources."asynckit-0.4.0" + ]; + }) + (sources."har-validator-2.0.6" // { + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + (sources."commander-2.9.0" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."is-my-json-valid-2.15.0" // { + dependencies = [ + sources."generate-function-2.0.0" + (sources."generate-object-property-1.2.0" // { + dependencies = [ + sources."is-property-1.0.2" + ]; + }) + sources."jsonpointer-4.0.1" + sources."xtend-4.0.1" + ]; + }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.2" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.1" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.5" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.14" // { + dependencies = [ + sources."mime-db-1.26.0" + ]; + }) + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + (sources."tough-cookie-2.3.2" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.4.3" + sources."uuid-3.0.1" + ]; + }) ]; + buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; homepage = http://lesscss.org/; @@ -2592,10 +3212,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "3.0.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-3.0.2.tgz"; - sha1 = "63a97f3e18f4d3e659d47a617677d089874557f0"; + url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz"; + sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3"; }; dependencies = [ sources."browser-stdout-1.3.0" @@ -2614,12 +3234,12 @@ in (sources."glob-7.0.5" // { dependencies = [ sources."fs.realpath-1.0.0" - (sources."inflight-1.0.5" // { + (sources."inflight-1.0.6" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -2630,12 +3250,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) sources."growl-1.9.2" @@ -2669,6 +3289,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "simple, flexible, fun test framework"; homepage = https://mochajs.org/; @@ -2692,7 +3313,7 @@ in sources."ncp-0.4.2" (sources."npmconf-0.0.24" // { dependencies = [ - (sources."config-chain-1.1.10" // { + (sources."config-chain-1.1.11" // { dependencies = [ sources."proto-list-1.2.4" sources."ini-1.3.4" @@ -2719,7 +3340,11 @@ in sources."mime-1.2.11" sources."forever-agent-0.5.2" sources."node-uuid-1.4.7" - sources."tough-cookie-2.3.1" + (sources."tough-cookie-2.3.2" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) (sources."form-data-0.1.4" // { dependencies = [ (sources."combined-stream-0.0.7" // { @@ -2766,6 +3391,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Run mocha browser tests in phantomjs via the command line"; homepage = "https://github.com/nathanboktae/mocha-phantomjs#readme"; @@ -2775,18 +3401,19 @@ in should = nodeEnv.buildNodePackage { name = "should"; packageName = "should"; - version = "11.1.0"; + version = "11.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/should/-/should-11.1.0.tgz"; - sha1 = "1d2ee7d3b150e965611ebe37be7dcf0fe2075a8e"; + url = "https://registry.npmjs.org/should/-/should-11.1.2.tgz"; + sha1 = "3cad9c6fc600ffe2e1547d948be3284e984da946"; }; dependencies = [ sources."should-equal-1.0.1" - sources."should-format-3.0.1" + sources."should-format-3.0.2" sources."should-type-1.4.0" - sources."should-type-adaptors-1.0.0" + sources."should-type-adaptors-1.0.1" sources."should-util-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "test framework agnostic BDD-style assertions"; homepage = https://github.com/shouldjs/should.js; @@ -2797,10 +3424,10 @@ in sinon = nodeEnv.buildNodePackage { name = "sinon"; packageName = "sinon"; - version = "1.17.5"; + version = "1.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-1.17.5.tgz"; - sha1 = "1038cba830e37012e99a64837ecd3b67200c058c"; + url = "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz"; + sha1 = "4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"; }; dependencies = [ sources."formatio-1.1.1" @@ -2812,6 +3439,7 @@ in sources."lolex-1.3.2" sources."samsam-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "JavaScript test spies, stubs and mocks."; homepage = http://sinonjs.org/; @@ -2822,29 +3450,29 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.9.3"; + version = "2.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.3.tgz"; - sha1 = "a2e14ff85c2d6bf8c8080e5aa55129ebc6a2d320"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz"; + sha1 = "5e3ba97848d5290273db514aee47fe24cf592934"; }; dependencies = [ - (sources."cli-1.0.0" // { + (sources."cli-1.0.1" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.1" // { dependencies = [ sources."fs.realpath-1.0.0" - (sources."inflight-1.0.5" // { + (sources."inflight-1.0.6" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -2874,7 +3502,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."entities-1.0.0" @@ -2894,6 +3522,7 @@ in sources."strip-json-comments-1.0.4" sources."lodash-3.7.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; homepage = http://jshint.com/; @@ -2904,21 +3533,21 @@ in shelljs = nodeEnv.buildNodePackage { name = "shelljs"; packageName = "shelljs"; - version = "0.7.4"; + version = "0.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.4.tgz"; - sha1 = "b8f04b3a74ddfafea22acf98e0be45ded53d59c8"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz"; + sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad"; }; dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.1" // { dependencies = [ sources."fs.realpath-1.0.0" - (sources."inflight-1.0.5" // { + (sources."inflight-1.0.6" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -2929,21 +3558,22 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) sources."interpret-1.0.1" (sources."rechoir-0.6.2" // { dependencies = [ - sources."resolve-1.1.7" + sources."resolve-1.2.0" ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Portable Unix shell commands for Node.js"; homepage = http://github.com/shelljs/shelljs; diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 4d6c2d6662c4..54f8fe0c728d 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! {pkgs ? import { inherit system; @@ -6,7 +6,7 @@ let nodeEnv = import ../../node-packages/node-env.nix { - inherit (pkgs) stdenv utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; }; in diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 6bceb40b523b..ebf04ec75363 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { meta = { description = "A sandbox-building game"; homepage = http://www.minecraft.net; - maintainers = with stdenv.lib.maintainers; [ page ryantm ]; + maintainers = with stdenv.lib.maintainers; [ cpages ryantm ]; license = stdenv.lib.licenses.unfreeRedistributable; }; } diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 32ba63709d71..65c2a42922b2 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Open source clone of UFO: Enemy Unknown"; homepage = http://openxcom.org; repositories.git = https://github.com/SupSuper/OpenXcom.git; - maintainers = [ stdenv.lib.maintainers.page ]; + maintainers = [ stdenv.lib.maintainers.cpages ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index a1778cc69d79..4d2db9d293f5 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,45 +1,51 @@ -{ fetchgit, fetchsvn, cmake, stdenv, plib, SDL, openal, freealut, mesa -, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig -, fribidi, autoconf, automake, libtool, bluez, libjpeg, libpng }: +{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig +, openal, freealut, mesa, libvorbis, libogg, gettext, curl, freetype +, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr }: -stdenv.mkDerivation rec { +let + dir = "stk-code"; + +in stdenv.mkDerivation rec { name = "supertuxkart-${version}"; - version = "0.9"; + version = "0.9.2"; srcs = [ - (fetchgit { - url = "https://github.com/supertuxkart/stk-code"; - rev = "28a525f6d4aba2667c41a549b027149fcceda97e"; - sha256 = "0b5izr7j3clm6pcxanwwaas06f17wi454s6hwmgv1mg48aay2v97"; - name = "stk-code"; + (fetchFromGitHub { + owner = "supertuxkart"; + repo = "stk-code"; + rev = version; + sha256 = "1zsc5nw8il8xwppk624jampfk6qhqzjnni8zicrhqix0xg07nxca"; + name = dir; }) (fetchsvn { - url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "16293"; - sha256 = "07jdkli28xr3rcxvixyy5bwi26n5i7dkhd9q0j4wifgs4pymm8r5"; - name = "stk-assets"; + url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; + rev = "16503"; # 0.9.2 crashes with 16937. Refer to stk-code/doc/assets_version + sha256 = "0j1dy27gxm4hx26xddr2ak6vw0lim0nqmjnszfb4c61y92j12cqp"; + name = "stk-assets"; }) ]; - + buildInputs = [ - plib SDL openal freealut mesa libvorbis libogg gettext - libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez libjpeg libpng + cmake libtool pkgconfig + libX11 libXrandr + openal freealut mesa libvorbis libogg gettext zlib freetype + curl fribidi bluez libjpeg libpng ]; enableParallelBuilding = true; - sourceRoot = "stk-code"; + sourceRoot = dir; - meta = { + meta = with stdenv.lib; { description = "A Free 3D kart racing game"; longDescription = '' SuperTuxKart is a Free 3D kart racing game, with many tracks, characters and items for you to try, similar in spirit to Mario Kart. ''; - homepage = http://supertuxkart.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ c0dehero fuuzetsu ]; - platforms = with stdenv.lib.platforms; linux; + homepage = https://supertuxkart.net/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ c0dehero fuuzetsu peterhoeg ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index cc7be1142245..560aa3ff079e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1621,6 +1621,17 @@ rec { }; + gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "gruvbox-2016-09-28"; + src = fetchgit { + url = "git://github.com/morhetz/gruvbox"; + rev = "127c9d14d4bac1bac31e328b835a8919a255789c"; + sha256 = "19wg9143wvlynblpxm0cnk3ars2hgss3y745hligqgvfy308f7sm"; + }; + dependencies = []; + + }; + 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 ed14d8d25591..cd22f63d562b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,6 +1,7 @@ "CSApprox" "CheckAttach" "Gist" +"gruvbox" "Hoogle" "Solarized" "Supertab" diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 3ecb35114220..9a3c3c556e3b 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -104,6 +104,7 @@ with frameworks; with libs; { VideoDecodeAcceleration = [ CF CoreVideo ]; VideoToolbox = [ CF CoreMedia CoreVideo ]; WebKit = [ ApplicationServices Carbon JavaScriptCore OpenGL ]; + X11 = []; # used by Tk, should this exist? # Umbrellas Accelerate = [ CoreWLAN IOBluetooth ]; diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix index 1d26a8b350be..01753a5300b7 100644 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -18,7 +18,9 @@ { prefix, arch, simulator ? false }: let sdkType = if simulator then "Simulator" else "OS"; - sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}10.0.sdk"; + sdkVer = "10.2"; + + sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${sdkVer}.sdk"; /* TODO: Properly integrate with gcc-cross-wrapper */ wrapper = import ../../../build-support/cc-wrapper { @@ -29,6 +31,10 @@ libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}"; cc = clang; extraBuildCommands = '' + if ! [ -d ${sdk} ]; then + echo "You must have ${sdkVer} of the iPhone${sdkType} sdk installed at ${sdk}" >&2 + exit 1 + fi # ugh tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp mv cc-cflags.tmp $out/nix-support/cc-cflags diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 772e69ac390e..54ca7d9e324f 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + patches = [ + (fetchurl { + # for new gperf + url = "https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60.patch"; + sha256 = "097pjmgq243mz3vfxndwmm37prmacgq2f4r4gb47whfkbd6syqcw"; + }) + ]; + configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 727126de388d..5ecfdefa97d8 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.45"; + version = "3.18.47"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1qwvqrlzpf57zvh57dsdk4c4swgbasf2ab75vcn2py8l7jl6rxf0"; + sha256 = "1d9gcr08i6jlm4h6gxmhkq3hjm2ysd1587wffj10ky7y6428dpdi"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index b7f988299313..fd171eae0012 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.36"; + version = "4.1.38"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "140my5r39w795gsaglqxaw97hwpy8qf95c6hy2cr7a122bgnslp1"; + sha256 = "0mmx11z1wlnlaw2nhpdw76xzmqmfr8q52dv0jvy0pjq8rcbk3hmq"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 2d2f4d924db4..0eb87a8dd9e2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.43"; + version = "4.4.44"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1yzphiznkwambniq21fiw0vw1fgql4cwcxjlp290y8cf3b3704qb"; + sha256 = "0j779p83w4i9vj7l23rx1ihymplgy44pjh53lf55napj0ckwzggs"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index adf02dfa9d71..cb720c206348 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "radeontop-${version}"; - version = "2016-07-04"; + version = "2016-10-28"; src = fetchFromGitHub { - sha256 = "07pj5c3shnxljwq0hkksw7qnp8kb3n5ngihdmi4fqbmyz8in2vm5"; - rev = "bb3ed18aa8877f2816348ca9f016bb61d67e636f"; + sha256 = "0y4rl8pm7p22s1ipyb75mlsk9qb6j4rd6nlqb3digmimnyxda1q3"; + rev = "v1.0"; repo = "radeontop"; owner = "clbr"; }; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 06ad440c7754..f4f39451220c 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -66,7 +66,7 @@ in sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s"; }; splUnstable = common { - version = "0.7.0-rc2"; - sha256 = "1y7jlyj8jwgrgnd6hiabms5h9430b6wjbnr3pwb16mv40wns1i65"; + version = "0.7.0-rc3"; + sha256 = "09v5gh7mqdl3bfq5an9iiw9fw3l1skprclxdz7r19bw3ids3lfja"; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index bd2767a66b45..7fda9b884d81 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -13,11 +13,11 @@ let buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; - common = { version, sha256, extraPatches, spl, inkompatibleKernelVersion ? null } @ args: + common = { version, sha256, extraPatches, spl, incompatibleKernelVersion ? null } @ args: if buildKernel && - (inkompatibleKernelVersion != null) && - versionAtLeast kernel.version inkompatibleKernelVersion then - throw "linux v${kernel.version} is not yet supported by zfsonlinux v${version}" + (incompatibleKernelVersion != null) && + versionAtLeast kernel.version incompatibleKernelVersion then + throw "Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable." else stdenv.mkDerivation rec { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; @@ -123,7 +123,7 @@ in # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - inkompatibleKernelVersion = "4.9"; + incompatibleKernelVersion = "4.9"; version = "0.6.5.8"; @@ -139,21 +139,16 @@ in }; zfsUnstable = common { # comment/uncomment if breaking kernel versions are known - inkompatibleKernelVersion = "4.10"; + incompatibleKernelVersion = null; - version = "0.7.0-rc2"; + version = "0.7.0-rc3"; # this package should point to a version / git revision compatible with the latest kernel release - sha256 = "197y2jyav9h1ksri9kzqvrwmzpb58mlgw27vfvgd4bvxpwfxq53s"; + sha256 = "0js3lazqq8wb4nklqxd6sgbvwqgwnjgz3xi3mm33xf4284gia6pc"; extraPatches = [ (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc2...nixos-zfs-0.7.0-rc2.patch"; - sha256 = "1p33bwd6p5r5phbqb657x8h9x3bd012k2mdmbzgnb09drh9v0r82"; - }) - (fetchpatch { - name = "Kernel_4.9_zfs_aio_fsync_removal.patch"; - url = "https://github.com/zfsonlinux/zfs/commit/99ca173929cb693012dabe98bcee4f12ec7e6e92.patch"; - sha256 = "10npvpj52rpq88vdsn7zkdhx2lphzvqypsd9abdadjbqkwxld9la"; + url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch"; + sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh"; }) ]; spl = splUnstable; diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 410bd23eb30e..c03ec8eb7f9a 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "An AMQP message broker and a C++ messaging API"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.page ]; + maintainers = [ stdenv.lib.maintainers.cpages ]; }; } diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0d5d0a46e4e5..d37b53398b6d 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0a8lc85jihlw326w0irykw5fbwcbz2mlq0vrcsd0niygqlvcppsv"; + sha256 = "0aa6gzcbpjkk7ss3c1sg0scinhczvg4lgb59wv5jljliaks2n5h0"; }; installPhase = '' diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix index 644d9e6e9e55..d413475389fc 100644 --- a/pkgs/servers/web-apps/pump.io/composition.nix +++ b/pkgs/servers/web-apps/pump.io/composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.0. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! {pkgs ? import { inherit system; @@ -6,11 +6,11 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix index ec05cc8c13b9..ab3022b95123 100644 --- a/pkgs/servers/web-apps/pump.io/node-packages.nix +++ b/pkgs/servers/web-apps/pump.io/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.0. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -13,13 +13,13 @@ let sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; }; }; - "bunyan-1.8.1" = { + "bunyan-1.8.5" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.1"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.1.tgz"; - sha1 = "68c6a4a502d5620bc9f72d6736810c1b1898097f"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz"; + sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a"; }; }; "connect-2.30.2" = { @@ -85,13 +85,13 @@ let sha1 = "051806a88a6cc18ffb25adf13eda232e354ebcb6"; }; }; - "dompurify-0.8.3" = { + "dompurify-0.8.4" = { name = "dompurify"; packageName = "dompurify"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.3.tgz"; - sha1 = "06bdc074b91306d09f7f150bfeb96a11e0be64c1"; + url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.4.tgz"; + sha1 = "93cabe8b6b84f3cf83f63b985ff71ef05f8cdeb6"; }; }; "emailjs-1.0.8" = { @@ -112,13 +112,13 @@ let sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; }; }; - "express-session-1.14.1" = { + "express-session-1.14.2" = { name = "express-session"; packageName = "express-session"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.14.1.tgz"; - sha1 = "600364f0f6bf5dce32649e006770bdeee80aec99"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz"; + sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275"; }; }; "gm-1.23.0" = { @@ -130,13 +130,13 @@ let sha1 = "80a2fe9cbf131515024846444658461269f52661"; }; }; - "helmet-2.2.0" = { + "helmet-2.3.0" = { name = "helmet"; packageName = "helmet"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-2.2.0.tgz"; - sha1 = "fa0737d113fba4bd29d1b39650ac679ad673b948"; + url = "https://registry.npmjs.org/helmet/-/helmet-2.3.0.tgz"; + sha1 = "d655c85b55b0a3bf722a4c2c66e48b78b4161b91"; }; }; "jankyqueue-0.1.1" = { @@ -202,13 +202,13 @@ let sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; }; }; - "sanitize-html-1.13.0" = { + "sanitize-html-1.14.1" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.13.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz"; - sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631"; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz"; + sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8"; }; }; "schlock-0.2.1" = { @@ -229,22 +229,22 @@ let sha1 = "765e7607c8055452bba6f0b052595350986036de"; }; }; - "showdown-1.4.3" = { + "showdown-1.6.0" = { name = "showdown"; packageName = "showdown"; - version = "1.4.3"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/showdown/-/showdown-1.4.3.tgz"; - sha1 = "91d29f4728dbdf76034b7555355e9b30974df447"; + url = "https://registry.npmjs.org/showdown/-/showdown-1.6.0.tgz"; + sha1 = "4a3cd2b73c45914f8cc00a388303be78b9f3e2a4"; }; }; - "sockjs-0.3.17" = { + "sockjs-0.3.18" = { name = "sockjs"; packageName = "sockjs"; - version = "0.3.17"; + version = "0.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.17.tgz"; - sha1 = "ef1b88f5d73e6278fad8e9476ac91064382f3b44"; + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz"; + sha1 = "d9b289316ca7df77595ef299e075f0f937eb4207"; }; }; "step-0.0.6" = { @@ -256,13 +256,13 @@ let sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; }; }; - "ua-parser-js-0.7.10" = { + "ua-parser-js-0.7.12" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.10"; + version = "0.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.10.tgz"; - sha1 = "917559ddcce07cbc09ece7d80495e4c268f4ef9f"; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz"; + sha1 = "04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"; }; }; "underscore-1.8.3" = { @@ -364,13 +364,13 @@ let sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; }; }; - "dtrace-provider-0.6.0" = { + "dtrace-provider-0.8.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.6.0"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz"; - sha1 = "0b078d5517937d873101452d9146737557b75e51"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz"; + sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625"; }; }; "mv-2.1.1" = { @@ -391,22 +391,22 @@ let sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; }; }; - "moment-2.15.0" = { + "moment-2.17.1" = { name = "moment"; packageName = "moment"; - version = "2.15.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.15.0.tgz"; - sha1 = "cc9e33958bf4a99dea7111d5e62ed3c13fc96440"; + url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; + sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; }; }; - "nan-2.4.0" = { + "nan-2.5.0" = { name = "nan"; packageName = "nan"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; - sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; + sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; }; }; "ncp-2.0.0" = { @@ -436,13 +436,13 @@ let sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; }; }; - "inflight-1.0.5" = { + "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"; - sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a"; + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; "inherits-2.0.3" = { @@ -472,13 +472,13 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "path-is-absolute-1.0.0" = { + "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; - sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; "wrappy-1.0.2" = { @@ -670,13 +670,13 @@ let sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "method-override-2.3.6" = { + "method-override-2.3.7" = { name = "method-override"; packageName = "method-override"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz"; - sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e"; + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; + sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; }; }; "morgan-1.6.1" = { @@ -733,22 +733,22 @@ let sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "response-time-2.3.1" = { + "response-time-2.3.2" = { name = "response-time"; packageName = "response-time"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz"; - sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797"; + url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; + sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; }; }; - "serve-favicon-2.3.0" = { + "serve-favicon-2.3.2" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz"; - sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz"; + sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; }; }; "serve-index-1.7.3" = { @@ -769,13 +769,13 @@ let sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; }; }; - "type-is-1.6.13" = { + "type-is-1.6.14" = { name = "type-is"; packageName = "type-is"; - version = "1.6.13"; + version = "1.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"; - sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; + sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; }; }; "utils-merge-1.0.0" = { @@ -868,13 +868,13 @@ let sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; }; }; - "compressible-2.0.8" = { + "compressible-2.0.9" = { name = "compressible"; packageName = "compressible"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz"; - sha1 = "7162e6c46d3b9d200ffb45cb4e4a0f7832732503"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz"; + sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425"; }; }; "vary-1.0.1" = { @@ -886,13 +886,13 @@ let sha1 = "99e4981566a286118dfb2b817357df7993376d10"; }; }; - "mime-types-2.1.11" = { + "mime-types-2.1.14" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.11"; + version = "2.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"; - sha1 = "c259c471bda808a85d6cd193b430a5fae4473b3c"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; + sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; }; }; "negotiator-0.5.3" = { @@ -904,13 +904,13 @@ let sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; }; - "mime-db-1.23.0" = { + "mime-db-1.26.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.23.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"; - sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; + sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; }; }; "ms-0.7.1" = { @@ -922,22 +922,22 @@ let sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; - "csrf-3.0.3" = { + "csrf-3.0.4" = { name = "csrf"; packageName = "csrf"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz"; - sha1 = "69d13220de95762808bb120f7533a994fc4293b5"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz"; + sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; }; }; - "base64-url-1.2.2" = { + "base64-url-1.3.3" = { name = "base64-url"; packageName = "base64-url"; - version = "1.2.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz"; - sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3"; + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; + sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; }; }; "rndm-1.2.0" = { @@ -958,13 +958,13 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "uid-safe-2.1.1" = { + "uid-safe-2.1.3" = { name = "uid-safe"; packageName = "uid-safe"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz"; - sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666"; + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz"; + sha1 = "077e264a00b3187936b270bb7376a26473631071"; }; }; "random-bytes-1.0.0" = { @@ -1039,13 +1039,22 @@ let sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; }; }; - "statuses-1.3.0" = { + "statuses-1.3.1" = { name = "statuses"; packageName = "statuses"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"; - sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a"; + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; + }; + }; + "debug-2.3.3" = { + name = "debug"; + packageName = "debug"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; "methods-1.1.2" = { @@ -1066,6 +1075,15 @@ let sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; }; }; + "ms-0.7.2" = { + name = "ms"; + packageName = "ms"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + }; + }; "basic-auth-1.0.4" = { name = "basic-auth"; packageName = "basic-auth"; @@ -1120,6 +1138,15 @@ let sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; }; }; + "depd-1.1.0" = { + name = "depd"; + packageName = "depd"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; + sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; + }; + }; "etag-1.7.0" = { name = "etag"; packageName = "etag"; @@ -1255,6 +1282,15 @@ let sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; }; }; + "debug-2.6.0" = { + name = "debug"; + packageName = "debug"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; + sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; + }; + }; "mime-1.2.11" = { name = "mime"; packageName = "mime"; @@ -1399,13 +1435,13 @@ let sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; }; }; - "object-assign-4.1.0" = { + "object-assign-4.1.1" = { name = "object-assign"; packageName = "object-assign"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; - sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; "read-pkg-up-1.0.1" = { @@ -1453,22 +1489,22 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "signal-exit-3.0.1" = { + "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; - sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; - "array-find-index-1.0.1" = { + "array-find-index-1.0.2" = { name = "array-find-index"; packageName = "array-find-index"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz"; - sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af"; + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; "hosted-git-info-2.1.5" = { @@ -1525,13 +1561,13 @@ let sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; }; }; - "spdx-expression-parse-1.0.3" = { + "spdx-expression-parse-1.0.4" = { name = "spdx-expression-parse"; packageName = "spdx-expression-parse"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.3.tgz"; - sha1 = "ca3c3828c4fea8aa44997884b398fc5d67436442"; + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; + sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; }; }; "spdx-license-ids-1.2.2" = { @@ -1606,13 +1642,13 @@ let sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "graceful-fs-4.1.6" = { + "graceful-fs-4.1.11" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.6"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz"; - sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; "parse-json-2.2.0" = { @@ -1696,22 +1732,22 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; - "is-finite-1.0.1" = { + "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; - sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; }; }; - "number-is-nan-1.0.0" = { + "number-is-nan-1.0.1" = { name = "number-is-nan"; packageName = "number-is-nan"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; - sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; "underscore-1.5.2" = { @@ -1786,6 +1822,15 @@ let sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607"; }; }; + "iconv-lite-0.4.15" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; + sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; + }; + }; "connect-1.9.2" = { name = "connect"; packageName = "connect"; @@ -1840,40 +1885,13 @@ let sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; - "crc-3.4.0" = { + "crc-3.4.1" = { name = "crc"; packageName = "crc"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz"; - sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f"; - }; - }; - "depd-1.1.0" = { - name = "depd"; - packageName = "depd"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; - sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; - }; - }; - "uid-safe-2.1.2" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.2.tgz"; - sha1 = "c934b3caead0fdcd0fb2cff3a8876d06fe0ee0fd"; - }; - }; - "base64-url-1.3.2" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.2.tgz"; - sha1 = "4b08113b49d23889f306be64372762d31412f7a8"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz"; + sha1 = "65d5830b1a2569557cfb324c0e679998521473ee"; }; }; "array-parallel-0.1.3" = { @@ -1894,31 +1912,31 @@ let sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; }; }; - "cross-spawn-4.0.0" = { + "cross-spawn-4.0.2" = { name = "cross-spawn"; packageName = "cross-spawn"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.0.tgz"; - sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; }; }; - "lru-cache-4.0.1" = { + "lru-cache-4.0.2" = { name = "lru-cache"; packageName = "lru-cache"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz"; - sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"; + sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; }; }; - "which-1.2.11" = { + "which-1.2.12" = { name = "which"; packageName = "which"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; - sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; + url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz"; + sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; }; }; "pseudomap-1.0.2" = { @@ -2002,13 +2020,13 @@ let sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b"; }; }; - "hpkp-1.1.0" = { + "hpkp-1.2.0" = { name = "hpkp"; packageName = "hpkp"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hpkp/-/hpkp-1.1.0.tgz"; - sha1 = "77bdff1f331847fb9f40839d00a45032baed4df4"; + url = "https://registry.npmjs.org/hpkp/-/hpkp-1.2.0.tgz"; + sha1 = "83f2cb38b26cff21daf26e2ff4b57126921dec65"; }; }; "hsts-1.0.0" = { @@ -2164,13 +2182,13 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; - "nwmatcher-1.3.8" = { + "nwmatcher-1.3.9" = { name = "nwmatcher"; packageName = "nwmatcher"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.8.tgz"; - sha1 = "34edb93de1aa6cb4448b573c9f2a059300241157"; + url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz"; + sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a"; }; }; "parse5-1.5.1" = { @@ -2182,13 +2200,13 @@ let sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"; }; }; - "request-2.74.0" = { + "request-2.79.0" = { name = "request"; packageName = "request"; - version = "2.74.0"; + version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; - sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; + url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; "sax-1.2.1" = { @@ -2200,22 +2218,22 @@ let sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; }; }; - "symbol-tree-3.1.4" = { + "symbol-tree-3.2.1" = { name = "symbol-tree"; packageName = "symbol-tree"; - version = "3.1.4"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.1.4.tgz"; - sha1 = "02b279348d337debc39694c5c95f882d448a312a"; + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.1.tgz"; + sha1 = "8549dd1d01fa9f893c18cc9ab0b106b4d9b168cb"; }; }; - "tough-cookie-2.3.1" = { + "tough-cookie-2.3.2" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; - sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"; + sha1 = "f081f76e4c85720e6c37a5faced737150d84072a"; }; }; "webidl-conversions-2.0.1" = { @@ -2272,13 +2290,13 @@ let sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; }; }; - "optionator-0.8.1" = { + "optionator-0.8.2" = { name = "optionator"; packageName = "optionator"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz"; - sha1 = "e31b4932cdd5fb862a8b0d10bc63d3ee1ec7d78b"; + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; }; }; "source-map-0.2.0" = { @@ -2335,22 +2353,22 @@ let sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; }; }; - "fast-levenshtein-1.1.4" = { + "fast-levenshtein-2.0.6" = { name = "fast-levenshtein"; packageName = "fast-levenshtein"; - version = "1.1.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"; - sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"; + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "amdefine-1.0.0" = { + "amdefine-1.0.1" = { name = "amdefine"; packageName = "amdefine"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"; - sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33"; + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; "aws-sign2-0.6.0" = { @@ -2362,22 +2380,13 @@ let sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "aws4-1.4.1" = { + "aws4-1.5.0" = { name = "aws4"; packageName = "aws4"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"; - sha1 = "fde7d5292466d230e5ee0f4e038d9dfaab08fc61"; - }; - }; - "bl-1.1.2" = { - name = "bl"; - packageName = "bl"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; - sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; + sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; }; }; "caseless-0.11.0" = { @@ -2416,13 +2425,13 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "form-data-1.0.1" = { + "form-data-2.1.2" = { name = "form-data"; packageName = "form-data"; - version = "1.0.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; - sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; + sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; }; "har-validator-2.0.6" = { @@ -2488,13 +2497,13 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.2.1" = { + "qs-6.3.0" = { name = "qs"; packageName = "qs"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; - sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; + url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"; + sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; }; }; "stringstream-0.0.5" = { @@ -2515,40 +2524,13 @@ let sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "readable-stream-2.0.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.0.6"; + "uuid-3.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; + sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; }; }; "delayed-stream-1.0.0" = { @@ -2560,22 +2542,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.0.1" = { - name = "async"; - packageName = "async"; - version = "2.0.1"; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz"; - sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; - }; - }; - "lodash-4.15.0" = { - name = "lodash"; - packageName = "lodash"; - version = "4.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz"; - sha1 = "3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9"; + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; "chalk-1.1.3" = { @@ -2596,13 +2569,13 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "is-my-json-valid-2.13.1" = { + "is-my-json-valid-2.15.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.13.1"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; - sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"; + sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b"; }; }; "ansi-styles-2.2.1" = { @@ -2650,13 +2623,13 @@ let sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; }; }; - "ansi-regex-2.0.0" = { + "ansi-regex-2.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; - sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; "graceful-readlink-1.0.1" = { @@ -2686,13 +2659,13 @@ let sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; }; }; - "jsonpointer-2.0.0" = { + "jsonpointer-4.0.1" = { name = "jsonpointer"; packageName = "jsonpointer"; - version = "2.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"; - sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9"; + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; + sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; }; }; "xtend-4.0.1" = { @@ -2767,13 +2740,13 @@ let sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; }; }; - "sshpk-1.10.0" = { + "sshpk-1.10.2" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.0"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.0.tgz"; - sha1 = "104d6ba2afb2ac099ab9567c0d193977f29c6dfa"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"; + sha1 = "d5a804ce22695515638e798dbe23273de070a5fa"; }; }; "extsprintf-1.0.2" = { @@ -2821,13 +2794,13 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "dashdash-1.14.0" = { + "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"; - sha1 = "29e486c5418bf0f356034a993d51686a33e84141"; + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; "getpass-0.1.6" = { @@ -2848,13 +2821,13 @@ let sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; }; }; - "tweetnacl-0.13.3" = { + "tweetnacl-0.14.5" = { name = "tweetnacl"; packageName = "tweetnacl"; - version = "0.13.3"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"; - sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56"; + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; "jodid25519-1.0.2" = { @@ -2884,13 +2857,13 @@ let sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; }; }; - "tweetnacl-0.14.3" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.3"; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; - sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; "tr46-0.0.3" = { @@ -2929,13 +2902,13 @@ let sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; }; }; - "glob-7.0.6" = { + "glob-7.1.1" = { name = "glob"; packageName = "glob"; - version = "7.0.6"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; - sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; + sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; }; }; "fs.realpath-1.0.0" = { @@ -2947,13 +2920,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "htmlparser2-3.9.1" = { + "htmlparser2-3.9.2" = { name = "htmlparser2"; packageName = "htmlparser2"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.1.tgz"; - sha1 = "621b7a58bc9acd003f7af0a2c9a00aa67c8505d2"; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz"; + sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"; }; }; "regexp-quote-0.0.0" = { @@ -3001,13 +2974,13 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "readable-stream-2.1.5" = { + "readable-stream-2.2.2" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.1.5"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; - sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; + sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; }; }; "dom-serializer-0.1.0" = { @@ -3037,6 +3010,33 @@ let sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; }; }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -3073,13 +3073,22 @@ let sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; }; }; - "yargs-3.32.0" = { + "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; - version = "3.32.0"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; - sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; }; }; "cliui-3.2.0" = { @@ -3091,6 +3100,15 @@ let sha1 = "120601537a916d29940f934da3b48d585a39213d"; }; }; + "get-caller-file-1.0.2" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; + sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; + }; + }; "os-locale-1.4.0" = { name = "os-locale"; packageName = "os-locale"; @@ -3100,6 +3118,33 @@ let sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; }; }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; @@ -3109,13 +3154,13 @@ let sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; }; }; - "window-size-0.1.4" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.4"; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; - sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; }; }; "y18n-3.2.1" = { @@ -3127,13 +3172,22 @@ let sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; }; }; - "wrap-ansi-2.0.0" = { + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + }; + }; + "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz"; - sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f"; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; }; }; "lcid-1.0.0" = { @@ -3154,13 +3208,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "code-point-at-1.0.0" = { + "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"; - sha1 = "f69b192d3f7d91e382e4b71bddb77878619ab0c6"; + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -3181,13 +3235,13 @@ let sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; }; }; - "uuid-2.0.2" = { + "uuid-2.0.3" = { name = "uuid"; packageName = "uuid"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz"; - sha1 = "48bd5698f0677e3c7901a1c46ef15b1643794726"; + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; "websocket-driver-0.6.5" = { @@ -3226,13 +3280,13 @@ let sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; }; }; - "mongodb-2.2.10" = { + "mongodb-2.2.21" = { name = "mongodb"; packageName = "mongodb"; - version = "2.2.10"; + version = "2.2.21"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.10.tgz"; - sha1 = "d11273a5a53b08e17bcc4c8a295ded0f151ccae6"; + url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.21.tgz"; + sha1 = "f7ee56489600e0ac8024c062c0857ac04ddb5f48"; }; }; "es6-promise-3.2.1" = { @@ -3244,22 +3298,31 @@ let sha1 = "ec56233868032909207170c39448e24449dd1fc4"; }; }; - "mongodb-core-2.0.12" = { + "mongodb-core-2.1.6" = { name = "mongodb-core"; packageName = "mongodb-core"; - version = "2.0.12"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.12.tgz"; - sha1 = "bb66aad550e252731f8ad49276815264a91c337c"; + url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.6.tgz"; + sha1 = "9d179e7487767c58993bb7c8d6685d035c346a42"; }; }; - "bson-0.5.5" = { + "readable-stream-2.1.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + }; + "bson-1.0.4" = { name = "bson"; packageName = "bson"; - version = "0.5.5"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-0.5.5.tgz"; - sha1 = "1d6725d400f0fbf0271bf6bafc8fa1126c29983b"; + url = "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz"; + sha1 = "93c10d39eaa5b58415cbc4052f3e53e562b0b72c"; }; }; "require_optional-1.0.0" = { @@ -3392,11 +3455,11 @@ let sources."nan-2.3.5" ]; }) - (sources."bunyan-1.8.1" // { + (sources."bunyan-1.8.5" // { dependencies = [ - (sources."dtrace-provider-0.6.0" // { + (sources."dtrace-provider-0.8.0" // { dependencies = [ - sources."nan-2.4.0" + sources."nan-2.5.0" ]; }) (sources."mv-2.1.1" // { @@ -3406,7 +3469,7 @@ let dependencies = [ (sources."glob-6.0.4" // { dependencies = [ - (sources."inflight-1.0.5" // { + (sources."inflight-1.0.6" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -3427,7 +3490,7 @@ let sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -3435,7 +3498,7 @@ let ]; }) sources."safe-json-stringify-1.0.3" - sources."moment-2.15.0" + sources."moment-2.17.1" ]; }) (sources."connect-2.30.2" // { @@ -3466,17 +3529,17 @@ let dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.5.3" ]; }) - (sources."compressible-2.0.8" // { + (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) sources."vary-1.0.1" @@ -3490,12 +3553,12 @@ let sources."content-type-1.0.2" (sources."csurf-1.8.3" // { dependencies = [ - (sources."csrf-3.0.3" // { + (sources."csrf-3.0.4" // { dependencies = [ - sources."base64-url-1.2.2" + sources."base64-url-1.3.3" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - (sources."uid-safe-2.1.1" // { + (sources."uid-safe-2.1.3" // { dependencies = [ sources."random-bytes-1.0.0" ]; @@ -3514,9 +3577,9 @@ let dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.6.1" @@ -3550,11 +3613,16 @@ let (sources."http-errors-1.3.1" // { dependencies = [ sources."inherits-2.0.3" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) - (sources."method-override-2.3.6" // { + (sources."method-override-2.3.7" // { dependencies = [ + (sources."debug-2.3.3" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."methods-1.1.2" sources."vary-1.1.0" ]; @@ -3586,11 +3654,15 @@ let sources."parseurl-1.3.1" sources."pause-0.1.0" sources."qs-4.0.0" - sources."response-time-2.3.1" - (sources."serve-favicon-2.3.0" // { + (sources."response-time-2.3.2" // { + dependencies = [ + sources."depd-1.1.0" + ]; + }) + (sources."serve-favicon-2.3.2" // { dependencies = [ sources."etag-1.7.0" - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."serve-index-1.7.3" // { @@ -3602,9 +3674,9 @@ let }) sources."batch-0.5.3" sources."escape-html-1.0.3" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -3614,12 +3686,12 @@ let sources."escape-html-1.0.3" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -3646,9 +3718,9 @@ let sources."bytes-0.2.0" sources."fresh-0.1.0" sources."pause-0.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.6.0" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) ]; @@ -3690,10 +3762,10 @@ let dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" ]; }) sources."map-obj-1.0.1" @@ -3714,12 +3786,12 @@ let sources."spdx-license-ids-1.2.2" ]; }) - sources."spdx-expression-parse-1.0.3" + sources."spdx-expression-parse-1.0.4" ]; }) ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" (sources."read-pkg-up-1.0.1" // { dependencies = [ (sources."find-up-1.1.2" // { @@ -3736,7 +3808,7 @@ let dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.11" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -3761,7 +3833,7 @@ let }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.11" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -3780,9 +3852,9 @@ let dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -3802,7 +3874,7 @@ let sources."underscore-1.5.2" ]; }) - sources."dompurify-0.8.3" + sources."dompurify-0.8.4" (sources."emailjs-1.0.8" // { dependencies = [ sources."addressparser-0.3.2" @@ -3810,7 +3882,7 @@ let dependencies = [ (sources."encoding-0.1.12" // { dependencies = [ - sources."iconv-lite-0.4.13" + sources."iconv-lite-0.4.15" ]; }) sources."addressparser-0.2.1" @@ -3833,11 +3905,11 @@ let sources."mkdirp-0.3.0" ]; }) - (sources."express-session-1.14.1" // { + (sources."express-session-1.14.2" // { dependencies = [ sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."crc-3.4.0" + sources."crc-3.4.1" (sources."debug-2.2.0" // { dependencies = [ sources."ms-0.7.1" @@ -3846,9 +3918,9 @@ let sources."depd-1.1.0" sources."on-headers-1.0.1" sources."parseurl-1.3.1" - (sources."uid-safe-2.1.2" // { + (sources."uid-safe-2.1.3" // { dependencies = [ - sources."base64-url-1.3.2" + sources."base64-url-1.3.3" sources."random-bytes-1.0.0" ]; }) @@ -3859,15 +3931,15 @@ let dependencies = [ sources."array-parallel-0.1.3" sources."array-series-0.1.5" - (sources."cross-spawn-4.0.0" // { + (sources."cross-spawn-4.0.2" // { dependencies = [ - (sources."lru-cache-4.0.1" // { + (sources."lru-cache-4.0.2" // { dependencies = [ sources."pseudomap-1.0.2" sources."yallist-2.0.0" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -3881,7 +3953,7 @@ let }) ]; }) - (sources."helmet-2.2.0" // { + (sources."helmet-2.3.0" // { dependencies = [ (sources."connect-3.4.1" // { dependencies = [ @@ -3921,7 +3993,7 @@ let ]; }) sources."hide-powered-by-1.0.0" - sources."hpkp-1.1.0" + sources."hpkp-1.2.0" (sources."hsts-1.0.0" // { dependencies = [ sources."core-util-is-1.0.2" @@ -3950,43 +4022,29 @@ let sources."estraverse-1.9.3" sources."esutils-2.0.2" sources."esprima-2.7.3" - (sources."optionator-0.8.1" // { + (sources."optionator-0.8.2" // { dependencies = [ sources."prelude-ls-1.1.2" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" sources."type-check-0.3.2" sources."levn-0.3.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.6" ]; }) (sources."source-map-0.2.0" // { dependencies = [ - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" ]; }) ]; }) - sources."nwmatcher-1.3.8" + sources."nwmatcher-1.3.9" sources."parse5-1.5.1" - (sources."request-2.74.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.4.1" - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."aws4-1.5.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -3995,13 +4053,9 @@ let }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.1.2" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -4012,12 +4066,12 @@ let sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -4028,7 +4082,7 @@ let sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.15.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -4036,7 +4090,7 @@ let sources."is-property-1.0.2" ]; }) - sources."jsonpointer-2.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -4065,21 +4119,17 @@ let sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -4087,20 +4137,25 @@ let sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.1" ]; }) sources."sax-1.2.1" - sources."symbol-tree-3.1.4" - sources."tough-cookie-2.3.1" + sources."symbol-tree-3.2.1" + (sources."tough-cookie-2.3.2" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."webidl-conversions-2.0.1" (sources."whatwg-url-compat-0.6.5" // { dependencies = [ @@ -4125,10 +4180,10 @@ let }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.1" // { dependencies = [ sources."fs.realpath-1.0.0" - (sources."inflight-1.0.5" // { + (sources."inflight-1.0.6" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -4149,14 +4204,14 @@ let sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; }) - (sources."sanitize-html-1.13.0" // { + (sources."sanitize-html-1.14.1" // { dependencies = [ - (sources."htmlparser2-3.9.1" // { + (sources."htmlparser2-3.9.2" // { dependencies = [ sources."domelementtype-1.3.0" sources."domhandler-2.3.0" @@ -4171,7 +4226,7 @@ let }) sources."entities-1.1.1" sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -4212,22 +4267,23 @@ let sources."statuses-1.2.1" ]; }) - (sources."showdown-1.4.3" // { + (sources."showdown-1.6.0" // { dependencies = [ - (sources."yargs-3.32.0" // { + (sources."yargs-6.6.0" // { dependencies = [ - sources."camelcase-2.1.1" + sources."camelcase-3.0.0" (sources."cliui-3.2.0" // { dependencies = [ (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) - sources."wrap-ansi-2.0.0" + sources."wrap-ansi-2.1.0" ]; }) sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" (sources."os-locale-1.4.0" // { dependencies = [ (sources."lcid-1.0.0" // { @@ -4237,32 +4293,107 @@ let }) ]; }) - (sources."string-width-1.0.2" // { + (sources."read-pkg-up-1.0.1" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."find-up-1.1.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) ]; }) - (sources."is-fullwidth-code-point-1.0.0" // { + (sources."read-pkg-1.1.0" // { dependencies = [ - sources."number-is-nan-1.0.0" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.0.0" + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.1.5" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + sources."semver-5.3.0" + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.4" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) ]; }) ]; }) - sources."window-size-0.1.4" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + ]; + }) + sources."which-module-1.0.0" sources."y18n-3.2.1" + sources."yargs-parser-4.2.1" ]; }) ]; }) - (sources."sockjs-0.3.17" // { + (sources."sockjs-0.3.18" // { dependencies = [ (sources."faye-websocket-0.10.0" // { dependencies = [ @@ -4273,11 +4404,11 @@ let }) ]; }) - sources."uuid-2.0.2" + sources."uuid-2.0.3" ]; }) sources."step-0.0.6" - sources."ua-parser-js-0.7.10" + sources."ua-parser-js-0.7.12" sources."underscore-1.8.3" (sources."underscore-contrib-0.3.0" // { dependencies = [ @@ -4297,17 +4428,17 @@ let }) (sources."databank-mongodb-0.19.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.6.0" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) - (sources."mongodb-2.2.10" // { + (sources."mongodb-2.2.21" // { dependencies = [ sources."es6-promise-3.2.1" - (sources."mongodb-core-2.0.12" // { + (sources."mongodb-core-2.1.6" // { dependencies = [ - sources."bson-0.5.5" + sources."bson-1.0.4" (sources."require_optional-1.0.0" // { dependencies = [ sources."semver-5.3.0" diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 4eed952f8042..4efb1ca9de6e 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.1.4"; + version = "2.1.6"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://framabag.org/wallabag-release-${version}.tar.gz"; - sha256 = "0s4p9jls7jqq9jbcac21ibz9k5yxx0ifv2yhxlkia5kw9md20r7b"; + sha256 = "0znywkrjlmxhacfkdyba2cjhgmrh509mayrfsrnc0rx3haxam7fx"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index e19d06136358..b1e0bb52a513 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "datamash-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "mirror://gnu/datamash/${name}.tar.gz"; - sha256 = "1c2bj0jrm4fxkf0ykxkzgyk1l9s0idqm8rbzmk3n9pgldb4arrd9"; + sha256 = "06w0pc828qsabmrlh7bc2zwc823xzxy89paaf37f6bipsyrij222"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix new file mode 100644 index 000000000000..0e992f49c7a2 --- /dev/null +++ b/pkgs/tools/misc/neofetch/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "neofetch-${version}"; + version = "2.0.2"; + src = fetchFromGitHub { + owner = "dylanaraps"; + repo = "neofetch"; + rev = version; + sha256 = "15fpm6nflf6w0c758xizfifvvxrkmcc2hpzrnfw6fcngfqcvajmd"; + }; + + patchPhase = '' + substituteInPlace ./neofetch \ + --replace "/usr/share" "$out/share" + ''; + + dontBuild = true; + + + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + ]; + + meta = with stdenv.lib; { + description = "A fast, highly customizable system info script"; + homepage = https://github.com/dylanaraps/neofetch; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ alibabzo ]; + }; +} diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 672ec52c076b..31375eeaf85d 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ]; preConfigure = '' + patchShebangs ./build-aux/ ./bootstrap ''; diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index fea6de2ea7c5..d413475389fc 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! {pkgs ? import { inherit system; @@ -6,11 +6,11 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index 79a52d54ca26..74707ae015fd 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! -{nodeEnv, fetchurl, fetchgit}: +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { @@ -91,6 +91,7 @@ in }) sources."underscore-1.8.3" ]; + buildInputs = globalBuildInputs; meta = { description = "nix-env frontend written with Polymer"; homepage = https://github.com/matejc/nixui; diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index e2e3955628de..ea6b7411c4e7 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -1,16 +1,25 @@ -{stdenv, fetchurl, gnupg, perl, automake111x, autoconf}: +{ stdenv, fetchurl, makeWrapper, autoconf, automake +, gnupg, perl, python, libmd, qprint, coreutils, gnused, glibc, gnupg1compat +, perlPackages }: stdenv.mkDerivation rec { - version = "2.2"; + version = "2.5"; basename = "signing-party"; name = "${basename}-${version}"; + src = fetchurl { url = "mirror://debian/pool/main/s/${basename}/${basename}_${version}.orig.tar.gz"; - sha256 = "13qncdyadw1cnslc2xss9s2rpkalm7rz572b23p7mqcdqp30cpdd"; + sha256 = "1y2bxk01qiwaqaily0s6zi10ssv7l35vksib6fxzyl76pp693nv2"; }; sourceRoot = "."; + patches = [ ./gpgwrap_makefile.patch ]; + + postPatch = '' + substituteInPlace gpg-mailkeys/gpg-mailkeys --replace "/usr/sbin/sendmail" "sendmail" + ''; + preBuild = '' substituteInPlace sig2dot/Makefile --replace "\$(DESTDIR)/usr" "$out" substituteInPlace gpgsigs/Makefile --replace "\$(DESTDIR)/usr" "$out" @@ -19,19 +28,46 @@ stdenv.mkDerivation rec { substituteInPlace keyanalyze/Makefile --replace "\$(DESTDIR)/usr" "$out" ''; - # - perl is required for its pod2man (used in caff) - buildInputs = [ automake111x autoconf perl gnupg ]; - - patches = [ ./gpgwrap_makefile.patch ]; + nativeBuildInputs = [ autoconf automake makeWrapper ]; + buildInputs = [ gnupg perl python libmd ] ++ + (with perlPackages; [ GnuPGInterface TextTemplate MIMEtools NetIDNEncode MailTools ]); installFlags = [ "DESTDIR=\${out}" ]; - doCheck = false; # no check rule + postInstall = '' + install -m 755 \ + caff/caff caff/pgp-clean caff/pgp-fixkey \ + gpglist/gpglist \ + gpgparticipants/gpgparticipants \ + gpgparticipants/gpgparticipants-prefill \ + gpgsigs/gpgsigs \ + gpg-key2ps/gpg-key2ps \ + gpg-mailkeys/gpg-mailkeys \ + keyart/keyart \ + $out/bin + + install -m 644 \ + caff/caff.1 caff/pgp-clean.1 caff/pgp-fixkey.1 \ + gpglist/gpglist.1 \ + gpgparticipants/gpgparticipants-prefill.1 \ + gpgparticipants/gpgparticipants.1 \ + gpgsigs/gpgsigs.1 \ + gpg-key2ps/gpg-key2ps.1 \ + gpg-mailkeys/gpg-mailkeys.1 \ + $out/share/man/man1 + + wrapProgram $out/bin/caff --prefix PERL5LIB ":" "$PERL5LIB" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat ]}" + wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" "${stdenv.lib.makeBinPath [ qprint coreutils gnused glibc gnupg1compat ]}" + ''; + + doCheck = false; # no tests meta = { description = "A collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc"; homepage = http://pgp-tools.alioth.debian.org; platforms = gnupg.meta.platforms; license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ fpletz ]; }; } diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 83936ca65a5e..677981b97ca5 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }: +{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }: stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.4.1"; - src = fetchurl { - url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz"; - sha256 = "1vvvqni68l3hmnxi8jp0n2rwzxyh1vmgv6xa2954h94dfax6dmcj"; + version = "3.5.1"; + src = fetchFromGitHub { + sha256 = "1rhfww0knjh6bj3b0ykxgfgw6rg2bzibkdrisq3nhl3djfq7r1a8"; + rev = version; + repo = "facter"; + owner = "puppetlabs"; }; cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 885c37713fca..584854914081 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1890,6 +1890,8 @@ in gitstats = callPackage ../applications/version-management/gitstats { }; + gogs = callPackage ../applications/version-management/gogs { }; + git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; glusterfs = callPackage ../tools/filesystems/glusterfs { }; @@ -2933,6 +2935,8 @@ in ndjbdns = callPackage ../tools/networking/ndjbdns { }; + neofetch = callPackage ../tools/misc/neofetch { }; + nerdfonts = callPackage ../data/fonts/nerdfonts { }; nestopia = callPackage ../misc/emulators/nestopia { }; @@ -3659,7 +3663,9 @@ in rpm = callPackage ../tools/package-management/rpm { }; - rpm-ostree = callPackage ../tools/misc/rpm-ostree { }; + rpm-ostree = callPackage ../tools/misc/rpm-ostree { + gperf = gperf_3_0; + }; rpmextract = callPackage ../tools/archivers/rpmextract { }; @@ -5100,6 +5106,14 @@ in intercal = callPackage ../development/compilers/intercal { }; + irony-server = callPackage ../development/tools/irony-server/default.nix { + # The repository of irony to use -- must match the version of the employed emacs + # package. Wishing we could merge it into one irony package, to avoid this issue, + # but its emacs-side expression is autogenerated, and we can't hook into it (other + # than peek into its version). + inherit (emacsPackagesNg.melpaStablePackages) irony; + }; + hugs = callPackage ../development/interpreters/hugs { }; openjdk7 = @@ -6468,6 +6482,8 @@ in mk = callPackage ../development/tools/build-managers/mk { }; + msgpack-tools = callPackage ../development/tools/msgpack-tools { }; + msitools = callPackage ../development/tools/misc/msitools { }; multi-ghc-travis = callPackage ../development/tools/haskell/multi-ghc-travis { }; @@ -11204,7 +11220,6 @@ in linux_3_18 = callPackage ../os-specific/linux/kernel/linux-3.18.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.packet_fix_race_condition_CVE_2016_8655 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11216,7 +11231,6 @@ in linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.packet_fix_race_condition_CVE_2016_8655 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -12822,6 +12836,7 @@ in }; docker = callPackage ../applications/virtualization/docker { }; + docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; @@ -14467,6 +14482,8 @@ in osmo = callPackage ../applications/office/osmo { }; + palemoon = callPackage ../applications/networking/browsers/palemoon { }; + pamix = callPackage ../applications/audio/pamix { }; pamixer = callPackage ../applications/audio/pamixer { }; @@ -15188,9 +15205,7 @@ in vte = gnome2.vte.override { pythonSupport = true; }; }; - termite = callPackage ../applications/misc/termite { - vte = gnome3_20.vte-select-text; - }; + termite = callPackage ../applications/misc/termite { vte = null; }; tesseract = callPackage ../applications/graphics/tesseract { }; @@ -16504,8 +16519,6 @@ in libcanberra = self.libcanberra_gtk2; }); - gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { }); - gnome3_22 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.22 { }); gnome3 = gnome3_22; @@ -16967,7 +16980,9 @@ in abella = callPackage ../applications/science/logic/abella {}; - alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; + alt-ergo = callPackage ../applications/science/logic/alt-ergo { + ocamlPackages = ocamlPackages_4_02; + }; aspino = callPackage ../applications/science/logic/aspino {}; @@ -17939,8 +17954,6 @@ in yadm = callPackage ../applications/version-management/yadm { }; - yafc = callPackage ../applications/networking/yafc { }; - yamdi = callPackage ../tools/video/yamdi { }; yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; @@ -17990,7 +18003,7 @@ in discord = callPackage ../applications/networking/instant-messengers/discord { }; - golden-cheetah = qt55.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5be040a5393b..199bc04f9bf4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -418,6 +418,8 @@ let minimal = false; }; + ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { }; + ocurl = callPackage ../development/ocaml-modules/ocurl { }; pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3e3bc8f3b454..0b4f53ac8613 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2959,6 +2959,21 @@ let self = _self // overrides; _self = with self; { }; }; + DataPerl = buildPerlPackage rec { + name = "Data-Perl-0.002009"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MATTP/${name}.tar.gz"; + sha256 = "b62b2225870c2c3b16fb78c429f8729ddb8ed0e342f4209ec3c261b764c36f8b"; + }; + buildInputs = [ TestDeep TestFatal TestOutput ]; + propagatedBuildInputs = [ ClassMethodModifiers ListMoreUtils ModuleRuntime RoleTiny strictures ]; + meta = { + homepage = https://github.com/mattp-/Data-Perl; + description = "Base classes wrapping fundamental Perl data types"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DataSection = buildPerlPackage rec { name = "Data-Section-0.200006"; src = fetchurl { @@ -5687,6 +5702,21 @@ let self = _self // overrides; _self = with self; { }; }; + GnuPGInterface = buildPerlPackage rec { + name = "GnuPG-Interface-0.52"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AL/ALEXMV/${name}.tar.gz"; + sha256 = "247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35"; + }; + buildInputs = with pkgs; [ which gnupg1compat ]; + propagatedBuildInputs = [ Moo MooXHandlesVia MooXlate ]; + doCheck = false; + meta = { + description = "Supply object methods for interacting with GnuPG"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GoferTransporthttp = buildPerlPackage { name = "GoferTransport-http-1.017"; src = fetchurl { @@ -8545,6 +8575,20 @@ let self = _self // overrides; _self = with self; { }; }; + MooXHandlesVia = buildPerlPackage rec { + name = "MooX-HandlesVia-0.001008"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MATTP/${name}.tar.gz"; + sha256 = "b0946f23b3537763b8a96b8a83afcdaa64fce4b45235e98064845729acccfe8c"; + }; + buildInputs = [ MooXTypesMooseLike TestException TestFatal ]; + propagatedBuildInputs = [ ClassMethodModifiers DataPerl ModuleRuntime Moo RoleTiny ]; + meta = { + description = "NativeTrait-like behavior for Moo"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooXTypesMooseLike = buildPerlPackage rec { name = "MooX-Types-MooseLike-0.27"; src = fetchurl { @@ -9571,6 +9615,18 @@ let self = _self // overrides; _self = with self; { }; }; + NetIDNEncode = buildPerlPackage { + name = "Net-IDN-Encode-2.400"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz; + sha256 = "0a9knav5f9kjldrkxx1k47ivd3p23zkmi8aqgyhnxidhgasz1dlq"; + }; + buildInputs = [ TestNoWarnings ]; + meta = { + description = "Internationalizing Domain Names in Applications (IDNA)"; + }; + }; + NetIP = buildPerlPackage { name = "Net-IP-1.26"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8b0aa4f94688..039779361210 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19307,18 +19307,35 @@ in { ''; preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") '' - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2 + export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp + export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2 ''; - checkPhase = if versionAtLeast protobuf.version "2.6.0" then '' + preBuild = optionalString (versionAtLeast protobuf.version "2.6.0") '' + ${python}/bin/${python.executable} setup.py build_ext --cpp_implementation + ''; + + checkPhase = '' + runHook preCheck + '' + (if versionAtLeast protobuf.version "2.6.0" then '' ${python.executable} setup.py google_test --cpp_implementation + echo "sanity checking the C extension . . ." + echo "import google.protobuf.descriptor" | ${python.executable} '' else '' ${python.executable} setup.py test + '') + '' + runHook postCheck ''; installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--install-option='--cpp_implementation'"; + # the _message.so isn't installed, so we'll do that manually. + # if someone can figure out a less hacky way to get the _message.so to + # install, please do replace this. + postInstall = optionalString (versionAtLeast protobuf.version "2.6.0") '' + cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext + ''; + doCheck = true; meta = { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2052957edd61..c301ceb1530d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -67,13 +67,13 @@ let jobs.vim.x86_64-darwin ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; }; - + } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) { stdenvBootstrapTools.i686-linux = { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; }; - + }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" supportedSystems) { stdenvBootstrapTools.x86_64-linux = { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; }; - + }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" supportedSystems) { stdenvBootstrapTools.x86_64-darwin = let bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; @@ -83,8 +83,7 @@ let # Test a full stdenv bootstrap from the bootstrap tools definition inherit (bootstrap.test-pkgs) stdenv; }; - - } // (mapTestOn ((packagePlatforms pkgs) // rec { + }) // (mapTestOn ((packagePlatforms pkgs) // rec { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages;