diff --git a/doc/language-support.xml b/doc/language-support.xml index e1049534c6b..4446e9ee382 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -502,7 +502,7 @@ exist in community to help save time. No tool is preferred at the moment.
Development - To develop Python packages bulidPythonPackage has + To develop Python packages buildPythonPackage has additional logic inside shellPhase to run ${python.interpreter} setup.py develop for the package. diff --git a/lib/licenses.nix b/lib/licenses.nix index 1596c319bd0..e3b551953fd 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -255,6 +255,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "LaTeX Project Public License v1.2"; }; + lppl13c = spdx { + spdxId = "LPPL-1.3c"; + fullName = "LaTeX Project Public License v1.3c"; + }; + lpl-102 = spdx { spdxId = "LPL-1.02"; fullName = "Lucent Public License v1.02"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index c948de91cd7..922ec43cdce 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -26,6 +26,7 @@ aycanirican = "Aycan iRiCAN "; balajisivaraman = "Balaji Sivaraman"; bbenoist = "Baptist BENOIST "; + bdimcheff = "Brandon Dimcheff "; bennofs = "Benno Fünfstück "; berdario = "Dario Bertini "; bergey = "Daniel Bergey "; @@ -50,6 +51,7 @@ davidrusu = "David Rusu "; dbohdan = "Danyil Bohdan "; DerGuteMoritz = "Moritz Heidkamp "; + devhell = "devhell <\"^\"@regexmail.net>"; dmalikov = "Dmitry Malikov "; doublec = "Chris Double "; ederoyd46 = "Matthew Brown "; @@ -90,6 +92,7 @@ jzellner = "Jeff Zellner "; kkallio = "Karn Kallio "; koral = "Koral "; + kovirobi = "Kovacsics Robert "; kragniz = "Louis Taylor "; ktosiek = "Tomasz Kontusz "; lethalman = "Luca Bruno "; @@ -109,6 +112,7 @@ mornfall = "Petr Ročkai "; MP2E = "Cray Elliott "; msackman = "Matthew Sackman "; + mtreskin = "Max Treskin "; muflax = "Stefan Dorn "; nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; @@ -177,6 +181,7 @@ wjlroe = "William Roe "; wkennington = "William A. Kennington III "; wmertens = "Wout Mertens "; + wscott = "Wayne Scott "; wyvie = "Elijah Rum "; yarr = "Dmitry V. "; z77z = "Marco Maggesi "; diff --git a/lib/options.nix b/lib/options.nix index ecbd81cd997..939f9948cee 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -31,6 +31,23 @@ rec { type = lib.types.bool; }; + # This option accept anything, but it does not produce any result. This + # is useful for sharing a module across different module sets without + # having to implement similar features as long as the value of the options + # are not expected. + mkSinkUndeclaredOptions = attrs: mkOption ({ + internal = true; + visible = false; + default = false; + description = "Sink for option definitions."; + type = mkOptionType { + name = "sink"; + check = x: true; + merge = loc: defs: false; + }; + apply = x: throw "Option value is not readable because the option is not declared."; + } // attrs); + mergeDefaultOption = loc: defs: let list = getValues defs; in if length list == 1 then head list diff --git a/maintainers/scripts/update-channel-branches.sh b/maintainers/scripts/update-channel-branches.sh new file mode 100755 index 00000000000..5dbbec9393c --- /dev/null +++ b/maintainers/scripts/update-channel-branches.sh @@ -0,0 +1,111 @@ +#!/bin/sh + +: ${NIXOS_CHANNELS:=https://nixos.org/channels/} +: ${CHANNELS_NAMESPACE:=refs/heads/channels/} + +# List all channels which are currently in the repository which we would +# have to remove if they are not found again. +deadChannels=$(git for-each-ref --format="%(refname)" $CHANNELS_NAMESPACE) + +function updateRef() { + local channelName=$1 + local newRev=$2 + + # if the inputs are not valid, then we do not update any branch. + test -z "$newRev" -o -z "$channelName" && return; + + # Update the local refs/heads/channels/* branches to be in-sync with the + # channel references. + local branch=$CHANNELS_NAMESPACE$channelName + oldRev=$(git rev-parse --short $branch 2>/dev/null || true) + if test "$oldRev" != "$newRev"; then + if git update-ref $branch $newRev 2>/dev/null; then + if test -z "$oldRev"; then + echo " * [new branch] $newRev -> ${branch#refs/heads/}" + else + echo " $oldRev..$newRev -> ${branch#refs/heads/}" + fi + else + if test -z "$oldRev"; then + echo " * [missing rev] $newRev -> ${branch#refs/heads/}" + else + echo " [missing rev] $oldRev..$newRev -> ${branch#refs/heads/}" + fi + fi + fi + + # Filter out the current channel from the list of dead channels. + deadChannels=$(grep -v $CHANNELS_NAMESPACE$channelName </dev/null); then + # If the system is entirely build from a custom nixpkgs version, + # then the version is not annotated in git version. This sed + # expression is basically matching that the expressions end with + # ". (Name)" to extract the sha1. + sha1=$(echo $currentSystem | sed -n 's,^.*\.\([a-f0-9]*\) *(.*)$,\1,; T skip; p; :skip;') + + updateRef current-system "$sha1" +fi + +echo "Fetching channels from ~/.nix-defexpr:" +for revFile in : $(find -L ~/.nix-defexpr/ -maxdepth 4 -name svn-revision); do + test "$revFile" = : && continue; + + # Deconstruct a path such as, into: + # + # /home/luke/.nix-defexpr/channels_root/nixos/nixpkgs/svn-revision + # channelName = root/nixos + # + # /home/luke/.nix-defexpr/channels/nixpkgs/svn-revision + # channelName = nixpkgs + # + user=${revFile#*.nix-defexpr/channels} + repo=${user#*/} + repo=${repo%%/*} + user=${user%%/*} + user=${user#_} + test -z "$user" && user=$USER + channelName="$user${user:+/}$repo" + + sha1=$(cat $revFile | sed -n 's,^.*\.\([a-f0-9]*\)$,\1,; T skip; p; :skip;') + + updateRef "$channelName" "$sha1" +done + +# Suggest to remove channel branches which are no longer found by this +# script. This is to handle the cases where a local/remote channel +# disappear. We should not attempt to remove manually any branches, as they +# might be user branches. +if test -n "$deadChannels"; then + + echo " +Some old channel branches are still in your repository, if you +want to remove them, run the following command(s): +" + + while read branch; do + echo " git update-ref -d $branch" + done < -$ nixos-version -14.04.273.ea1952b (Baboon) - -$ git checkout -b local ea1952b +$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh +Fetching channels from https://nixos.org/channels: + * [new branch] cbe467e -> channels/remotes/nixos-unstable +Fetching channels from nixos-version: + * [new branch] 9ff4738 -> channels/current-system +Fetching channels from ~/.nix-defexpr: + * [new branch] 0d4acad -> channels/root/nixos +$ git checkout -b local channels/current-system Or, to base your local branch on the latest version available in the NixOS channel: -$ curl -sI https://nixos.org/channels/nixos-unstable/ | grep Location -Location: https://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/ - -$ git checkout -b local acaf4a6 +$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh +$ git checkout -b local channels/remotes/nixos-unstable You can then use git rebase to sync your local diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml index 86b11966c76..324a3e6bdc2 100644 --- a/nixos/doc/manual/release-notes/rl-1412.xml +++ b/nixos/doc/manual/release-notes/rl-1412.xml @@ -6,46 +6,159 @@ Release 14.12 (“Caterpillar”, 2014/12/??) +In addition to numerous new and upgraded packages, this release has the following highlights: + + + +Systemd has been updated to version 217, which has numerous +improvements +. + + +Nix has been updated to 1.8. + +NixOS is now based on Glibc 2.20. + +KDE has been updated to 4.14. + +The default Linux kernel has been updated to 3.14. + + set to true now respect any changes +made after initial creation of a user or a group. + + + + +Following new services were added since the last release: + + +parallels-guest +docker +lxc +openvswitch +fluxbox +bspwm +gdm +fcgiwrap +peerflix +fail2ban +chronos +znc +unifi +teamspeak3 +strongswan +seeks +radicale +prosody +polipo +openntpd +nsd +mailpile +i2pd +dnscrypt-proxy +consul +atftpd +scollector +collectd +bosun +riemann +zookeeper +uhub +siproxd +redmine +phd +mesos +gitlab +gitolite +etcd +docker-registry +cpuminer-cryptonight +thermald +mlmmj +tcsd +gnome3.seahorse +gnome3.gvfs +gnome3.gnome-online-miners +gnome3.gnome-documents +geoclue2 +opentsdb +neo4j +monetdb +influxdb +hbase +torque/mrom +torque/server +kubernetes +fleet +crashplan +mopidy +liquidsoap + + + When upgrading from a previous release, please be aware of the following incompatible changes: - The default version of Apache httpd is now 2.4. If - you use the option to pass literal - Apache configuration text, you may need to update it — see Apache’s - documentation for details. If you wish to continue to use - httpd 2.2, add the following line to your NixOS configuration: +The default version of Apache httpd is now 2.4. If +you use the option to pass literal +Apache configuration text, you may need to update it — see Apache’s +documentation for details. If you wish to continue to use +httpd 2.2, add the following line to your NixOS configuration: - -services.httpd.package = pkgs.apacheHttpd_2_2; - +rogramlisting> +rvices.httpd.package = pkgs.apacheHttpd_2_2; +programlisting> - + - PHP 5.3 has been removed because it is no longer - supported by the PHP project. A migration guide is - available. +PHP 5.3 has been removed because it is no longer +supported by the PHP project. A migration guide is +available. - The host side of a container virtual Ethernet pair - is now called ve-container-name - rather than c-container-name. +The host side of a container virtual Ethernet pair +is now called ve-container-name +rather than c-container-name. - GNOME 3.10 support has been dropped. The default GNOME version is now 3.12. +GNOME 3.10 support has been dropped. The default GNOME version is now 3.12. - The system-wide default timezone for NixOS installations - changed from CET to UTC. To choose - a different timezone for your system, configure - time.timeZone in - configuration.nix. A fairly complete list of possible - values for that setting is available at . +VirtualBox has been upgraded to 4.3.20 release. Users may be required to run +rm -rf /tmp.vbox*. imports = [ <nixpkgs/nixos/modules/programs/virtualbox.nix> ] +is no longer necessary, use services.virtualboxHost.enable = true instead. + +Also, hardening mode is now enabled by default, which means that unless you want to use +USB support, you no longer need to be a member of the vboxusers group. + - GNU screen has been updated to 4.2.1, which breaks - the ability to connect to sessions created by older versions of - screen. +Chromium has been updated to 39.0.2171.65. is now enabled by default. +chromium*Wrapper packages no longer exist, because upstream removed NSAPI support. +chromium-stable has been renamed to chromium. + + +Python packaging documentation is now part of nixpkgs manual. To override +the python packages available to a custom python you now use pkgs.pythonFull.buildEnv.override +instead of pkgs.pythonFull.override. + + +boot.resumeDevice = "8:6" is no longer supported. Most users will +want to leave it undefined, which takes the swap partitions automatically. There is an evaluation +assertion to ensure that the string starts with a slash. + + +The system-wide default timezone for NixOS installations +changed from CET to UTC. To choose +a different timezone for your system, configure +time.timeZone in +configuration.nix. A fairly complete list of possible +values for that setting is available at . + +GNU screen has been updated to 4.2.1, which breaks +the ability to connect to sessions created by older versions of +screen. diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 1777c200dd1..7693bd5bb45 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -16,7 +16,6 @@ let [ p.mesa_drivers p.mesa_noglu # mainly for libGL (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc) - p.udev ]; }; diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index a7333fbd541..9dfc322b9f7 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -30,8 +30,7 @@ while [ "$#" -gt 0 ]; do case "$i" in -I) given_path="$1"; shift 1 - absolute_path=$(readlink -m $given_path) - extraBuildFlags+=("$i" "/mnt$absolute_path") + extraBuildFlags+=("$i" "$given_path") ;; --root) mountPoint="$1"; shift 1 @@ -250,7 +249,7 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate # Ask the user to set a root password. -if [ -t 0 ] ; then +if [ "$(chroot $mountPoint nix-instantiate --eval '' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then echo "setting root password..." chroot $mountPoint /var/setuid-wrappers/passwd fi diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh index 96d09c3a605..17c17d05e28 100644 --- a/nixos/modules/installer/tools/nixos-option.sh +++ b/nixos/modules/installer/tools/nixos-option.sh @@ -13,6 +13,7 @@ usage () { xml=false verbose=false +nixPath="" option="" @@ -26,6 +27,7 @@ for arg; do while test "$sarg" != "-"; do case $sarg in --*) longarg=$arg; sarg="--";; + -I) argfun="include_nixpath";; -*) usage;; esac # remove the first letter option @@ -53,6 +55,9 @@ for arg; do var=$(echo $argfun | sed 's,^set_,,') eval $var=$arg ;; + include_nixpath) + nixPath="-I $arg $nixPath" + ;; esac argfun="" fi @@ -69,18 +74,114 @@ fi ############################# evalNix(){ - nix-instantiate - --eval-only "$@" + result=$(nix-instantiate ${nixPath:+$nixPath} - --eval-only "$@" 2>&1) + if test $? -eq 0; then + cat < {}).$prefix${option:+.$option}${suffix:+.$suffix}" | evalNix ${strict:+--strict} + + # If strict is set, then set it to "true". + test -n "$strict" && strict=true + + evalNix ${strict:+--strict} <" + else if strict then + if isAttrs x then mapAttrs (n: cleanOutput) x + else if isList x then map cleanOutput x + else x + else x; +in + cleanOutput value +EOF } evalOpt(){ - evalAttr "options" "" "$@" + evalAttr "option" "" "$@" } evalCfg(){ @@ -90,8 +191,11 @@ evalCfg(){ findSources(){ local suffix=$1 - echo "(import {}).options${option:+.$option}.$suffix" | - evalNix --strict + evalNix --strict < {}; - nixpkgs = import {}; sources = builtins.map (f: f.source); - opt = reach nixos.options; - cfg = reach nixos.config; + opt = option; + cfg = config; in with nixpkgs.lib; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 3bb7fdb9b2d..bf8365e3464 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -173,6 +173,7 @@ peerflix = 163; chronos = 164; gitlab = 165; + tox-bootstrapd = 166; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index f4271cea853..5afdcf214f2 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -53,7 +53,7 @@ with lib; mkDefault (if pathExists fn then readFile fn else "master"); # Note: code names must only increase in alphabetical order. - system.nixosCodeName = "Caterpillar"; + system.nixosCodeName = "Dingo"; # Generate /etc/os-release. See # http://0pointer.de/public/systemd-man/os-release.html for the diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e0d614e61bf..2c52ebb37bc 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -286,6 +286,7 @@ ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix ./services/networking/tftpd.nix + ./services/networking/tox-bootstrapd.nix ./services/networking/unbound.nix ./services/networking/unifi.nix ./services/networking/vsftpd.nix @@ -307,6 +308,7 @@ ./services/security/fprot.nix ./services/security/frandom.nix ./services/security/haveged.nix + ./services/security/torify.nix ./services/security/tor.nix ./services/security/torsocks.nix ./services/system/cloud-init.nix diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 03899425da5..c5c0f9d0121 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -105,7 +105,7 @@ in }; enableCompletion = mkOption { - default = true; + default = false; description = '' Enable Bash completion for all interactive bash shells. ''; diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index c9bfe2fe0f7..796740ea636 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -61,7 +61,8 @@ in agentTimeout = mkOption { type = types.nullOr types.string; - default = "1h"; + default = null; + example = "1h"; description = '' How long to keep the private keys in memory. Use null to keep them forever. ''; diff --git a/nixos/modules/programs/virtualbox-host.nix b/nixos/modules/programs/virtualbox-host.nix index c6abc9ddf89..fc113a08a35 100644 --- a/nixos/modules/programs/virtualbox-host.nix +++ b/nixos/modules/programs/virtualbox-host.nix @@ -35,7 +35,7 @@ in enableHardening = mkOption { type = types.bool; - default = false; + default = true; description = '' Enable hardened VirtualBox, which ensures that only the binaries in the system path get access to the devices exposed by the kernel modules @@ -54,23 +54,21 @@ in boot.extraModulePackages = [ virtualbox ]; environment.systemPackages = [ virtualbox ]; - warnings = mkIf (!cfg.enableHardening) (singleton ( - "Hardening is currently disabled for VirtualBox, because of some " + - "issues in conjunction with host-only-interfaces. If you don't use " + - "hostonlyifs, it's strongly recommended to set " + - "`services.virtualboxHost.enableHardening = true'!" - )); - security.setuidOwners = let - mkVboxStub = program: { + mkSuid = program: { inherit program; + source = "${virtualbox}/libexec/virtualbox/${program}"; owner = "root"; group = "vboxusers"; setuid = true; }; - in mkIf cfg.enableHardening (map mkVboxStub [ + in mkIf cfg.enableHardening (map mkSuid [ "VBoxHeadless" + "VBoxNetAdpCtl" + "VBoxNetDHCP" + "VBoxNetNAT" "VBoxSDL" + "VBoxVolInfo" "VirtualBox" ]); diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 4c6a1c26426..d42a8c7f7d2 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -64,7 +64,7 @@ in security.sudo.configFile = '' # Don't edit this file. Set the NixOS options ‘security.sudo.configFile’ - # and security.sudo.extraConfig instead. + # or ‘security.sudo.extraConfig’ instead. # Environment variables to keep for root and %wheel. Defaults:root,%wheel env_keep+=TERMINFO_DIRS @@ -90,11 +90,10 @@ in environment.etc = singleton { source = pkgs.runCommand "sudoers" - {src = pkgs.writeText "sudoers-in" cfg.configFile; } + { src = pkgs.writeText "sudoers-in" cfg.configFile; } # Make sure that the sudoers file is syntactically valid. # (currently disabled - NIXOS-66) - "${pkgs.sudo}/sbin/visudo -f $src -c && - cp $src $out"; + "${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out"; target = "sudoers"; mode = "0440"; }; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index e6b525c4b1b..eab7993387d 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -15,7 +15,6 @@ let state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" log_file "syslog" - user "mpd" ${if cfg.network.host != "any" then "bind_to_address ${cfg.network.host}" else ""} ${if cfg.network.port != 6600 then @@ -99,6 +98,9 @@ in { path = [ pkgs.mpd ]; preStart = "mkdir -p ${cfg.dataDir} && chown -R mpd:mpd ${cfg.dataDir}"; script = "exec mpd --no-daemon ${mpdConf}"; + serviceConfig = { + User = "mpd"; + }; }; users.extraUsers.mpd = { diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index d89531f7e90..26fb3fdb00c 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -5,6 +5,13 @@ with lib; let cfg = config.services.mesos.slave; + mkAttributes = + attrs: concatStringsSep ";" (mapAttrsToList + (k: v: "${k}:${v}") + (filterAttrs (k: v: v != null) attrs)); + attribsArg = optionalString (cfg.attributes != {}) + "--attributes=${mkAttributes cfg.attributes}"; + in { options.services.mesos = { @@ -31,9 +38,9 @@ in { }; withHadoop = mkOption { - description = "Add the HADOOP_HOME to the slave."; - default = false; - type = types.bool; + description = "Add the HADOOP_HOME to the slave."; + default = false; + type = types.bool; }; workDir = mkOption { @@ -44,10 +51,10 @@ in { extraCmdLineOptions = mkOption { description = '' - Extra command line options for Mesos Slave. + Extra command line options for Mesos Slave. - See https://mesos.apache.org/documentation/latest/configuration/ - ''; + See https://mesos.apache.org/documentation/latest/configuration/ + ''; default = [ "" ]; type = types.listOf types.string; example = [ "--gc_delay=3days" ]; @@ -62,6 +69,19 @@ in { type = types.str; }; + attributes = mkOption { + description = '' + Machine attributes for the slave instance. + + Use caution when changing this; you may need to manually reset slave + metadata before the slave can re-register. + ''; + default = {}; + type = types.attrsOf types.str; + example = { rack = "aa"; + host = "aabc123"; + os = "nixos"; }; + }; }; }; @@ -74,20 +94,21 @@ in { after = [ "network-interfaces.target" ]; environment.MESOS_CONTAINERIZERS = "docker,mesos"; serviceConfig = { - ExecStart = '' - ${pkgs.mesos}/bin/mesos-slave \ - --port=${toString cfg.port} \ - --master=${cfg.master} \ - ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \ - --work_dir=${cfg.workDir} \ - --logging_level=${cfg.logLevel} \ - --docker=${pkgs.docker}/libexec/docker/docker \ - ${toString cfg.extraCmdLineOptions} - ''; - PermissionsStartOnly = true; + ExecStart = '' + ${pkgs.mesos}/bin/mesos-slave \ + --port=${toString cfg.port} \ + --master=${cfg.master} \ + ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \ + ${attribsArg} \ + --work_dir=${cfg.workDir} \ + --logging_level=${cfg.logLevel} \ + --docker=${pkgs.docker}/libexec/docker/docker \ + ${toString cfg.extraCmdLineOptions} + ''; + PermissionsStartOnly = true; }; preStart = '' - mkdir -m 0700 -p ${cfg.workDir} + mkdir -m 0700 -p ${cfg.workDir} ''; }; }; diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix index 271968f48b8..2290bc532f5 100644 --- a/nixos/modules/services/misc/synergy.nix +++ b/nixos/modules/services/misc/synergy.nix @@ -86,7 +86,7 @@ in systemd.services."synergy-client" = { after = [ "network.target" ]; description = "Synergy client"; - wantedBy = [ "multi-user.target" ]; + wantedBy = optional cfgC.autoStart [ "multi-user.target" ]; path = [ pkgs.synergy ]; serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}"} ${cfgC.serverAddress}''; }; @@ -95,7 +95,7 @@ in systemd.services."synergy-server" = { after = [ "network.target" ]; description = "Synergy server"; - wantedBy = [ "multi-user.target" ]; + wantedBy = optional cfgS.autoStart [ "multi-user.target" ]; path = [ pkgs.synergy ]; serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }''; }; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 19ad635d07e..8778b0364f9 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -118,7 +118,7 @@ in systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ kmod ]; # XXX Linux + path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux wants = [ "keys.target" ]; after = [ "network.target" "keys.target" ]; environment = { diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix new file mode 100644 index 00000000000..65aa87be44c --- /dev/null +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -0,0 +1,80 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + home = "/var/lib/tox-bootstrapd"; + PIDFile = "${home}/pid"; + + pkg = pkgs.libtoxcore; + cfg = config.services.toxBootstrapd; + cfgFile = builtins.toFile "tox-bootstrapd.conf" + '' + port = ${toString cfg.port} + keys_file_path = "${home}/keys" + pid_file_path = "${PIDFile}" + ${cfg.extraConfig} + ''; +in +{ + options = + { services.toxBootstrapd = + { enable = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to enable the Tox DHT boostrap daemon. + ''; + }; + + port = mkOption { + type = types.int; + default = 33445; + description = "Listening port (UDP)."; + }; + + keysFile = mkOption { + type = types.str; + default = "${home}/keys"; + description = "Node key file."; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = + '' + Configuration for boostrap daemon. + See + and . + ''; + }; + }; + + }; + + config = mkIf config.services.toxBootstrapd.enable { + + users.extraUsers = singleton + { name = "tox-bootstrapd"; + uid = config.ids.uids.tox-bootstrapd; + description = "Tox bootstrap daemon user"; + inherit home; + createHome = true; + }; + + systemd.services.tox-bootstrapd = { + description = "Tox DHT bootstrap daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + { ExecStart = "${pkg}/bin/tox-bootstrapd ${cfgFile}"; + Type = "forking"; + inherit PIDFile; + User = "tox-bootstrapd"; + }; + }; + + }; +} diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 2b4132cb568..47f863b96df 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -17,7 +17,8 @@ let '' # Client connection config + optionalString cfg.client.enable '' - SOCKSPort ${cfg.client.socksListenAddress} + SOCKSPort ${cfg.client.socksListenAddress} IsolateDestAddr + SOCKSPort ${cfg.client.socksListenAddressFaster} ${opt "SocksPolicy" cfg.client.socksPolicy} '' # Relay config @@ -93,10 +94,23 @@ in example = "192.168.0.1:9100"; description = '' Bind to this address to listen for connections from - Socks-speaking applications. + Socks-speaking applications. Provides strong circuit + isolation, separate circuit per IP address. ''; }; + socksListenAddressFaster = mkOption { + type = types.str; + default = "127.0.0.1:9063"; + example = "192.168.0.1:9101"; + description = '' + Bind to this address to listen for connections from + Socks-speaking applications. Same as socksListenAddress + but uses weaker circuit isolation to provide performance + suitable for a web browser. + ''; + }; + socksPolicy = mkOption { type = types.nullOr types.str; default = null; @@ -108,6 +122,22 @@ in SocksListenAddress. ''; }; + + privoxy.enable = mkOption { + default = true; + description = '' + Whether to enable and configure the system Privoxy to use Tor's + faster port, suitable for HTTP. + + To have anonymity, protocols need to be scrubbed of identifying + information, and this can be accomplished for HTTP by Privoxy. + + Privoxy can also be useful for KDE torification. A good setup would be: + setting SOCKS proxy to the default Tor port, providing maximum + circuit isolation where possible; and setting HTTP proxy to Privoxy + to route HTTP traffic over faster, but less isolated port. + ''; + }; }; relay = { @@ -322,5 +352,16 @@ in }; environment.systemPackages = [ pkgs.tor ]; + + services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) { + enable = true; + extraConfig = '' + forward-socks4a / ${cfg.client.socksListenAddressFaster} . + toggle 1 + enable-remote-toggle 0 + enable-edit-actions 0 + enable-remote-http-toggle 0 + ''; + }; }; } diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix new file mode 100644 index 00000000000..a81cdbbc172 --- /dev/null +++ b/nixos/modules/services/security/torify.nix @@ -0,0 +1,69 @@ +{ config, lib, pkgs, ... }: +with lib; +let + + cfg = config.services.tor; + + torify = pkgs.writeTextFile { + name = "tsocks"; + text = '' + #!${pkgs.stdenv.shell} + TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.tsocks.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" "$@" + ''; + executable = true; + destination = "/bin/tsocks"; + }; + +in + +{ + + ###### interface + + options = { + + services.tor.tsocks = { + + enable = mkOption { + default = cfg.enable && cfg.client.enable; + description = '' + Whether to build tsocks wrapper script to relay application traffic via TOR. + ''; + }; + + server = mkOption { + default = "localhost:9050"; + example = "192.168.0.20"; + description = '' + IP address of TOR client to use. + ''; + }; + + config = mkOption { + default = ""; + description = '' + Extra configuration. Contents will be added verbatim to TSocks + configuration file. + ''; + }; + + }; + + }; + + ###### implementation + + config = mkIf cfg.tsocks.enable { + + environment.systemPackages = [ torify ]; # expose it to the users + + services.tor.tsocks.config = '' + server = ${toString(head (splitString ":" cfg.tsocks.server))} + server_port = ${toString(tail (splitString ":" cfg.tsocks.server))} + + local = 127.0.0.0/255.128.0.0 + local = 127.128.0.0/255.192.0.0 + ''; + }; + +} diff --git a/nixos/modules/services/security/torsocks.nix b/nixos/modules/services/security/torsocks.nix index 5361d924ebe..1b5a05b21e7 100644 --- a/nixos/modules/services/security/torsocks.nix +++ b/nixos/modules/services/security/torsocks.nix @@ -6,9 +6,9 @@ let cfg = config.services.tor.torsocks; optionalNullStr = b: v: optionalString (b != null) v; - configFile = '' - TorAddress ${toString (head (splitString ":" cfg.server))} - TorPort ${toString (tail (splitString ":" cfg.server))} + configFile = server: '' + TorAddress ${toString (head (splitString ":" server))} + TorPort ${toString (tail (splitString ":" server))} OnionAddrRange ${cfg.onionAddrRange} @@ -19,13 +19,24 @@ let AllowInbound ${if cfg.allowInbound then "1" else "0"} ''; + + wrapTorsocks = name: server: pkgs.writeTextFile { + name = name; + text = '' + #!${pkgs.stdenv.shell} + TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (configFile server)} ${pkgs.torsocks}/bin/torsocks "$@" + ''; + executable = true; + destination = "/bin/${name}"; + }; + in { options = { services.tor.torsocks = { enable = mkOption { type = types.bool; - default = false; + default = config.services.tor.enable && config.services.tor.client.enable; description = '' Whether to build /etc/tor/torsocks.conf containing the specified global torsocks configuration. @@ -42,6 +53,16 @@ in ''; }; + fasterServer = mkOption { + type = types.str; + default = "127.0.0.1:9063"; + example = "192.168.0.20:1234"; + description = '' + IP/Port of the Tor SOCKS server for torsocks-faster wrapper suitable for HTTP. + Currently, hostnames are NOT supported by torsocks. + ''; + }; + onionAddrRange = mkOption { type = types.str; default = "127.42.42.0/24"; @@ -89,10 +110,10 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.torsocks ]; + environment.systemPackages = [ pkgs.torsocks (wrapTorsocks "torsocks-faster" cfg.fasterServer) ]; environment.etc = - [ { source = pkgs.writeText "torsocks.conf" configFile; + [ { source = pkgs.writeText "torsocks.conf" (configFile cfg.server); target = "tor/torsocks.conf"; } ]; diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index f7579fce7b5..16c99862e9e 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -152,7 +152,9 @@ in xorg.xauth # used by kdesu pkgs.shared_desktop_ontologies # used by nepomuk pkgs.strigi # used by nepomuk + pkgs.kde4.akonadi pkgs.mysql # used by akonadi + pkgs.kde4.kdepim_runtime ] ++ lib.optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled ++ lib.optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 8bc8175f88f..a1b5daa3336 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -189,7 +189,7 @@ in xserverArgs = mkOption { type = types.listOf types.str; default = []; - example = [ "-ac" "-logverbose" "-nolisten tcp" ]; + example = [ "-ac" "-logverbose" "-verbose" "-nolisten tcp" ]; description = "List of arguments for the X server."; apply = toString; }; diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index 9b2f042a87a..455b3568499 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.xserver.windowManager.awesome; + awesome = cfg.package; in @@ -14,9 +15,24 @@ in options = { - services.xserver.windowManager.awesome.enable = mkOption { - default = false; - description = "Enable the Awesome window manager."; + services.xserver.windowManager.awesome = { + + enable = mkEnableOption "Awesome window manager"; + + luaModules = mkOption { + default = []; + type = types.listOf types.package; + description = "List of lua packages available for being used in the Awesome configuration."; + example = literalExample "[ luaPackages.oocairo ]"; + }; + + package = mkOption { + default = null; + type = types.nullOr types.package; + description = "Package to use for running the Awesome WM."; + apply = pkg: if pkg == null then pkgs.awesome else pkg; + }; + }; }; @@ -30,12 +46,17 @@ in { name = "awesome"; start = '' - ${pkgs.awesome}/bin/awesome & + ${concatMapStrings (pkg: '' + export LUA_CPATH=$LUA_CPATH''${LUA_CPATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.so + export LUA_PATH=$LUA_PATH''${LUA_PATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.lua + '') cfg.luaModules} + + ${awesome}/bin/awesome & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.awesome ]; + environment.systemPackages = [ awesome ]; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index f911d3c81f9..64e0d4d8050 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -483,8 +483,6 @@ in services.xserver.displayManager.xserverArgs = [ "-ac" - "-logverbose" - "-verbose" "-terminate" "-logfile" "/var/log/X.${toString cfg.display}.log" "-config ${configFile}" diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index c0e0ae23d38..c814469ae41 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -181,7 +181,7 @@ while (my ($unit, $state) = each %{$activePrev}) { } elsif ($unit =~ /\.mount$/) { # Reload the changed mount unit to force a remount. write_file($reloadListFile, { append => 1 }, "$unit\n"); - } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/) { + } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) { # FIXME: do something? } else { my $unitInfo = parseUnit($newUnitFile); diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index b62aed4ead9..0b7d4de6d20 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -56,9 +56,10 @@ echo # Mount special file systems. -mkdir -p /etc +mkdir -p /etc/udev touch /etc/fstab # to shut up mount touch /etc/mtab # to shut up mke2fs +touch /etc/udev/hwdb.bin # to shut up udev touch /etc/initrd-release mkdir -p /proc mount -t proc proc /proc diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 310527667d7..9d61a4b0530 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -85,6 +85,12 @@ in optionalString (cfg.defaultGatewayWindowSize != null) "window ${cfg.defaultGatewayWindowSize}"} || true ''} + ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6 != "") '' + # FIXME: get rid of "|| true" (necessary to make it idempotent). + ip -6 route add ::/0 via "${cfg.defaultGateway6}" ${ + optionalString (cfg.defaultGatewayWindowSize != null) + "window ${cfg.defaultGatewayWindowSize}"} || true + ''} ''; }; diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 10185c7709b..70158fc7252 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -51,6 +51,8 @@ in DHCP = override (dhcpStr cfg.useDHCP); } // optionalAttrs (cfg.defaultGateway != null) { gateway = override [ cfg.defaultGateway ]; + } // optionalAttrs (cfg.defaultGateway6 != null) { + gateway = override [ cfg.defaultGateway6 ]; } // optionalAttrs (domains != [ ]) { domains = override domains; }; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 9c6c71a1dbb..4a272483e54 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -233,8 +233,12 @@ in The 32-bit host ID of the machine, formatted as 8 hexadecimal characters. You should try to make this ID unique among your machines. You can - generate a random 32-bit ID using the following command: + generate a random 32-bit ID using the following commands: + cksum /etc/machine-id | while read c rest; do printf "%x" $c; done + + (this derives it from the machine-id that systemd generates) or + head -c4 /dev/urandom | od -A none -t x4 ''; }; @@ -256,6 +260,15 @@ in ''; }; + networking.defaultGateway6 = mkOption { + default = null; + example = "2001:4d0:1e04:895::1"; + type = types.nullOr types.str; + description = '' + The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP. + ''; + }; + networking.defaultGatewayWindowSize = mkOption { default = null; example = 524288; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a7610b3e11a..42986aa3e03 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -57,8 +57,7 @@ let -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ - -net nic,vlan=0,model=virtio \ - -net user,vlan=0''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \ + ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \ @@ -248,12 +247,31 @@ in description = "Primary IP address used in /etc/hosts."; }; - virtualisation.qemu.options = - mkOption { - default = []; - example = [ "-vga std" ]; - description = "Options passed to QEMU."; - }; + virtualisation.qemu = { + options = + mkOption { + default = []; + example = [ "-vga std" ]; + description = "Options passed to QEMU."; + }; + + networkingOptions = + mkOption { + default = [ + "-net nic,vlan=0,model=virtio" + "-net user,vlan=0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" + ]; + type = types.listOf types.str; + description = '' + Networking-related command-line options that should be passed to qemu. + The default is to use userspace networking (slirp). + + If you override this option, be adviced to keep + ''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} (as seen in the default) + to keep the default runtime behaviour. + ''; + }; + }; virtualisation.useBootLoader = mkOption { diff --git a/nixos/tests/blivet.nix b/nixos/tests/blivet.nix index acaf4fec614..72c2a33f87e 100644 --- a/nixos/tests/blivet.nix +++ b/nixos/tests/blivet.nix @@ -43,11 +43,6 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec { TMPDIR=/tmp/xchg/bigtmp export TMPDIR - mkPythonPath() { - nix-store -qR "$@" \ - | sed -e 's|$|/lib/${pkgs.python.libPrefix}/site-packages|' - } - cp -Rd "${blivet.src}/tests" . # Skip SELinux tests @@ -73,8 +68,11 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec { -e 's|_STORE_FILE_PATH = .*|_STORE_FILE_PATH = tempfile.gettempdir()|' \ tests/loopbackedtestcase.py - PYTHONPATH=".:$(mkPythonPath "${blivet}" "${mock}" | paste -sd :)" \ - python "${pythonTestRunner}" + PYTHONPATH=".:$(< "${pkgs.stdenv.mkDerivation { + name = "blivet-pythonpath"; + buildInputs = [ blivet mock ]; + buildCommand = "echo \"$PYTHONPATH\" > \"$out\""; + }}")" python "${pythonTestRunner}" ''; testScript = '' diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix index e0add8a936f..e40a8100a06 100644 --- a/nixos/tests/containers.nix +++ b/nixos/tests/containers.nix @@ -43,7 +43,7 @@ import ./make-test.nix { $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null"); # Make sure we have a NixOS tree (required by ‘nixos-container create’). - $machine->succeed("nix-env -qa -A nixos.pkgs.hello >&2"); + $machine->succeed("PAGER=cat nix-env -qa -A nixos.pkgs.hello >&2"); # Create some containers imperatively. my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name"); diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 2b0715e97bc..27c65fe47e8 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -8,6 +8,7 @@ import ./make-test.nix { virtualisation.memorySize = 768; services.gitlab.enable = true; services.gitlab.databasePassword = "gitlab"; + systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min"; }; }; diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix index 4fc02d1cd3f..040f613c596 100644 --- a/nixos/tests/mesos.nix +++ b/nixos/tests/mesos.nix @@ -8,6 +8,10 @@ import ./make-test.nix { slave = { enable = true; master = "zk://localhost:2181/mesos"; + attributes = { + tag1 = "foo"; + tag2 = "bar"; + }; }; master = { enable = true; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index e4c3de146e9..b2b1ec87779 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -1,5 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let + debug = false; + testVMConfig = vmName: attrs: { config, pkgs, ... }: { boot.kernelParams = let miniInit = '' @@ -64,7 +66,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let rotated = map (i: "${logfile}.${toString i}") (range 1 9); all = concatMapStringsSep " " (f: "\"${f}\"") ([logfile] ++ rotated); logcmd = "tail -F ${all} 2> /dev/null | logger -t \"${tag}\""; - in "$machine->execute(ru '${logcmd} & disown');"; + in optionalString debug "$machine->execute(ru '${logcmd} & disown');"; testVM = vmName: vmScript: let cfg = (import ../lib/eval-config.nix { @@ -297,14 +299,16 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let in { name = "virtualbox"; - machine = { pkgs, ... }: { + machine = { pkgs, lib, config, ... }: { imports = let mkVMConf = name: val: val.machine // { key = "${name}-config"; }; vmConfigs = mapAttrsToList mkVMConf vboxVMs; in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs; virtualisation.memorySize = 768; services.virtualboxHost.enable = true; - users.extraUsers.alice.extraGroups = [ "vboxusers" ]; + users.extraUsers.alice.extraGroups = let + inherit (config.services.virtualboxHost) enableHardening; + in lib.mkIf enableHardening (lib.singleton "vboxusers"); }; testScript = '' diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 49b02f46e9b..3ab113c92e8 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -4,20 +4,19 @@ , mpg123, neon, faad2 }: -let - version = "3.5.1"; -in +let version = "3.5.2"; in + stdenv.mkDerivation { name = "audacious-${version}"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "01wmlvpp540gdjw759wif3byh98h3b3q6f5wawzp0b0ivqd0wf6z"; + sha256 = "0mhrdj76h0g6q197wgp8rxk6gqsrirrw49hfidcb5b7q5rlvj59r"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "09lyvi15hbn3pvb2izyz2bm4021917mhcdrwxrn3q3sjvx337np6"; + sha256 = "1nacd8n46q3pqnwavq3i2ayls609gvxfcp3qqpcsfcdfz3bh15hp"; }; buildInputs = diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index d4927cc1a71..2d738f55c28 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas -, makeWrapper, gnome_icon_theme +, makeWrapper, gnome_icon_theme, dconf }: stdenv.mkDerivation rec { @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/bin/easytag \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; NIX_LDFLAGS = "-lid3tag -lz"; @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome_icon_theme + itstool libxml2 gsettings_desktop_schemas gnome_icon_theme dconf ]; meta = { diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix new file mode 100644 index 00000000000..b337dbf6d82 --- /dev/null +++ b/pkgs/applications/audio/mimms/default.nix @@ -0,0 +1,31 @@ +{ fetchurl, stdenv, pythonPackages, libmms }: + +let version = "3.2"; +in + pythonPackages.buildPythonPackage { + name = "mimms-${version}"; + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; + sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml"; + }; + + postInstall = '' + wrapProgram $out/bin/mimms \ + --prefix LD_LIBRARY_PATH : ${libmms}/lib + ''; + + meta = { + homepage = https://savannah.nongnu.org/projects/mimms/; + license = stdenv.lib.licenses.gpl3; + description = "An mms (e.g. mms://) stream downloader"; + + longDescription = '' + mimms is a program designed to allow you to download streams + using the MMS protocol and save them to your computer, as + opposed to watching them live. Similar functionality is + available in full media player suites such as Xine, MPlayer, + and VLC, but mimms is quick and easy to use and, for the time + being, remains a useful program. + ''; + }; + } diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index 6af08cf0221..6498f48351d 100644 --- a/pkgs/applications/audio/morituri/default.nix +++ b/pkgs/applications/audio/morituri/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, python, pythonPackages, cdparanoia, cdrdao , pygobject, gst_python, gst_plugins_base, gst_plugins_good -, setuptools, utillinux, makeWrapper }: +, setuptools, utillinux, makeWrapper, substituteAll }: stdenv.mkDerivation rec { name = "morituri-${version}"; version = "0.2.3"; + namePrefix = ""; src = fetchurl { url = "http://thomas.apestaart.org/download/morituri/${name}.tar.bz2"; @@ -21,23 +22,12 @@ stdenv.mkDerivation rec { gst_plugins_base gst_plugins_good ] ++ pythonPath; - patches = [ ./paths.patch ]; - - postPatch = '' - substituteInPlace morituri/extern/python-command/scripts/help2man \ - --replace /usr/bin/python ${python}/bin/python - - substituteInPlace morituri/common/program.py \ - --replace umount ${utillinux}/bin/umount \ - --replace \'eject \'${utillinux}/bin/eject - - substituteInPlace morituri/program/cdparanoia.py \ - --replace '"cdparanoia"' '"${cdparanoia}/bin/cdparanoia"' - - substituteInPlace morituri/program/cdrdao.py \ - --replace "['cdrdao', ]" "['${cdrdao}/bin/cdrdao', ]" \ - --replace '"cdrdao"' '"${cdrdao}/bin/cdrdao"' - ''; + patches = [ + (substituteAll { + src = ./paths.patch; + inherit cdrdao cdparanoia python utillinux; + }) + ]; # This package contains no binaries to patch or strip. dontPatchELF = true; diff --git a/pkgs/applications/audio/morituri/paths.patch b/pkgs/applications/audio/morituri/paths.patch index 12f1d5b761c..efabc1d200c 100644 --- a/pkgs/applications/audio/morituri/paths.patch +++ b/pkgs/applications/audio/morituri/paths.patch @@ -1,6 +1,6 @@ diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in ---- morituri-0.2.3-orig/doc/Makefile.in 2014-11-01 00:13:01.231364181 +0100 -+++ morituri-0.2.3/doc/Makefile.in 2014-11-01 00:13:56.691812229 +0100 +--- morituri-0.2.3-orig/doc/Makefile.in 2014-12-23 12:44:46.222410092 +0100 ++++ morituri-0.2.3/doc/Makefile.in 2014-12-23 12:46:49.619756940 +0100 @@ -486,7 +486,7 @@ morituri.ics: $(top_srcdir)/morituri.doa -moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics @@ -10,3 +10,82 @@ diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in clean-local: @rm -rf reference +diff -Nurp morituri-0.2.3-orig/morituri/common/program.py morituri-0.2.3/morituri/common/program.py +--- morituri-0.2.3-orig/morituri/common/program.py 2014-12-23 12:44:46.218410048 +0100 ++++ morituri-0.2.3/morituri/common/program.py 2014-12-23 12:46:49.647757245 +0100 +@@ -92,13 +92,13 @@ class Program(log.Loggable): + """ + Load the given device. + """ +- os.system('eject -t %s' % device) ++ os.system('@utillinux@/bin/eject -t %s' % device) + + def ejectDevice(self, device): + """ + Eject the given device. + """ +- os.system('eject %s' % device) ++ os.system('@utillinux@/bin/eject %s' % device) + + def unmountDevice(self, device): + """ +@@ -112,7 +112,7 @@ class Program(log.Loggable): + proc = open('/proc/mounts').read() + if device in proc: + print 'Device %s is mounted, unmounting' % device +- os.system('umount %s' % device) ++ os.system('@utillinux@/bin/umount %s' % device) + + def getFastToc(self, runner, toc_pickle, device): + """ +diff -Nurp morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man morituri-0.2.3/morituri/extern/python-command/scripts/help2man +--- morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man 2014-12-23 12:44:46.206409916 +0100 ++++ morituri-0.2.3/morituri/extern/python-command/scripts/help2man 2014-12-23 12:46:49.631757074 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!@python@/bin/python + + # -*- Mode: Python -*- + # vi:si:et:sw=4:sts=4:ts=4 +diff -Nurp morituri-0.2.3-orig/morituri/program/cdparanoia.py morituri-0.2.3/morituri/program/cdparanoia.py +--- morituri-0.2.3-orig/morituri/program/cdparanoia.py 2014-12-23 12:44:46.202409873 +0100 ++++ morituri-0.2.3/morituri/program/cdparanoia.py 2014-12-23 12:46:49.659757376 +0100 +@@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.T + stopTrack, stopOffset) + + bufsize = 1024 +- argv = ["cdparanoia", "--stderr-progress", ++ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress", + "--sample-offset=%d" % self._offset, ] + if self._device: + argv.extend(["--force-cdrom-device", self._device, ]) +@@ -551,7 +551,7 @@ _VERSION_RE = re.compile( + + def getCdParanoiaVersion(): + getter = common.VersionGetter('cdparanoia', +- ["cdparanoia", "-V"], ++ ["@cdparanoia@/bin/cdparanoia", "-V"], + _VERSION_RE, + "%(version)s %(release)s") + +diff -Nurp morituri-0.2.3-orig/morituri/program/cdrdao.py morituri-0.2.3/morituri/program/cdrdao.py +--- morituri-0.2.3-orig/morituri/program/cdrdao.py 2014-12-23 12:44:46.202409873 +0100 ++++ morituri-0.2.3/morituri/program/cdrdao.py 2014-12-23 12:46:49.667757463 +0100 +@@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask): + + def start(self, runner): + self.debug('Starting cdrdao with options %r', self.options) +- self.command = ['cdrdao', ] + self.options ++ self.command = ['@cdrdao@/bin/cdrdao', ] + self.options + + ctask.PopenTask.start(self, runner) + +@@ -515,7 +515,7 @@ _VERSION_RE = re.compile( + + def getCDRDAOVersion(): + getter = common.VersionGetter('cdrdao', +- ["cdrdao"], ++ ["@cdrdao@/bin/cdrdao"], + _VERSION_RE, + "%(version)s") + diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix new file mode 100644 index 00000000000..340658f813d --- /dev/null +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "mp3gain-1.5.2"; + src = fetchurl { + url = "http://downloads.sourceforge.net/mp3gain/mp3gain-1_5_2-src.zip"; + sha256 = "1jkgry59m8cnnfq05b9y1h4x4wpy3iq8j68slb9qffwa3ajcgbfv"; + }; + + buildInputs = [ unzip ]; + + sourceRoot = "."; + + buildFlags = [ "OSTYPE=linux" ]; + + installPhase = '' + mkdir -p $out/usr/bin + cp mp3gain $out/usr/bin + ''; + + meta = { + description = "Lossless mp3 normalizer with statistical analysis"; + homepage = http://mp3gain.sourceforge.net/; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 6e4ddcb1e9c..e83e5a8ca74 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -2,12 +2,12 @@ , libiconvOrEmpty, boost, readline }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; name = "ncmpcpp-${version}"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2"; - sha256 = "033a18hj0q0smm5n0ykld9az7w95myr7jm2b1bjm0h2q5927x8qm"; + sha256 = "1mrd6m6ph0fscxp9x96ipxh6ai7w0n1miapcfqrqfy058qx5zbck"; }; configureFlags = "BOOST_LIB_SUFFIX="; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://unkart.ovh.org/ncmpcpp/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 mornfall ]; + maintainers = with maintainers; [ lovek323 mornfall koral ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 538e1cdf9d0..8696b1c055d 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, pulseaudio, gtkmm3 -, libcanberra_gtk3 }: +, libcanberra_gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "pavucontrol-2.0"; @@ -9,7 +9,13 @@ stdenv.mkDerivation rec { sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2"; }; - buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 ]; + preFixup = '' + wrapProgram "$out/bin/pavucontrol" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" + ''; + + buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper + gnome3.gnome_icon_theme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index d0c3f010e6e..210b2e0813b 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -6,6 +6,7 @@ let version = "1.3"; in buildPythonPackage { name = "picard-${version}"; + namePrefix = ""; src = fetchurl { url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; diff --git a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch new file mode 100644 index 00000000000..00516484890 --- /dev/null +++ b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch @@ -0,0 +1,8 @@ +--- ./scripts/CrashPlanDesktop 2014-12-18 09:51:14.050804325 +0100 ++++ ./scripts/CrashPlanDesktop-1 2014-12-18 09:51:32.271009382 +0100 +@@ -9,4 +9,4 @@ + + cd ${TARGETDIR} + +-${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log & ++${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop & diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 1a78dea2157..5a0e8c7cfbd 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { description = "An online/offline backup solution"; homepage = "http://www.crashplan.org"; license = licenses.unfree; - maintainers = with maintainers; [ sztupi ]; + maintainers = with maintainers; [ sztupi iElectric ]; }; buildInputs = [ makeWrapper cpio ]; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { manifestdir = "${vardir}/manifest"; - patches = [ ./CrashPlanEngine.patch ]; + patches = [ ./CrashPlanEngine.patch ./CrashPlanDesktop.patch ]; installPhase = '' mkdir $out @@ -45,6 +45,7 @@ in stdenv.mkDerivation rec { install -D -m 644 run.conf $out/bin/run.conf install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine + install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop rm -r $out/log ln -s $vardir/log $out/log @@ -72,6 +73,10 @@ in stdenv.mkDerivation rec { substituteInPlace $f --replace sed ${gnused}/bin/sed substituteInPlace $f --replace grep ${gnugrep}/bin/grep done + + substituteInPlace $out/share/applications/CrashPlan.desktop \ + --replace /usr/local $out \ + --replace crashplan/skin skin wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${gtk2}/lib:${glib}/lib:${libXtst}/lib" ''; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 4e569fc68a5..71b2ccb6fb8 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A powerful editor targeted towards programmers and webdevelopers"; homepage = http://bluefish.openoffice.nl/; license = licenses.gpl3Plus; - maintainer = [maintainers.vbgl]; + maintainers = [maintainers.vbgl]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index dc818900a6d..7f4373c41ba 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchgit, emacs, texinfo }: +{ stdenv, fetchurl, emacs, texinfo }: -stdenv.mkDerivation rec { - name = "haskell-mode-20141113"; +let + version = "13.10"; +in +stdenv.mkDerivation { + name = "haskell-mode-${version}"; - src = fetchgit { - url = "https://github.com/haskell/haskell-mode.git"; - sha256 = "fc2a15f3a88f2343663e8b078464991a1af5ffe36c8158ee4f61c5d0358c9daf"; + src = fetchurl { + url = "https://github.com/haskell/haskell-mode/archive/v${version}.tar.gz"; + sha256 = "0hcg7wpalcdw8j36m8vd854zrrgym074r7m903rpwfrhx9mlg02b"; }; buildInputs = [ emacs texinfo ]; + makeFlags = "VERSION=${version} GIT_VERSION=${version}"; + installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp *.el *.elc *.hs "$out/share/emacs/site-lisp/" + mkdir -p $out/share/emacs/site-lisp + cp *.el *.elc *.hs $out/share/emacs/site-lisp/ + mkdir -p $out/share/info + cp -v *.info* $out/share/info/ ''; meta = { diff --git a/pkgs/applications/editors/emacs-modes/haskell/git.nix b/pkgs/applications/editors/emacs-modes/haskell/git.nix new file mode 100644 index 00000000000..72f49592b51 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/haskell/git.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, emacs, texinfo }: + +let + version = "13.10-299-g74b5a3c"; # git describe --tags +in +stdenv.mkDerivation { + name = "haskell-mode-${version}"; + + src = fetchFromGitHub { + owner = "haskell"; + repo = "haskell-mode"; + rev = "v${version}"; + sha256 = "1qjrc1c4jsgbbhnhssvadg00qffn80a8slrxc9g1hnzp632kv8wl"; + }; + + buildInputs = [ emacs texinfo ]; + + makeFlags = "VERSION=v${version} GIT_VERSION=v${version}"; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + cp *.el *.elc *.hs $out/share/emacs/site-lisp/ + mkdir -p $out/share/info + cp -v *.info* $out/share/info/ + ''; + + # The test suite must run *after* copying the generated files to $out + # because "make check" implies "make clean". + doInstallCheck = true; + installCheckTarget = "check"; + + meta = { + homepage = "http://github.com/haskell/haskell-mode"; + description = "Haskell mode for Emacs"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index f1e3a078b70..4cd88d53679 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -74,12 +74,6 @@ let && jdk=${jdk}/lib/openjdk \ || jdk=${jdk} - if [ "${stdenv.system}" == "x86_64-linux" ]; then - makeWrapper "$out/$name/bin/fsnotifier64" "$out/bin/fsnotifier64" - else - makeWrapper "$out/$name/bin/fsnotifier" "$out/bin/fsnotifier" - fi - makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \ --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ --prefix LD_RUN_PATH : "${stdenv.gcc.gcc}/lib/" \ @@ -295,13 +289,13 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "8.0.1"; - build = "PS-138.2001"; + version = "8.0.2"; + build = "PS-139.732"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "http://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0d46442aa32174fe16846c3c31428178ab69b827d2e0ce31f633f13b64c01afc"; + sha256 = "01b8vx6swi71sd0rc7i1jnicilqp11ch3zrm8gwb6xh1pmmpdirf"; }; }; diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix index 4673029ed00..e46cb66de56 100644 --- a/pkgs/applications/editors/zed/default.nix +++ b/pkgs/applications/editors/zed/default.nix @@ -3,7 +3,7 @@ let name = "zed-${version}"; - version = "0.13"; + version = "1.0.0"; # When upgrading node.nix / node packages: # fetch package.json from Zed's repository @@ -31,7 +31,7 @@ let src = fetchgit { url = "git://github.com/zedapp/zed"; rev = "refs/tags/v${version}"; - sha256 = "023nq4y6dgh57xpsgawdn2zqvfyhjz1p00ldnsfsjajyy4nn6yb1"; + sha256 = "1kdvj9mvdwm4cswqw6nn9j6kgqvs4d7vycpsmmfha9a2rkryw9zh"; }; buildInputs = [ makeWrapper zip ]; diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix index f2c08fde0cd..cd75f2d58fa 100644 --- a/pkgs/applications/editors/zed/node.nix +++ b/pkgs/applications/editors/zed/node.nix @@ -2,21 +2,21 @@ { by-spec."accepts"."~1.1.0" = - self.by-version."accepts"."1.1.0"; - by-version."accepts"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-accepts-1.1.0"; + self.by-version."accepts"."1.1.1"; + by-version."accepts"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-accepts-1.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.0.tgz"; - name = "accepts-1.1.0.tgz"; - sha1 = "43ba6d946374c80f91823eaec6bb43dc4955500b"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.1.1.tgz"; + name = "accepts-1.1.1.tgz"; + sha1 = "3b40bf6abc3fe3bc004534f4672ae1efd0063a96"; }) ]; buildInputs = (self.nativeDeps."accepts" or []); deps = [ - self.by-version."mime-types"."2.0.1" - self.by-version."negotiator"."0.4.7" + self.by-version."mime-types"."2.0.2" + self.by-version."negotiator"."0.4.8" ]; peerDependencies = [ ]; @@ -119,33 +119,33 @@ passthru.names = [ "block-stream" ]; }; by-spec."body-parser"."^1.6.3" = - self.by-version."body-parser"."1.8.1"; - by-version."body-parser"."1.8.1" = lib.makeOverridable self.buildNodePackage { - name = "node-body-parser-1.8.1"; + self.by-version."body-parser"."1.9.0"; + by-version."body-parser"."1.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-body-parser-1.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.1.tgz"; - name = "body-parser-1.8.1.tgz"; - sha1 = "f9f96d221c435c95d18aeaad2bcdea1371902aad"; + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.0.tgz"; + name = "body-parser-1.9.0.tgz"; + sha1 = "95d72943b1a4f67f56bbac9e0dcc837b68703605"; }) ]; buildInputs = (self.nativeDeps."body-parser" or []); deps = [ self.by-version."bytes"."1.0.0" - self.by-version."depd"."0.4.4" + self.by-version."depd"."1.0.0" self.by-version."iconv-lite"."0.4.4" self.by-version."media-typer"."0.3.0" self.by-version."on-finished"."2.1.0" - self.by-version."qs"."2.2.3" + self.by-version."qs"."2.2.4" self.by-version."raw-body"."1.3.0" - self.by-version."type-is"."1.5.1" + self.by-version."type-is"."1.5.2" ]; peerDependencies = [ ]; passthru.names = [ "body-parser" ]; }; - "body-parser" = self.by-version."body-parser"."1.8.1"; + "body-parser" = self.by-version."body-parser"."1.9.0"; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -166,25 +166,6 @@ ]; passthru.names = [ "boom" ]; }; - by-spec."buffer-crc32"."0.2.3" = - self.by-version."buffer-crc32"."0.2.3"; - by-version."buffer-crc32"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-buffer-crc32-0.2.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz"; - name = "buffer-crc32-0.2.3.tgz"; - sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921"; - }) - ]; - buildInputs = - (self.nativeDeps."buffer-crc32" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "buffer-crc32" ]; - }; by-spec."bytes"."1" = self.by-version."bytes"."1.0.0"; by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -283,6 +264,25 @@ ]; passthru.names = [ "cookie-signature" ]; }; + by-spec."crc"."3.0.0" = + self.by-version."crc"."3.0.0"; + by-version."crc"."3.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-crc-3.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz"; + name = "crc-3.0.0.tgz"; + sha1 = "d11e97ec44a844e5eb15a74fa2c7875d0aac4b22"; + }) + ]; + buildInputs = + (self.nativeDeps."crc" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "crc" ]; + }; by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -361,15 +361,34 @@ ]; passthru.names = [ "delayed-stream" ]; }; - by-spec."depd"."0.4.4" = - self.by-version."depd"."0.4.4"; - by-version."depd"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-depd-0.4.4"; + by-spec."depd"."0.4.5" = + self.by-version."depd"."0.4.5"; + by-version."depd"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-depd-0.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-0.4.4.tgz"; - name = "depd-0.4.4.tgz"; - sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662"; + url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz"; + name = "depd-0.4.5.tgz"; + sha1 = "1a664b53388b4a6573e8ae67b5f767c693ca97f1"; + }) + ]; + buildInputs = + (self.nativeDeps."depd" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "depd" ]; + }; + by-spec."depd"."~1.0.0" = + self.by-version."depd"."1.0.0"; + by-version."depd"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-depd-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; + name = "depd-1.0.0.tgz"; + sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; }) ]; buildInputs = @@ -437,47 +456,46 @@ ]; passthru.names = [ "escape-html" ]; }; - by-spec."etag"."~1.3.0" = - self.by-version."etag"."1.3.0"; - by-version."etag"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-etag-1.3.0"; + by-spec."etag"."~1.4.0" = + self.by-version."etag"."1.4.0"; + by-version."etag"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-etag-1.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/etag/-/etag-1.3.0.tgz"; - name = "etag-1.3.0.tgz"; - sha1 = "c837debfbfe0baf7eb8e2f0bbb3d1d9cc3229697"; + url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz"; + name = "etag-1.4.0.tgz"; + sha1 = "3050991615857707c04119d075ba2088e0701225"; }) ]; buildInputs = (self.nativeDeps."etag" or []); deps = [ - self.by-version."buffer-crc32"."0.2.3" + self.by-version."crc"."3.0.0" ]; peerDependencies = [ ]; passthru.names = [ "etag" ]; }; by-spec."express"."^4.8.3" = - self.by-version."express"."4.9.0"; - by-version."express"."4.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.9.0"; + self.by-version."express"."4.9.5"; + by-version."express"."4.9.5" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.9.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.9.0.tgz"; - name = "express-4.9.0.tgz"; - sha1 = "9b2ea4ebce57c7ac710604c74f6c303ab344a7f3"; + url = "http://registry.npmjs.org/express/-/express-4.9.5.tgz"; + name = "express-4.9.5.tgz"; + sha1 = "7f62aa84ac8f5e96acfb98e2944dde0bf1cf8688"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."accepts"."1.1.0" - self.by-version."buffer-crc32"."0.2.3" + self.by-version."accepts"."1.1.1" self.by-version."cookie-signature"."1.0.5" self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.4" + self.by-version."depd"."0.4.5" self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.3.0" + self.by-version."etag"."1.4.0" self.by-version."finalhandler"."0.2.0" self.by-version."fresh"."0.2.4" self.by-version."media-typer"."0.3.0" @@ -485,12 +503,12 @@ self.by-version."on-finished"."2.1.0" self.by-version."parseurl"."1.3.0" self.by-version."path-to-regexp"."0.1.3" - self.by-version."proxy-addr"."1.0.1" - self.by-version."qs"."2.2.3" + self.by-version."proxy-addr"."1.0.3" + self.by-version."qs"."2.2.4" self.by-version."range-parser"."1.0.2" - self.by-version."send"."0.9.1" - self.by-version."serve-static"."1.6.1" - self.by-version."type-is"."1.5.1" + self.by-version."send"."0.9.3" + self.by-version."serve-static"."1.6.3" + self.by-version."type-is"."1.5.2" self.by-version."vary"."1.0.0" self.by-version."cookie"."0.1.2" self.by-version."merge-descriptors"."0.0.2" @@ -500,7 +518,7 @@ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.9.0"; + "express" = self.by-version."express"."4.9.5"; by-spec."finalhandler"."0.2.0" = self.by-version."finalhandler"."0.2.0"; by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -563,6 +581,25 @@ ]; passthru.names = [ "form-data" ]; }; + by-spec."forwarded"."~0.1.0" = + self.by-version."forwarded"."0.1.0"; + by-version."forwarded"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-forwarded-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; + name = "forwarded-0.1.0.tgz"; + sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + }) + ]; + buildInputs = + (self.nativeDeps."forwarded" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "forwarded" ]; + }; by-spec."fresh"."0.2.4" = self.by-version."fresh"."0.2.4"; by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -728,15 +765,15 @@ }; by-spec."inherits"."~2.0.0" = self.by-version."inherits"."2.0.1"; - by-spec."ipaddr.js"."0.1.2" = - self.by-version."ipaddr.js"."0.1.2"; - by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ipaddr.js-0.1.2"; + by-spec."ipaddr.js"."0.1.3" = + self.by-version."ipaddr.js"."0.1.3"; + by-version."ipaddr.js"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-ipaddr.js-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; - name = "ipaddr.js-0.1.2.tgz"; - sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.3.tgz"; + name = "ipaddr.js-0.1.3.tgz"; + sha1 = "27a9ca37f148d2102b0ef191ccbf2c51a8f025c6"; }) ]; buildInputs = @@ -846,15 +883,15 @@ self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mime-db"."~1.0.1" = - self.by-version."mime-db"."1.0.1"; - by-version."mime-db"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-db-1.0.1"; + by-spec."mime-db"."~1.1.0" = + self.by-version."mime-db"."1.1.0"; + by-version."mime-db"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-db-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.0.1.tgz"; - name = "mime-db-1.0.1.tgz"; - sha1 = "35d99b0965967253bb30633a7d07a8de9975a952"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.1.0.tgz"; + name = "mime-db-1.1.0.tgz"; + sha1 = "4613f418ab995450bf4bda240cd0ab38016a07a9"; }) ]; buildInputs = @@ -865,28 +902,26 @@ ]; passthru.names = [ "mime-db" ]; }; - by-spec."mime-types"."~2.0.0" = - self.by-version."mime-types"."2.0.1"; - by-version."mime-types"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-types-2.0.1"; + by-spec."mime-types"."~2.0.2" = + self.by-version."mime-types"."2.0.2"; + by-version."mime-types"."2.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-types-2.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.1.tgz"; - name = "mime-types-2.0.1.tgz"; - sha1 = "7f5b4712592e7dd46ca733fd1c5f5d71356de615"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.2.tgz"; + name = "mime-types-2.0.2.tgz"; + sha1 = "c74b779f2896c367888622bd537aaaad4c0a2c08"; }) ]; buildInputs = (self.nativeDeps."mime-types" or []); deps = [ - self.by-version."mime-db"."1.0.1" + self.by-version."mime-db"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "mime-types" ]; }; - by-spec."mime-types"."~2.0.1" = - self.by-version."mime-types"."2.0.1"; by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -964,15 +999,15 @@ ]; passthru.names = [ "nan" ]; }; - by-spec."negotiator"."0.4.7" = - self.by-version."negotiator"."0.4.7"; - by-version."negotiator"."0.4.7" = lib.makeOverridable self.buildNodePackage { - name = "node-negotiator-0.4.7"; + by-spec."negotiator"."0.4.8" = + self.by-version."negotiator"."0.4.8"; + by-version."negotiator"."0.4.8" = lib.makeOverridable self.buildNodePackage { + name = "node-negotiator-0.4.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz"; - name = "negotiator-0.4.7.tgz"; - sha1 = "a4160f7177ec806738631d0d3052325da42abdc8"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.8.tgz"; + name = "negotiator-0.4.8.tgz"; + sha1 = "96010b23b63c387f47a4bed96762a831cda39eab"; }) ]; buildInputs = @@ -1044,14 +1079,14 @@ by-spec."on-finished"."~2.1.0" = self.by-version."on-finished"."2.1.0"; by-spec."options".">=0.0.5" = - self.by-version."options"."0.0.5"; - by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-options-0.0.5"; + self.by-version."options"."0.0.6"; + by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-options-0.0.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz"; - name = "options-0.0.5.tgz"; - sha1 = "9a3806378f316536d79038038ba90ccb724816c3"; + url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; + name = "options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; }) ]; buildInputs = @@ -1100,21 +1135,22 @@ ]; passthru.names = [ "path-to-regexp" ]; }; - by-spec."proxy-addr"."1.0.1" = - self.by-version."proxy-addr"."1.0.1"; - by-version."proxy-addr"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-proxy-addr-1.0.1"; + by-spec."proxy-addr"."~1.0.3" = + self.by-version."proxy-addr"."1.0.3"; + by-version."proxy-addr"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-proxy-addr-1.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz"; - name = "proxy-addr-1.0.1.tgz"; - sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8"; + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.3.tgz"; + name = "proxy-addr-1.0.3.tgz"; + sha1 = "17d824aac844707441249da6d1ea5e889007cdd6"; }) ]; buildInputs = (self.nativeDeps."proxy-addr" or []); deps = [ - self.by-version."ipaddr.js"."0.1.2" + self.by-version."forwarded"."0.1.0" + self.by-version."ipaddr.js"."0.1.3" ]; peerDependencies = [ ]; @@ -1139,15 +1175,15 @@ ]; passthru.names = [ "punycode" ]; }; - by-spec."qs"."2.2.3" = - self.by-version."qs"."2.2.3"; - by-version."qs"."2.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-qs-2.2.3"; + by-spec."qs"."2.2.4" = + self.by-version."qs"."2.2.4"; + by-version."qs"."2.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-qs-2.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.2.3.tgz"; - name = "qs-2.2.3.tgz"; - sha1 = "6139c1f47960eff5655e56aab0ef9f6dd16d4eeb"; + url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz"; + name = "qs-2.2.4.tgz"; + sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8"; }) ]; buildInputs = @@ -1177,7 +1213,7 @@ ]; passthru.names = [ "qs" ]; }; - by-spec."range-parser"."~1.0.0" = + by-spec."range-parser"."~1.0.2" = self.by-version."range-parser"."1.0.2"; by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "node-range-parser-1.0.2"; @@ -1196,8 +1232,6 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."range-parser"."~1.0.2" = - self.by-version."range-parser"."1.0.2"; by-spec."raw-body"."1.3.0" = self.by-version."raw-body"."1.3.0"; by-version."raw-body"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -1270,25 +1304,25 @@ ]; passthru.names = [ "rimraf" ]; }; - by-spec."send"."0.9.1" = - self.by-version."send"."0.9.1"; - by-version."send"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-send-0.9.1"; + by-spec."send"."0.9.3" = + self.by-version."send"."0.9.3"; + by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage { + name = "node-send-0.9.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.9.1.tgz"; - name = "send-0.9.1.tgz"; - sha1 = "d93689f7c9ce36bd32f8ee572bb60bda032edc23"; + url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz"; + name = "send-0.9.3.tgz"; + sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0"; }) ]; buildInputs = (self.nativeDeps."send" or []); deps = [ self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.4" + self.by-version."depd"."0.4.5" self.by-version."destroy"."1.0.3" self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.3.0" + self.by-version."etag"."1.4.0" self.by-version."fresh"."0.2.4" self.by-version."mime"."1.2.11" self.by-version."ms"."0.6.2" @@ -1299,15 +1333,15 @@ ]; passthru.names = [ "send" ]; }; - by-spec."serve-static"."~1.6.1" = - self.by-version."serve-static"."1.6.1"; - by-version."serve-static"."1.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-static-1.6.1"; + by-spec."serve-static"."~1.6.3" = + self.by-version."serve-static"."1.6.3"; + by-version."serve-static"."1.6.3" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-static-1.6.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz"; - name = "serve-static-1.6.1.tgz"; - sha1 = "2f257563afbe931d28cee4aa3dfeddc975a87193"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.3.tgz"; + name = "serve-static-1.6.3.tgz"; + sha1 = "b214235d4d4516db050ea9f7b429b46212e79132"; }) ]; buildInputs = @@ -1315,7 +1349,7 @@ deps = [ self.by-version."escape-html"."1.0.1" self.by-version."parseurl"."1.3.0" - self.by-version."send"."0.9.1" + self.by-version."send"."0.9.3" self.by-version."utils-merge"."1.0.0" ]; peerDependencies = [ @@ -1424,21 +1458,21 @@ passthru.names = [ "tunnel-agent" ]; }; by-spec."type-is"."~1.5.1" = - self.by-version."type-is"."1.5.1"; - by-version."type-is"."1.5.1" = lib.makeOverridable self.buildNodePackage { - name = "node-type-is-1.5.1"; + self.by-version."type-is"."1.5.2"; + by-version."type-is"."1.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-type-is-1.5.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.1.tgz"; - name = "type-is-1.5.1.tgz"; - sha1 = "5c1e62d874f79199fb16b34d16972dba376ccbed"; + url = "http://registry.npmjs.org/type-is/-/type-is-1.5.2.tgz"; + name = "type-is-1.5.2.tgz"; + sha1 = "8291bbe845a904acfaffd05a41fdeb234bfa9e5f"; }) ]; buildInputs = (self.nativeDeps."type-is" or []); deps = [ self.by-version."media-typer"."0.3.0" - self.by-version."mime-types"."2.0.1" + self.by-version."mime-types"."2.0.2" ]; peerDependencies = [ ]; @@ -1499,7 +1533,7 @@ self.by-version."commander"."2.1.0" self.by-version."nan"."1.0.0" self.by-version."tinycolor"."0.0.1" - self.by-version."options"."0.0.5" + self.by-version."options"."0.0.6" ]; peerDependencies = [ ]; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 82f1bc382d7..231533e580e 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, - pyqt4, qwt, fcgi, python, libspatialindex, libspatialite, sip }: + pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }: stdenv.mkDerivation rec { name = "qgis-2.4.0"; - buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 sip qwt + buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt fcgi libspatialindex libspatialite ]; nativeBuildInputs = [ cmake python ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index d23f42fdbf9..e40a5fd0630 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A light-weight image viewer"; homepage = https://derf.homelinux.org/projects/feh/; - license = "BSD"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 48044fba166..223f632f937 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils -, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils }: +, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme }: # for dependencies see http://www.yorba.org/projects/shotwell/install/ @@ -42,7 +42,8 @@ in stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/shotwell" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" rm $out/share/icons/hicolor/icon-theme.cache ''; @@ -50,7 +51,9 @@ in stdenv.mkDerivation rec { buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg - makeWrapper gnome_doc_utils ]; + makeWrapper gnome_doc_utils + gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + hicolor_icon_theme ]; meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 2929513952e..4299d49ae65 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = http://www.yworks.com/en/products/yfiles/yed/; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; - maintainer = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 01f9b861bf2..4c48324baba 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -4,6 +4,7 @@ , zlib, fftw , jackaudioSupport ? false, jack2 , cudaSupport ? false, cudatoolkit6 +, colladaSupport ? true, opencollada }: with lib; @@ -22,7 +23,8 @@ stdenv.mkDerivation rec { opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] ++ optional jackaudioSupport jack2 - ++ optional cudaSupport cudatoolkit6; + ++ optional cudaSupport cudatoolkit6 + ++ optional colladaSupport opencollada; postUnpack = '' @@ -30,8 +32,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = - [ "-DWITH_OPENCOLLADA=OFF" - "-DWITH_MOD_OCEANSIM=ON" + [ "-DWITH_MOD_OCEANSIM=ON" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" "-DWITH_INSTALL_PORTABLE=OFF" @@ -41,7 +42,8 @@ stdenv.mkDerivation rec { "-DPYTHON_VERSION=${python.majorVersion}" ] ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"; + ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON" + ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 4656e5add13..ba4946ecc4b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.12.0"; + name = "calibre-2.13.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1qp3aq6f6ngfy8m0bj6rzdf6p2vmk4bxycxfby2n8byfhr8gaclf"; + sha256 = "0sd9yanl4n1bmbxpvdvl68bisp0bgvfk6naddkvcahy9h7qc6h33"; }; inherit python; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 039b4ac688b..33371c93b86 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -12,11 +12,6 @@ stdenv.mkDerivation rec { sha256 = "0x95f57s0a96c4lifxdpf73v706iggwmdw8742mabbjnxq55l1qs"; }; - patchPhase = '' - substituteInPlace "settings.c" \ - --replace "xdgConfigOpen(\"dunst/dunstrc\", \"r\", &xdg" "fopen(\"$out/share/dunst/dunstrc\", \"r\"" - ''; - buildInputs = [ coreutils unzip which pkgconfig dbus freetype libnotify gdk_pixbuf xdg_utils libXext glib pango cairo libX11 libxdg_basedir diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index c35a2c7ff82..97ffd02e751 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, pythonPackages, slowaes, ecdsa, pyqt4 }: +{ stdenv, fetchurl, buildPythonPackage, slowaes, ecdsa, pyqt4 }: -pythonPackages.buildPythonPackage rec { +buildPythonPackage rec { + namePrefix = ""; name = "electrum-${version}"; version = "1.9.8"; @@ -11,7 +12,7 @@ pythonPackages.buildPythonPackage rec { buildInputs = [ slowaes ecdsa ]; - propagatedBuildInputs = [ + propagatedBuildInputs = [ slowaes ecdsa pyqt4 @@ -29,4 +30,4 @@ pythonPackages.buildPythonPackage rec { license = stdenv.lib.licenses.gpl3; maintainers = [ "emery@vfemail.net" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index d0a57e4cec2..169331ceb73 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -8,11 +8,11 @@ assert pulseaudioSupport -> pulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { url = "mirror://sourceforge/project/gqrx/${version}/${name}.tar.xz"; - sha256 = "0fyfkdd2ailg54ppv1y2fy2c692jmlmsyl1lxr20lyn6bvd9gpyn"; + sha256 = "1vfqqa976xlbapqkpc9nka364zydvsy18xiwfqjy015kpasshdz1"; }; buildInputs = [ diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix new file mode 100644 index 00000000000..ea3f4b8f2b9 --- /dev/null +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, pkgconfig, gtk }: + +stdenv.mkDerivation rec { + version = "0.1"; + name = "gtk2fontsel-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/gtk2fontsel/${name}.tar.gz"; + sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw"; + }; + + buildInputs = [ stdenv pkgconfig gtk ]; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "A font selection program for X11 using the GTK2 toolkit"; + longDescription = '' + Font selection tool similar to xfontsel implemented using GTK+ 2. + Trivial, but useful nonetheless. + ''; + homepage = http://gtk2fontsel.sourceforge.net/; + downloadPage = http://sourceforge.net/projects/gtk2fontsel/; + license = licenses.gpl2; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix new file mode 100644 index 00000000000..8013cbe3669 --- /dev/null +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "mediainfo-gui-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; + sha256 = "0sf0ym0v5ds5w4bxk66712adybr1prxxqwvrf9clm57ibs602jfq"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; + + sourceRoot = "./MediaInfo/Project/GNU/GUI/"; + + preConfigure = "sh autogen"; + + meta = { + description = "Supplies technical and tag information about a video or audio file (GUI version)"; + longDescription = '' + MediaInfo is a convenient unified display of the most relevant technical + and tag data for video and audio files. + ''; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix new file mode 100644 index 00000000000..a3393a0a99f --- /dev/null +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "mediainfo-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; + sha256 = "0sf0ym0v5ds5w4bxk66712adybr1prxxqwvrf9clm57ibs602jfq"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; + + sourceRoot = "./MediaInfo/Project/GNU/CLI/"; + + configureFlags = [ "--with-libmediainfo=${libmediainfo}" ]; + preConfigure = "sh autogen"; + + meta = { + description = "Supplies technical and tag information about a video or audio file"; + longDescription = '' + MediaInfo is a convenient unified display of the most relevant technical + and tag data for video and audio files. + ''; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 17da22cbaaf..7d17e6c4a95 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -5,10 +5,10 @@ let s = # Generated upstream information rec { baseName="qpdfview"; - version="0.4.12"; + version = "0.4.13"; name="${baseName}-${version}"; url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256="1h6lrrh1vblqkxrd89nmid7d21anyn30iahj24z62yny35lidf0g"; + sha256 = "0hcfy9wrgs6vygmq790rqipw2132br3av3nhzrm4gpxlbw2n7xcg"; }; buildInputs = [ qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 2a518b9d7cc..746b5e5ef46 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "synergy-${version}"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "synergy"; repo = "synergy"; - rev = "1.6.1"; - sha256 = "1043101c4phv1nbxiqp2jn1jhgzspv9q6v75z0kfzwgii5n5xq1c"; + rev = version; + sha256 = "0himg6c50x5wz5nc6rgd54rph1w6nin6j9f08pa4spsxn9b5h8ks"; }; patches = optional stdenv.isLinux ./cryptopp.patch; diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index fdcdd4770d0..2e690dcce09 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,5 +1,5 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false -, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null, t1lib ? null +, stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null , base14Fonts ? null }: @@ -10,14 +10,14 @@ assert useT1Lib -> t1lib != null; assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities stdenv.mkDerivation { - name = "xpdf-3.03"; + name = "xpdf-3.04"; src = fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz; - sha256 = "1jnfzdqc54wa73lw28kjv0m7120mksb0zkcn81jdlvijyvc67kq2"; + url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz; + sha256 = "1rbp54mr3z2x3a3a1qmz8byzygzi223vckfam9ib5g1sfds0qf8i"; }; - buildInputs = + buildInputs = [ zlib libpng ] ++ stdenv.lib.optionals enableGUI [x11 motif] ++ stdenv.lib.optional useT1Lib t1lib ++ stdenv.lib.optional enablePDFtoPPM freetype; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 11a17709ade..73fd39b75e9 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -11,14 +11,18 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight WebKitGTK+ web browser"; - homepage = "http://www.midori-browser.org"; + homepage = "http://midori-browser.org"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ raskin iyzsong ]; }; src = fetchurl { - url = "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2"; + urls = [ + "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2" + "http://mirrors-ru.go-parts.com/blfs/conglomeration/midori/midori_${version}_all_.tar.bz2" + ]; + name = "midori_${version}_all_.tar.bz2"; sha256 = "10ckm98rfqfbwr84b8mc1ssgj84wjgkr4dadvx2l7c64sigi66dg"; }; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 6e7755c7bf4..7c04abebb54 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "Synchronise your ownCloud with your computer using this desktop client"; homepage = https://owncloud.org; maintainers = with stdenv.lib.maintainers; [ qknight ]; + meta.platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 8fa5cb6c2ee..01ba9ff47ea 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { rm $out/share/icons/hicolor/icon-theme.cache ''; - meta = { - description = "GTK remote control for the Transmission BitTorrent client"; - }; + meta = with stdenv.lib; + { description = "GTK remote control for the Transmission BitTorrent client"; + homepage = http://code.google.com/p/transmission-remote-gtk/; + license = licenses.gpl2; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 1f08b9873d4..2e196cdf8cf 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { configureFlags = "--with-ssl=openssl"; - meta = { + meta = with stdenv.lib; { description = "Minimalistic Murmur (Mumble server)"; - license = "BSD"; + license = licenses.bsd3; homepage = http://code.google.com/p/umurmur/; }; } diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 3c58d367ab1..9f18095beb8 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "calligra-2.8.6"; + name = "calligra-2.8.7"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "587dda4a340f46e28fe69de8f292fa33a3cf237445013f6ce5ceafa191cb3694"; + sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 34aa7c769d0..350bb4d713c 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = "http://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' Ledger is a powerful, double-entry accounting system that is accessed diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index a12849cf209..52dd08e1e0d 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, gettext }: +{ stdenv, fetchurl, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, gettext, boost }: stdenv.mkDerivation rec { name = "skrooge-1.10.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rsw2xdgws5bvnf3h4hg16liahigcxgaxls7f8hzr9wipxx5xqda"; }; - buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite ]; + buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index edf3091ef16..7b5d1ce62b4 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -3,7 +3,7 @@ {stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.5pre-52f51fb3"; + version = "8.5pre-0c999f02"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -17,8 +17,8 @@ stdenv.mkDerivation { src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "52f51fb385d6a1c90bd7d055185fee50ef2670be"; - sha256 = "0pgp59j2j8vk7nmcja5smly39dpkqfhpp29wpsn71piq6n52pql3"; + rev = "0c999f02ffcd61fcace0cc2d045056a82992a100"; + sha256 = "1wk9lxdmw152665hr5cvnnzgnbbq7kg2845qkb4ag99nnfpsi26s"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index dc8e975ce1d..a7cdf7f3097 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation { checking. ''; homepage = "http://hol.sourceforge.net/"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index 8f673eb0f15..95012f90a94 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -55,7 +55,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "BSD"; + license = a.lib.licenses.bsd3; inherit (sourceInfo) version; homepage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/"; downloadPage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html"; diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix index 2c6144baf0e..5327ed6a42a 100644 --- a/pkgs/applications/science/logic/spass/default.nix +++ b/pkgs/applications/science/logic/spass/default.nix @@ -38,7 +38,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "BSD"; + license = a.lib.licenses.bsd2; }; passthru = { updateInfo = { diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index ddd5dc5d6bb..ffc16a33054 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.34.1"; + version = "5.35.1"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1dw9vfzldpj7lv303xbw0wpyn6ra6i2yzwlrjbcx7j0jm5n43ji0"; + sha256 = "1wwqvay9z6gal7bsyyyhhcwh0fy5ak4h2a446ali0x6zmybaklcy"; }; buildInputs = [sbcl texinfo perl makeWrapper]; @@ -29,10 +29,9 @@ stdenv.mkDerivation { ln -s ../maxima/${version}/doc $out/share/doc/maxima ''; - # Failures in the regression test suite are not going to abort the - # build process. We run the suite mostly so that potential errors show - # up in the build log. See also: - # . + # Failures in the regression test suite won't abort the build process. We run + # the suite only so that potential errors show up in the build log. See also: + # http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933. doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 06eceea65c9..a73e3dbcec0 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "14.09.0"; + version = "14.12.1"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz"; - sha256 = "1wqiw9dgjc9vg94dqk4kif8xs7nlmn34xj3v4zm13fh1jihraksq"; + sha256 = "0sjxvh0y5w5p2xdq3qzz3yhlsigrg3ynib9dkymhynpfnb51x82z"; }; buildInputs = [wxGTK maxima makeWrapper]; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index c2793190e89..8cc8920d4a1 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { from the others by being extremely simple to setup and operate. ''; homepage = http://www.fossil-scm.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = with stdenv.lib.platforms; all; maintainers = [ #Add your name here! stdenv.lib.maintainers.z77z diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 69e88f32c41..73e2565e457 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "2.1.3"; + version = "2.1.4"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0mvgvr2hz25p49dhhizcw9591f2h17y2699mpmndis3kzap0c6zy"; + sha256 = "0gh57mfxz1qrxzfp1lpcaqswhixc246kmajlf0db7g0cn6wnhjd0"; }; patches = [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 82d92fd79e8..8cb34a7f9fa 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - version = "3.1.2"; + version = "3.2.2"; name = "mercurial-${version}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "0fldlypjpzn12az2gk4b3am615wih3r6ld69im97iqq76zmmrgjx"; + sha256 = "1311ba2cgdc17ap8sl7pswzngc702pnkr4cd2rx6znb0w9jzgpmg"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 1ec4866f1aa..6e329ebdf71 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null; stdenv.mkDerivation rec { - version = "1.8.10"; + version = "1.8.11"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha256 = "1k3xskg2kjfp3zipl46lqx4fq4lhqnswd79qxp1kfhwplz401j8w"; + sha1 = "161edaee328f4fdcfd2a7c10ecd3fbcd51c61275"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/video/cc1394/default.nix b/pkgs/applications/video/cc1394/default.nix index d555e1b7885..1040f8e009a 100644 --- a/pkgs/applications/video/cc1394/default.nix +++ b/pkgs/applications/video/cc1394/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; description = "AVT Viewer application for AVT cameras"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; # because libdc1394avt is broken diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix new file mode 100644 index 00000000000..b48f0f42936 --- /dev/null +++ b/pkgs/applications/video/devede/default.nix @@ -0,0 +1,30 @@ +{ pkgs, stdenv, fetchurl, pythonPackages, buildPythonPackage, pygtk, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }: + +let + inherit (pythonPackages) dbus; + +in buildPythonPackage rec { + name = "devede-3.23.0"; + namePrefix = ""; + + src = fetchurl { + url = "http://www.rastersoft.com/descargas/${name}.tar.bz2"; + sha256 = "9e217ca46f5f275cb0c3cadbe8c830fa1fde774c004bd95a343d1255be6f25e1"; + }; + + buildInputs = [ ffmpeg ]; + + pythonPath = [ pygtk dbus ffmpeg mplayer dvdauthor vcdimager cdrkit ]; + + postPatch = '' + substituteInPlace devede --replace "/usr/share/devede" "$out/share/devede" + + ''; + + meta = with stdenv.lib; { + description = "DVD Creator for Linux"; + homepage = http://www.rastersoft.com/programas/devede.html; + license = licenses.gpl3; + maintainers = [ maintainers.bdimcheff ]; + }; +} diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 553b86a3801..8d4a328cc09 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { name = "kmplayer-0.11.3d"; src = fetchurl { - url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; + #url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; + url = "mirror://gentoo/distfiles/kmplayer-0.11.3d.tar.bz2"; sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; }; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index f1d3cf836ad..97cc2f7e0a8 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { version = "2.1.5"; src = fetchurl { - url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; + url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz"; sha256 = "0whzbn7ahn5maarcwl1yhk9lq10b0q0y9w5pjl9kh3frdjmncrbg"; }; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index c42a8d0481d..388248c5aa8 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { meta = { description = "Sample UEFI firmware for QEMU and KVM"; homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 354666f3374..3483b0ac6d2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "0w1gz1apkcrmhgng2rkkzy7wmxm68zgs6a16bi4cx3a38n4mgday"; + sha256 = "1jxvbm81zinh0achh8r2aac3x650aqiwn3w6iq1fg57fir1lw1cw"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index df0cf3e2aae..7f12d2fa8f8 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext , libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 -, which, alsaLib, curl, libvpx, gawk +, which, alsaLib, curl, libvpx, gawk, nettools , xorriso, makeself, perl, pkgconfig, nukeReferences , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null @@ -12,23 +12,25 @@ with stdenv.lib; let + buildType = "release"; version = "4.3.20"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ - $sourcedir/out/linux.*/release/bin/src/vboxdrv \ - $sourcedir/out/linux.*/release/bin/src/vboxpci \ - $sourcedir/out/linux.*/release/bin/src/vboxnetadp \ - $sourcedir/out/linux.*/release/bin/src/vboxnetflt + out/linux.*/${buildType}/bin/src/vboxdrv \ + out/linux.*/${buildType}/bin/src/vboxpci \ + out/linux.*/${buildType}/bin/src/vboxnetadp \ + out/linux.*/${buildType}/bin/src/vboxnetflt do if [ "x$(basename "$mod")" != xvboxdrv -a ! -e "$mod/Module.symvers" ] then - cp -v $sourcedir/out/linux.*/release/bin/src/vboxdrv/Module.symvers \ - "$mod/Module.symvers" + cp -v out/linux.*/${buildType}/bin/src/vboxdrv/Module.symvers \ + "$mod/Module.symvers" fi INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \ - make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD=/do_not_use_depmod ${action} + make -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \ + "M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action} done ''; @@ -86,8 +88,12 @@ in stdenv.mkDerivation { patches = optional enableHardening ./hardened.patch; + postPatch = '' + sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ + src/apps/adpctl/VBoxNetAdpCtl.cpp + ''; + configurePhase = '' - sourcedir="$(pwd)" cat >> LocalConfig.kmk <i_notifyComplete(E_FAIL, +diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp +index be2ad8f..7ddf105 100644 +--- a/src/VBox/Runtime/r3/path.cpp ++++ b/src/VBox/Runtime/r3/path.cpp +@@ -81,6 +81,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath) + } + + ++RTDECL(int) RTPathSuidDir(char *pszPath, size_t cchPath) ++{ ++ return RTStrCopy(pszPath, cchPath, "/var/setuid-wrappers"); ++} ++ ++ + RTDECL(int) RTPathAppPrivateNoArch(char *pszPath, size_t cchPath) + { + #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE) +diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp +index 7bde6af..2656cae 100644 +--- a/src/VBox/Runtime/r3/process.cpp ++++ b/src/VBox/Runtime/r3/process.cpp +@@ -111,6 +111,26 @@ RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath) + return NULL; + } + ++/* ++ * Note the / at the end! This is important, because the functions using this ++ * will cut off everything after the rightmost / as this function is analogous ++ * to RTProcGetExecutablePath(). ++ */ ++#define SUIDDIR "/var/setuid-wrappers/" ++ ++RTR3DECL(char *) RTProcGetSuidPath(char *pszExecPath, size_t cbExecPath) ++{ ++ if (cbExecPath >= sizeof(SUIDDIR)) ++ { ++ memcpy(pszExecPath, SUIDDIR, sizeof(SUIDDIR)); ++ pszExecPath[sizeof(SUIDDIR)] = '\0'; ++ return pszExecPath; ++ } ++ ++ AssertMsgFailed(("Buffer too small (%zu <= %zu)\n", cbExecPath, sizeof(SUIDDIR))); ++ return NULL; ++} ++ + + RTR3DECL(const char *) RTProcShortName(void) + { diff --git a/pkgs/applications/window-managers/awesome/3.4.nix b/pkgs/applications/window-managers/awesome/3.4.nix index 3db2bde6540..961296c6eec 100644 --- a/pkgs/applications/window-managers/awesome/3.4.nix +++ b/pkgs/applications/window-managers/awesome/3.4.nix @@ -47,4 +47,9 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; + + passthru = { + inherit lua; + }; + } diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 713ca591578..20cd15abf1c 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, lua, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf +{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf , xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs -, xcb-util-cursor, lgi, makeWrapper, pango, gobjectIntrospection, unclutter +, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, rxvt_unicode , which, dbus, nettools, git, asciidoc, doxygen, xmlto, docbook_xml_dtd_45 , docbook_xsl }: let version = "3.5.5"; -in +in with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { dbus doxygen gdk_pixbuf + gobjectIntrospection git imagemagick lgi @@ -60,18 +61,22 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib"; GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0"; - LUA_CPATH = "${lgi}/lib/lua/5.1/?.so"; - LUA_PATH = "${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua"; + LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; + LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; postInstall = '' wrapProgram $out/bin/awesome \ - --set LUA_CPATH '"${lgi}/lib/lua/5.1/?.so"' \ - --set LUA_PATH '"${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua"' \ - --set GI_TYPELIB_PATH "${pango}/lib/girepository-1.0" \ + --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \ + --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \ --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${rxvt_unicode}/bin" wrapProgram $out/bin/awesome-client \ --prefix PATH : "${which}/bin" ''; + + passthru = { + inherit lua; + }; } diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 0b36d922df4..c17107ae97b 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A tiling window manager based on binary space partitioning"; homepage = http://github.com/baskerville/bspwm; maintainers = [ stdenv.lib.maintainers.meisternu ]; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index b73d636aaa5..b8e342fb5d1 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -15,11 +15,11 @@ let s = # Generated upstream information rec { baseName="compiz"; - version="0.9.11.2"; + version="0.9.12.0"; name="${baseName}-${version}"; - hash="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; - url="https://launchpad.net/compiz/0.9.11/0.9.11.2/+download/compiz-0.9.11.2.tar.bz2"; - sha256="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; + hash="1n7y413bkykcby9imgmj5f1nbjfjc0hnbwmdkq2n77d4kv1rilxr"; + url="https://launchpad.net/compiz/0.9.12/0.9.12.0/+download/compiz-0.9.12.0.tar.bz2"; + sha256="1n7y413bkykcby9imgmj5f1nbjfjc0hnbwmdkq2n77d4kv1rilxr"; }; buildInputs = [cmake pkgconfig libXrender renderproto gtk libwnck pango cairo diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 7c4cb4934c9..c4b265f4b41 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A manual tiling window manager for X"; homepage = "http://herbstluftwm.org/"; - license = "BSD"; # Simplified BSD License + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 03563a4f812..af368d0a042 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple X hotkey daemon"; homepage = "http://github.com/baskerville/sxhkd"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 6284655e5e9..9641378f018 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -426,4 +426,9 @@ rec { http://sagemath.org/src-old/ ]; + # MySQL mirrors + mysql = [ + http://mysql.mirrors.pair.com/Downloads/ + http://cdn.mysql.com/Downloads/ + ]; } diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh index f70a1087084..441d6b43baa 100644 --- a/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/pkgs/build-support/setup-hooks/autoreconf.sh @@ -1,11 +1,11 @@ preConfigurePhases+=" autoreconfPhase" -for i in @autoconf@ @automake@ @libtool@; do +for i in @autoconf@ @automake@ @libtool@ @gettext@; do findInputs $i nativePkgs propagated-native-build-inputs done autoreconfPhase() { runHook preAutoreconf - autoreconf ${autoreconfFlags:---install --force} + autoreconf ${autoreconfFlags:---install --force --verbose} runHook postAutoreconf } diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix new file mode 100644 index 00000000000..46b947ce77a --- /dev/null +++ b/pkgs/data/fonts/gyre/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + baseName = "gyre-fonts"; + version = "2.005"; + name="${baseName}-${version}"; + + src = fetchurl { + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip"; + sha256 = "0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31"; + }; + + buildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.otf $out/share/fonts/truetype + ''; + + meta = { + description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; + + longDescription = ''The Gyre project started in 2006, and will + eventually include enhanced releases of all 35 freely available + PostScript fonts distributed with Ghostscript v4.00. These are + being converted to OpenType and extended with diacritical marks + covering all modern European languages and then some''; + + homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/index_html#Readings"; + + license = stdenv.lib.licenses.lppl13c; + + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ bergey ]; + }; +} diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix new file mode 100644 index 00000000000..c592ac2d38b --- /dev/null +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -0,0 +1,79 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + baseName = "league-of-moveable-type"; + version = "2014-12"; + name="${baseName}-${version}"; + + srcs = [(fetchurl { + url = "https://www.theleagueofmoveabletype.com/league-gothic/download"; + sha256 = "0nbwsbwhs375kbis3lpk98dw05mnh455vghjg1cq0j2fsj1zb99b"; + name = "league-gothic.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/fanwood/download"; + sha256 = "1023da7hik8ci8s7rcy6lh4h9p6igx1kz9y1a2cv6sizbp819w8g"; + name = "fanwood.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/linden-hill/download"; + sha256 = "0rm92rz9kki91l5wcn149mdpwq1mfql4dv6d159hv534qmg3z3ks"; + name = "linden-hill.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/raleway/download"; + sha256 = "0f6anym0adq0ankqbdqx4lyzbysx824zqdj1x60gafyisjx48y87"; + name = "raleway.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/prociono/download"; + sha256 = "11hamjry5lx3cykzpjq7kwlp6h9cjqy470fmn9f2pi954b46xkdy"; + name = "prociono.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911/download"; + sha256 = "01qganq5n7rgqw546lf45kj8j7ymfjr00i2bwp3qw7ibifg9pn4n"; + name = "goudy-bookletter-1911.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy/download"; + sha256 = "11aywj5lzapk04k2yzi1g96acbbm48x902ka0v9cfwwqpn6js9ra"; + name = "sorts-mill-goudy.zip"; + }) + + +]; + + buildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp */*.otf $out/share/fonts/truetype + ''; + + + meta = { + description = "Font Collection by The League of Moveable Type"; + + longDescription = '' We're done with the tired old fontstacks of + yesteryear. The web is no longer limited, and now it's time to raise + our standards. Since 2009, The League has given only the most + well-made, free & open-source, @font-face ready fonts. + ''; + + homepage = "https://www.theleagueofmoveabletype.com/"; + + license = stdenv.lib.licenses.ofl; + + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ bergey ]; + }; +} diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index aa0c1dbd77b..bcbf5749810 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { license = "unknown"; platforms = stdenv.lib.platforms.all; - maintainers = [ "Daniel Bergey " ]; + maintainers = with stdenv.lib.maintainers; [ bergey ]; }; } diff --git a/pkgs/desktops/e19/default.nix b/pkgs/desktops/e19/default.nix index 5740337a11a..9c862734dcc 100644 --- a/pkgs/desktops/e19/default.nix +++ b/pkgs/desktops/e19/default.nix @@ -22,5 +22,6 @@ rec { #### APPLICATIONS econnman = callPackage ./econnman.nix { }; terminology = callPackage ./terminology.nix { }; + rage = callPackage ./rage.nix { }; } diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index 0c09317d24f..c29a57af54a 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl_1_11 python27Packages.dbus e19.elementary ]; + propagatedBuildInputs = [ python27Packages.pythonefl_1_12 python27Packages.dbus e19.elementary ]; postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_11}/lib/python2.7/site-packages + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_12}/lib/python2.7/site-packages ''; meta = { diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index 2367f47bac4..6dae5f03877 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,19 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.11.3"; + version = "1.12.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "0s9pm3lfp7f2yf877xywjw8ihgr2yrns3gibak0gcwx7d8bfljfr"; + sha256 = "1knxm4xiqxpvpszhyqik43lw36hdwdfh8z7y62803a7093j3yjnw"; }; - buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ]; + buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa + giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto + xlibs.libX11 libdrm udev utillinuxCurses luajit ]; - propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ] ++ [ xlibs.libXrender xlibs.libXfixes xlibs.libXrandr xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ]; + propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite + xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext + bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr + xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 + harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ]; - configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-wayland" "--enable-xine" "--enable-fb" "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" ]; + configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" + "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" + "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb" + "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "--enable-lua-old" ]; NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index 4ee8c0b1a95..27400513f1b 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.11.3"; + version = "1.12.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "1yr96imam9sckgagnp7wdvwmvr1xwakw29dih3gxp7nz7xsa0j8k"; + sha256 = "0qjbhdhnw6h5zc05r2w2j38yapcv9km92k5spcw3zsdnc784vf5i"; }; buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix index 269bfe32dbc..96c791d1b93 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/e19/emotion.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, vlc }: stdenv.mkDerivation rec { name = "emotion_generic_players-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; - sha256 = "0x6aigsqnfn9vcaj1rj6055s0vh811svzhwz5zghksg4lqipjbjx"; + sha256 = "1nm0qbdkhrpgvmj5qn7l4jj5l1g4zz77bda0ddy67fqkn5h3qarg"; }; buildInputs = [ pkgconfig e19.efl vlc ]; preConfigure = '' diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index 9faa03a6338..e00d4a66a45 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, set_freqset_setuid ? false }: - - +{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2 +, libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.19.1"; + version = "0.19.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "016z1vilhjarpxzn5bwcw696d8b66rklnhkrwzfa5mcxn8gpmvap"; + sha256 = "06il67mlbn24ra6rb7gws5ly67i80lfiprhi5cr71qfmnsr4xbqk"; }; - buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb + xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 + libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" export USER_SESSION_DIR=$prefix/lib/systemd/user + + substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ + --replace "/usr/share/X11/xkb/rules/xorg.lst" "${xkeyboard_config}/share/X11/xkb/rules/base.lst" ''; # this is a hack and without this cpufreq module is not working: diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index 756c7badb07..bc678c6aab8 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.11.2"; + version = "1.12.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "03p6v7l2fxvldiymqk16pqnbm9llygp6i19qhn3rmrqy1hkjkry6"; + sha256 = "0viph73wv83xw9g6rgjhhiav9n896m0ixnz2m27cnmmn8llchcf5"; }; buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { diff --git a/pkgs/desktops/e19/rage.nix b/pkgs/desktops/e19/rage.nix new file mode 100644 index 00000000000..6cb6d3d24e8 --- /dev/null +++ b/pkgs/desktops/e19/rage.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, e19, automake, autoconf, libtool, pkgconfig, gst_all_1 +, makeWrapper, lib }: +stdenv.mkDerivation rec { + name = "rage-${version}"; + version = "0.1.0"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; + sha256 = "0d87n0rl24s7b8y3bdcg6i3yrzhil5f5vmgrmh451i4y38k84swk"; + }; + buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig + makeWrapper ]; + NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/evas-1" + "-I${e19.efl}/include/ecore-1" + "-I${e19.efl}/include/eina-1" + "-I${e19.efl}/include/eina-1/eina" + "-I${e19.efl}/include/eet-1" + "-I${e19.efl}/include/eo-1" + "-I${e19.efl}/include/ecore-evas-1" + "-I${e19.efl}/include/ecore-imf-1" + "-I${e19.efl}/include/ecore-con-1" + "-I${e19.efl}/include/ecore-file-1" + "-I${e19.efl}/include/ecore-input-1" + "-I${e19.efl}/include/eldbus-1" + "-I${e19.efl}/include/efreet-1" + "-I${e19.efl}/include/ethumb-client-1" + "-I${e19.efl}/include/ethumb-1" ]; + GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad ]; + configurePhase = '' + ./autogen.sh --prefix=$out + ''; + postInstall = '' + wrapProgram $out/bin/rage \ + --prefix GST_PLUGIN_PATH : "$GST_PLUGIN_PATH" + ''; + meta = { + description = "Video + Audio player along the lines of mplayer"; + homepage = http://enlightenment.org/; + maintainers = with stdenv.lib.maintainers; [ matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/desktops/kde-4.14/applications/kate.nix b/pkgs/desktops/kde-4.14/applications/kate.nix index e7a6476dd6d..2440d73e7e8 100644 --- a/pkgs/desktops/kde-4.14/applications/kate.nix +++ b/pkgs/desktops/kde-4.14/applications/kate.nix @@ -1,8 +1,8 @@ -{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: +{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, python, pykde4}: kde { - buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4 ]; + buildInputs = [ kdelibs kactivities qjson pyqt4 python pykde4 ]; meta = { description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix index f86412147d3..191b96380e6 100644 --- a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, +{ kde, kdelibs, python, pyqt4, kdepimlibs, shared_desktop_ontologies, polkit_qt4, boost, lndir, pkgconfig }: let pydir = "lib/python${python.majorVersion}"; in @@ -14,7 +14,7 @@ kde { nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pyqt4 sip ]; + propagatedBuildInputs = [ pyqt4 ]; preConfigure = '' diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 0e210343a72..1ddda71c2d3 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.call-cc.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; allBut darwin; description = "A portable compiler for the Scheme programming language"; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index acb2dea191a..02e22e82029 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -33,8 +33,8 @@ edk2 = stdenv.mkDerivation { meta = { description = "Intel EFI development kit"; - homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2; - license = "BSD"; + homepage = http://sourceforge.net/projects/edk2/; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix new file mode 100644 index 00000000000..ccc3f4c875b --- /dev/null +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: + +stdenv.mkDerivation rec { + version = "7.8.4"; + name = "ghc-${version}"; + + src = fetchurl { + url = "http://www.haskell.org/ghc/dist/7.8.4/${name}-src.tar.xz"; + sha256 = "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3"; + }; + + buildInputs = [ ghc perl gmp ncurses ]; + + enableParallelBuilding = true; + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + DYNAMIC_BY_DEFAULT = NO + ''; + + preConfigure = '' + echo "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + ''; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" "--keep-file-symbols" ]; + + meta = with stdenv.lib; { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = [ maintainers.marcweber maintainers.andres maintainers.simons ]; + inherit (ghc.meta) license; + # Filter old "i686-darwin" platform which is unsupported these days. + platforms = filter (x: elem x platforms.all) ghc.meta.platforms; + # Disable Darwin builds: . + hydraPlatforms = filter (x: !elem x platforms.darwin) meta.platforms; + }; + +} diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 63f43014dea..462007b1a3b 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,32 +1,29 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }: stdenv.mkDerivation rec { - version = "7.9.20141210"; + version = "7.9.20141217"; name = "ghc-${version}"; src = fetchurl { - url = "http://deb.haskell.org/dailies/2014-12-10/ghc_${version}.orig.tar.bz2"; - sha256 = "0487x0rvpz6c47v9qvc7rgk3hnabmali6c66mzh2bizkgmy1qpk0"; + url = "http://deb.haskell.org/dailies/2014-12-17/ghc_${version}.orig.tar.bz2"; + sha256 = "1yfdi9r07aqbnv6xfdhs6cpj0y0yjdr03l5sa4dv0j1xs3lh1wkv"; }; - buildInputs = [ ghc perl gmp ncurses happy alex ]; - - enableParallelBuilding = true; - - buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" - DYNAMIC_BY_DEFAULT = NO - ''; + buildInputs = [ ghc perl ncurses happy alex ]; preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo >mk/build.mk "DYNAMIC_BY_DEFAULT = NO" sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; - configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc"; + configureFlags = [ + "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" + ]; + + enableParallelBuilding = true; # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort @@ -35,11 +32,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - stdenv.lib.maintainers.simons - ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index cc3fabb244e..6cc866c63a8 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper -, tzdata, git, valgrind +, tzdata, git, valgrind, procps, coreutils }: assert stdenv.gcc.gcc != null; @@ -18,19 +18,19 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.13.0-pre-1673-g3a325c6";}); +with ((import ./common.nix) {inherit stdenv; version = "0.13.0-pre-2604-g2f3cff6";}); let snapshot = if stdenv.system == "i686-linux" - then "c8342e762a1720be939ed7c6a39bdaa27892f66f" + then "3daf531aed03f5769402f2fef852377e2838db98" else if stdenv.system == "x86_64-linux" - then "7a7fe6f5ed47b9cc66261f880e166c7c8738b73e" + then "4f3c8b092dd4fe159d6f25a217cf62e0e899b365" else if stdenv.system == "i686-darwin" - then "63e8644512bd5665c14389a83d5af564c7c0b103" + then "2a3e647b9c400505bd49cfe56091e866c83574ca" else if stdenv.system == "x86_64-darwin" - then "7933ae0e974d1b897806138b7052cb2b4514585f" + then "5e730efc34d79a33f464a87686c10eace0760a2e" else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-11-21"; - snapshotRev = "c9f6d69"; + snapshotDate = "2014-12-20"; + snapshotRev = "8443b09"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { @@ -40,8 +40,8 @@ in stdenv.mkDerivation { src = fetchgit { url = https://github.com/rust-lang/rust; - rev = "3a325c666d2cb7e297bf3057ff2442f96a79428b"; - sha256 = "0a0byglfaf0wfsnlm53vng1gqkkz4i29zphdwqg93v26mciqqc61"; + rev = "2f3cff6956d56048ef7afb6d33e17cbdb2dcf038"; + sha256 = "113y74sd1gr7f0xs1lsgjw3jkvhz8s4dxx34r9cxlw5vjr7fp066"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. @@ -73,9 +73,12 @@ in stdenv.mkDerivation { --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" substituteInPlace src/librustc_back/archive.rs \ --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" + + substituteInPlace src/rust-installer/gen-install-script.sh \ + --replace /bin/echo "${coreutils}/bin/echo" ''; - buildInputs = [ which file perl curl python27 makeWrapper git valgrind ]; + buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ]; enableParallelBuilding = false; # disabled due to rust-lang/rust#16305 diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index f752ad35a6d..738b63fe1ad 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.tortall.net/projects/yasm/; description = "Complete rewrite of the NASM assembler"; - license = "BSD"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 9a2bd0ff328..d271edfe207 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.3.8"; + version = "2.3.9"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip"; - sha256 = "0fgsn1s7vhxcrwb2wa6zvrdzff7zbb2s6f7xj6c9x7gl9mdfcwpn"; + sha256 = "1lk942v7gd3ism4cw8gqk9ndr6yjwkgxc55z7p366khiv8d4f608"; }; installPhase = '' diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 9c4d1563a61..a5fbac680f9 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -41,10 +41,14 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; curl = { - configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; + configureFlags = ["--with-curl=${curl}"]; buildInputs = [curl openssl]; }; + curlWrappers = { + configureFlags = ["--with-curlwrappers"]; + }; + zlib = { configureFlags = ["--with-zlib=${zlib}"]; buildInputs = [zlib]; @@ -199,6 +203,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) bcmathSupport = config.php.bcmath or true; socketsSupport = config.php.sockets or true; curlSupport = config.php.curl or true; + curlWrappersSupport = config.php.curlWrappers or false; gettextSupport = config.php.gettext or true; pcntlSupport = config.php.pcntl or true; postgresqlSupport = config.php.postgresql or true; diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix index 22801aa5b04..b5be8cf2b65 100644 --- a/pkgs/development/interpreters/ruby/gem.nix +++ b/pkgs/development/interpreters/ruby/gem.nix @@ -3,7 +3,7 @@ let gemDefaults = { name, basename, requiredGems, sha256, meta }: { - buildInputs = [rubygems ruby makeWrapper]; + buildInputs = [rubygems makeWrapper]; unpackPhase = ":"; configurePhase=":"; bulidPhase=":"; @@ -15,7 +15,8 @@ let name = "ruby-${name}"; - propagatedBuildInputs = requiredGems; + propagatedBuildInputs = requiredGems ++ [ruby]; + inherit meta; installPhase = '' diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 010d7c504d3..98b4f55f79b 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation { }; meta = { - description = "a Scheme shell"; + description = "A Scheme shell"; longDescription = '' SCSH is an implementation of the Scheme shell. It is implemented as a heap image which is interpreted by the Scheme 48 virtual machine. ''; homepage = http://www.scsh.net/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index d29349abe0c..c29512b86a0 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "3.7.5"; + version = "3.7.6"; name = "afflib-${version}"; src = fetchgit { url = "https://github.com/sshock/AFFLIBv3/"; rev = "refs/tags/v${version}"; - sha256 = "06dr3y6bd7vfjf0p9v85yp1xzg43x515zsa9587jcx7yy5h5ams5"; + sha256 = "11wpjbyja6cn0828sw3951s7dbly11abijk41my3cpy9wnvmiggh"; name = "afflib-${version}-checkout"; }; @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsdOriginal; maintainers = [ stdenv.lib.maintainers.raskin ]; inherit version; - downloadPage = "http://digitalcorpora.org/downloads/afflib/"; - updateWalker = true; + downloadPage = "https://github.com/sshock/AFFLIBv3/tags"; }; } diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix index 67fe669a037..e11e0ae0a1c 100644 --- a/pkgs/development/libraries/confuse/default.nix +++ b/pkgs/development/libraries/confuse/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/confuse/; description = "Configuration file parser library"; - license = "BSD"; + license = stdenv.lib.licenses.isc; }; } diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix new file mode 100644 index 00000000000..8c513978cfd --- /dev/null +++ b/pkgs/development/libraries/czmq/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, zeromq4}: + +stdenv.mkDerivation rec { + baseName="czmq"; + version="3.0.0-rc1"; + name="${baseName}-${version}"; + + src = fetchurl { + url = "http://download.zeromq.org/${name}.tar.gz"; + sha256 = "1g3rk3fz7xzsbqcdcwn0x18nmiyr70k47kg00gdrq8g10li8mmd9"; + }; + + buildInputs = [ zeromq4 ]; + + meta = { + license = stdenv.lib.licenses.mpl20; + homepage = "http://czmq.zeromq.org/"; + description = "High-level C Binding for ZeroMQ"; + }; +} diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 14308dc0eb0..758f687fb73 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake}: let - version = "3.2.2"; + version = "3.2.3"; in stdenv.mkDerivation { name = "eigen-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; - sha256 = "0pwykjkz5n8wfyg9cjj7smgs54a9zc80m9gi106w43n2m72ni39i"; + sha256 = "14l5hlgxxymwyava5mx97ipyk3ma3alaj586aaz1xh1r700a7sxm"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/enginepkcs11/default.nix b/pkgs/development/libraries/enginepkcs11/default.nix index 8c570c5421d..ff40a110a33 100644 --- a/pkgs/development/libraries/enginepkcs11/default.nix +++ b/pkgs/development/libraries/enginepkcs11/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.opensc-project.org/engine_pkcs11/; - license = "BSD"; + license = stdenv.lib.licenses.bsdOriginal; description = "Engine for OpenSSL to use smart cards in PKCS#11 format"; }; } diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index 7a8ab8e464b..12da7e89603 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { combination of description and tag/value pairs. ''; homepage = "http://www.balabit.com/support/community/products/"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 4e4391a50f7..bffb124dc68 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { homepage = http://people.cs.ubc.ca/~mariusm/flann/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index d02eedbdc48..e9e393075b3 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { }; patches = [ ./enable-validation.patch ] # from Gentoo, bohoomil has the same patch as well + ++ [ ./fix-pcf.patch ] ++ optionals useEncumberedCode [ (fetch_bohoomil "02-ftsmooth-2.5.4.patch" "11w4wb7gwgpijc788mpkxj92d7rfdwrdv7jzrpxwv5w5cgpx9iw9") (fetch_bohoomil "03-upstream-2014.12.07.patch" "0gq7y63mg3gc5z69nfkv2kl7xad0bjzsvnl6j1j9q79jjbvaqdq0") diff --git a/pkgs/development/libraries/freetype/fix-pcf.patch b/pkgs/development/libraries/freetype/fix-pcf.patch new file mode 100644 index 00000000000..bb301bcd9ca --- /dev/null +++ b/pkgs/development/libraries/freetype/fix-pcf.patch @@ -0,0 +1,132 @@ +Upstream fixes for pcf fonts. + +http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=74af85c4b62b35e55b0ce9dec55ee10cbc4962a2 +http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=06842c7b49c21f13c0ab61201daab6ff5a358fcc + +diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c +index 998cbed..e3caf82 100644 +--- a/src/pcf/pcfread.c ++++ b/src/pcf/pcfread.c +@@ -2,7 +2,7 @@ + + FreeType font driver for pcf fonts + +- Copyright 2000-2010, 2012, 2013 by ++ Copyright 2000-2010, 2012-2014 by + Francesco Zappa Nardelli + + Permission is hereby granted, free of charge, to any person obtaining a copy +@@ -78,7 +78,7 @@ THE SOFTWARE. + FT_FRAME_START( 16 ), + FT_FRAME_ULONG_LE( type ), + FT_FRAME_ULONG_LE( format ), +- FT_FRAME_ULONG_LE( size ), ++ FT_FRAME_ULONG_LE( size ), /* rounded up to a multiple of 4 */ + FT_FRAME_ULONG_LE( offset ), + FT_FRAME_END + }; +@@ -95,9 +95,11 @@ THE SOFTWARE. + FT_Memory memory = FT_FACE( face )->memory; + FT_UInt n; + ++ FT_ULong size; + +- if ( FT_STREAM_SEEK ( 0 ) || +- FT_STREAM_READ_FIELDS ( pcf_toc_header, toc ) ) ++ ++ if ( FT_STREAM_SEEK( 0 ) || ++ FT_STREAM_READ_FIELDS( pcf_toc_header, toc ) ) + return FT_THROW( Cannot_Open_Resource ); + + if ( toc->version != PCF_FILE_VERSION || +@@ -154,14 +156,35 @@ THE SOFTWARE. + break; + } + +- /* we now check whether the `size' and `offset' values are reasonable: */ +- /* `offset' + `size' must not exceed the stream size */ ++ /* ++ * We now check whether the `size' and `offset' values are reasonable: ++ * `offset' + `size' must not exceed the stream size. ++ * ++ * Note, however, that X11's `pcfWriteFont' routine (used by the ++ * `bdftopcf' program to create PDF font files) has two special ++ * features. ++ * ++ * - It always assigns the accelerator table a size of 100 bytes in the ++ * TOC, regardless of its real size, which can vary between 34 and 72 ++ * bytes. ++ * ++ * - Due to the way the routine is designed, it ships out the last font ++ * table with its real size, ignoring the TOC's size value. Since ++ * the TOC size values are always rounded up to a multiple of 4, the ++ * difference can be up to three bytes for all tables except the ++ * accelerator table, for which the difference can be as large as 66 ++ * bytes. ++ * ++ */ ++ + tables = face->toc.tables; +- for ( n = 0; n < toc->count; n++ ) ++ size = stream->size; ++ ++ for ( n = 0; n < toc->count - 1; n++ ) + { + /* we need two checks to avoid overflow */ +- if ( ( tables->size > stream->size ) || +- ( tables->offset > stream->size - tables->size ) ) ++ if ( ( tables->size > size ) || ++ ( tables->offset > size - tables->size ) ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; +@@ -169,6 +192,15 @@ THE SOFTWARE. + tables++; + } + ++ /* no check of `tables->size' for last table element ... */ ++ if ( ( tables->offset > size ) ) ++ { ++ error = FT_THROW( Invalid_Table ); ++ goto Exit; ++ } ++ /* ... instead, we adjust `tables->size' to the real value */ ++ tables->size = size - tables->offset; ++ + #ifdef FT_DEBUG_LEVEL_TRACE + + { +@@ -733,8 +765,8 @@ THE SOFTWARE. + + FT_TRACE4(( " number of bitmaps: %d\n", nbitmaps )); + +- /* XXX: PCF_Face->nmetrics is singed FT_Long, see pcf.h */ +- if ( face->nmetrics < 0 || nbitmaps != ( FT_ULong )face->nmetrics ) ++ /* XXX: PCF_Face->nmetrics is signed FT_Long, see pcf.h */ ++ if ( face->nmetrics < 0 || nbitmaps != (FT_ULong)face->nmetrics ) + return FT_THROW( Invalid_File_Format ); + + if ( FT_NEW_ARRAY( offsets, nbitmaps ) ) +diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c +index e3caf82..a29a9e3 100644 +--- a/src/pcf/pcfread.c ++++ b/src/pcf/pcfread.c +@@ -192,14 +192,15 @@ THE SOFTWARE. + tables++; + } + +- /* no check of `tables->size' for last table element ... */ ++ /* only check `tables->offset' for last table element ... */ + if ( ( tables->offset > size ) ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; + } +- /* ... instead, we adjust `tables->size' to the real value */ +- tables->size = size - tables->offset; ++ /* ... and adjust `tables->size' to the real value if necessary */ ++ if ( tables->size > size - tables->offset ) ++ tables->size = size - tables->offset; + + #ifdef FT_DEBUG_LEVEL_TRACE + diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index d3f74f4043a..9e26d8ecf05 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/google-glog/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "Library for application-level logging"; }; } diff --git a/pkgs/development/libraries/haskell/csv-conduit/default.nix b/pkgs/development/libraries/haskell/csv-conduit/default.nix new file mode 100644 index 00000000000..f0c01481dbd --- /dev/null +++ b/pkgs/development/libraries/haskell/csv-conduit/default.nix @@ -0,0 +1,31 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, attoparsecConduit, blazeBuilder, conduit +, conduitExtra, dataDefault, HUnit, mmorph, monadControl, mtl +, primitive, resourcet, testFramework, testFrameworkHunit, text +, transformers, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "csv-conduit"; + version = "0.6.3"; + sha256 = "1db1wlpl0ryyf8cmkrg1hgz4ggsvzy6z9ayzcc6n6rdywpfi29z4"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsec attoparsecConduit blazeBuilder conduit conduitExtra + dataDefault mmorph monadControl mtl primitive resourcet text + transformers unorderedContainers vector + ]; + testDepends = [ + HUnit mtl primitive testFramework testFrameworkHunit text + transformers vector + ]; + meta = { + homepage = "http://github.com/ozataman/csv-conduit"; + description = "A flexible, fast, conduit-based CSV parser library for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/generics-sop/default.nix b/pkgs/development/libraries/haskell/generics-sop/default.nix index f266e666680..d7724a7b1ba 100644 --- a/pkgs/development/libraries/haskell/generics-sop/default.nix +++ b/pkgs/development/libraries/haskell/generics-sop/default.nix @@ -4,14 +4,15 @@ cabal.mkDerivation (self: { pname = "generics-sop"; - version = "0.1.0.3"; - sha256 = "0wvrav5armspfp6iixns1db45xfpqicx74asi14a2gnl28yqmfpl"; + version = "0.1.0.4"; + sha256 = "00rjlqsjb7hba5q0kbfwg4ajk75a4sd7m72wx18fa9rlz92qbx2j"; buildDepends = [ tagged ]; meta = { description = "Generic Programming using True Sums of Products"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; - broken = true; + maintainers = with self.stdenv.lib.maintainers; [ + aycanirican ocharles + ]; }; }) diff --git a/pkgs/development/libraries/haskell/libnotify/default.nix b/pkgs/development/libraries/haskell/libnotify/default.nix new file mode 100644 index 00000000000..a49de8cd700 --- /dev/null +++ b/pkgs/development/libraries/haskell/libnotify/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, glib, gtk, pkgs }: + +cabal.mkDerivation (self: { + pname = "libnotify"; + version = "0.1.1.0"; + sha256 = "1wc19v14agadj7dzi81lm3qzk2x33apaj5ylmg7x232k56xzfvr0"; + buildDepends = [ glib gtk ]; + extraLibraries = [ pkgs.libnotify ]; + meta = { + description = "Bindings to libnotify library"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix deleted file mode 100644 index 4ff5df9d1c5..00000000000 --- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "transformers-compat"; - version = "0.3.3"; - sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps"; - buildDepends = [ transformers ]; - meta = { - homepage = "http://github.com/ekmett/transformers-compat/"; - description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix rename to pkgs/development/libraries/haskell/transformers-compat/default.nix diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 29e15e08f69..7b4e3834af7 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = http://www.itk.org/; - license = "BSD"; + license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index ed51a0a2820..94e6cba4ee4 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -8,13 +8,19 @@ stdenv.mkDerivation rec { sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; }; + patches = [ + ./jasper-CVE-2014-8137-variant2.diff ./jasper-CVE-2014-8137-noabort.diff + ./jasper-CVE-2014-8138.diff + ./jasper-CVE-2014-9029.diff + ]; + nativeBuildInputs = [unzip]; propagatedBuildInputs = [ libjpeg ]; configureFlags = "--enable-shared"; meta = { - homepage = http://www.ece.uvic.ca/~mdadams/jasper/; + homepage = https://www.ece.uvic.ca/~frodo/jasper/; description = "JPEG2000 Library"; }; } diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff new file mode 100644 index 00000000000..47b57d5c809 --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff @@ -0,0 +1,16 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967284&action=diff + +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:30:54.193209780 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:36:46.313217814 +0100 +@@ -291,7 +291,10 @@ jas_image_t *jp2_decode(jas_stream_t *in + case JP2_COLR_ICC: + iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp, + dec->colr->data.colr.iccplen); +- assert(iccprof); ++ if (!iccprof) { ++ jas_eprintf("error: failed to parse ICC profile\n"); ++ goto error; ++ } + jas_iccprof_gethdr(iccprof, &icchdr); + jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc); + jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc)); diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff new file mode 100644 index 00000000000..243300dd70e --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff @@ -0,0 +1,45 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967283&action=diff + +--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c 2014-12-11 14:06:44.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_icc.c 2014-12-11 15:16:37.971272386 +0100 +@@ -1009,7 +1009,6 @@ static int jas_icccurv_input(jas_iccattr + return 0; + + error: +- jas_icccurv_destroy(attrval); + return -1; + } + +@@ -1127,7 +1126,6 @@ static int jas_icctxtdesc_input(jas_icca + #endif + return 0; + error: +- jas_icctxtdesc_destroy(attrval); + return -1; + } + +@@ -1206,8 +1204,6 @@ static int jas_icctxt_input(jas_iccattrv + goto error; + return 0; + error: +- if (txt->string) +- jas_free(txt->string); + return -1; + } + +@@ -1328,7 +1324,6 @@ static int jas_icclut8_input(jas_iccattr + goto error; + return 0; + error: +- jas_icclut8_destroy(attrval); + return -1; + } + +@@ -1497,7 +1492,6 @@ static int jas_icclut16_input(jas_iccatt + goto error; + return 0; + error: +- jas_icclut16_destroy(attrval); + return -1; + } + diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff new file mode 100644 index 00000000000..cbf0899d807 --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff @@ -0,0 +1,16 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967280&action=diff + +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:44.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:26.000000000 +0100 +@@ -386,6 +386,11 @@ jas_image_t *jp2_decode(jas_stream_t *in + /* Determine the type of each component. */ + if (dec->cdef) { + for (i = 0; i < dec->numchans; ++i) { ++ /* Is the channel number reasonable? */ ++ if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) { ++ jas_eprintf("error: invalid channel number in CDEF box\n"); ++ goto error; ++ } + jas_image_setcmpttype(dec->image, + dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo], + jp2_getct(jas_image_clrspc(dec->image), diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff new file mode 100644 index 00000000000..01db7f03cdf --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff @@ -0,0 +1,31 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=961994&action=diff + +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:45:44.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:44:58.000000000 +0100 +@@ -1281,7 +1281,7 @@ static int jpc_dec_process_coc(jpc_dec_t + jpc_coc_t *coc = &ms->parms.coc; + jpc_dec_tile_t *tile; + +- if (JAS_CAST(int, coc->compno) > dec->numcomps) { ++ if (JAS_CAST(int, coc->compno) >= dec->numcomps) { + jas_eprintf("invalid component number in COC marker segment\n"); + return -1; + } +@@ -1307,7 +1307,7 @@ static int jpc_dec_process_rgn(jpc_dec_t + jpc_rgn_t *rgn = &ms->parms.rgn; + jpc_dec_tile_t *tile; + +- if (JAS_CAST(int, rgn->compno) > dec->numcomps) { ++ if (JAS_CAST(int, rgn->compno) >= dec->numcomps) { + jas_eprintf("invalid component number in RGN marker segment\n"); + return -1; + } +@@ -1356,7 +1356,7 @@ static int jpc_dec_process_qcc(jpc_dec_t + jpc_qcc_t *qcc = &ms->parms.qcc; + jpc_dec_tile_t *tile; + +- if (JAS_CAST(int, qcc->compno) > dec->numcomps) { ++ if (JAS_CAST(int, qcc->compno) >= dec->numcomps) { + jas_eprintf("invalid component number in QCC marker segment\n"); + return -1; + } diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 21c95066b33..01aeeecc6f6 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Library with the aim of simplifying DNS programming in C"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; }; } diff --git a/pkgs/development/libraries/lgi/default.nix b/pkgs/development/libraries/lgi/default.nix deleted file mode 100644 index 663185831f6..00000000000 --- a/pkgs/development/libraries/lgi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, lua, glib }: - -stdenv.mkDerivation { - name = "lgi-0.7.2"; - - src = fetchurl { - url = https://github.com/pavouk/lgi/archive/0.7.2.tar.gz; - sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn"; - }; - - meta = with stdenv.lib; { - description = "Gobject-introspection based dynamic Lua binding to GObject based libraries"; - homepage = https://github.com/pavouk/lgi; - license = "custom"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - - buildInputs = [ glib gobjectIntrospection lua pkgconfig ]; - - preBuild = '' - sed -i "s|/usr/local|$out|" lgi/Makefile - ''; -} diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix index 4a7bc56568e..f45fb378374 100644 --- a/pkgs/development/libraries/libcello/default.nix +++ b/pkgs/development/libraries/libcello/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://libcello.org/"; + homepage = http://libcello.org/; description = "Higher level programming in C"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index acd930ddd01..2bdeffb204d 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Provides a simplified, portable interface to several low-level networking routines"; homepage = http://code.google.com/p/libdnet/; - license = "BSD"; # New BSD license + license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 3f800c2086e..3123bb33d45 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "F2c converts Fortran 77 source code to C"; homepage = http://www.netlib.org/f2c/; - license = "BSD"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix new file mode 100644 index 00000000000..6b0274d3f0c --- /dev/null +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "libmediainfo-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2"; + sha256 = "088v7qsn7d5pijr88fx4azwb31g6d7bp5ykrzgwhskmj80y3rlp2"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; + + sourceRoot = "./MediaInfoLib/Project/GNU/Library/"; + + configureFlags = [ "--enable-shared" ]; + preConfigure = "sh autogen"; + + postInstall = '' + install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc" + ''; + + meta = { + description = "Shared library for mediainfo"; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/development/libraries/libmusclecard/default.nix b/pkgs/development/libraries/libmusclecard/default.nix index af235b83382..fa8b41a1772 100644 --- a/pkgs/development/libraries/libmusclecard/default.nix +++ b/pkgs/development/libraries/libmusclecard/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Library for MUSCLE smartcard applications"; homepage = http://pcsclite.alioth.debian.org/; - license = "BSD"; + license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index cb1e8346742..4a4159bfdc7 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnftnl-1.0.2"; + name = "libnftnl-1.0.3"; src = fetchurl { url = "netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "1p268cv85l4ipd1p9ipjdrfgba14cblp01apv7wc44zmwfr2gkkq"; + sha256 = "1xr7gis51z9r96s5m5z3dw3f5jx2m1qb7mpvl69631m6nvmff2ng"; }; buildInputs = [ pkgconfig libmnl ]; diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index 2e6c58c804e..4f4a028176f 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libodfgen"; - version="0.1.1"; + version="0.1.2"; name="${baseName}-${version}"; - hash="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm"; - url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.1/libodfgen-0.1.1.tar.xz"; - sha256="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm"; + hash="05f0l90a715kw6n1hbq393alwyjipyp0dcqqqrwm2l0s4p151bpd"; + url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.2/libodfgen-0.1.2.tar.xz"; + sha256="05f0l90a715kw6n1hbq393alwyjipyp0dcqqqrwm2l0s4p151bpd"; }; buildInputs = [ boost pkgconfig cppunit zlib libwpg libwpd librevenge diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 78b264506f0..557e448e2d4 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Open, royalty-free, highly versatile audio codec"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = http://www.opus-codec.org/; }; } diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 25b4f6617be..ad4026857bb 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.4.10"; + version = "0.4.11"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "1ckp5rwdqlhr6n8nwzfd3jwxa6f6n4gxh9ny3c1wcrbzvpkkhkv3"; + sha256 = "10jqra8b1nzy1q440ax72fxymxasgjyvpy0x4k67l77wy4p1jr42"; }; buildInputs = [zlib openssl]; makeFlags = [ diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index c201eda69e6..88af054654b 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt }: +{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt, openssl }: stdenv.mkDerivation rec { - name = "libssh-0.6.3"; + name = "libssh-0.6.4"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/87/${name}.tar.xz"; - sha256 = "1jyaj9h1iglvn02hrvcchbx8ycjpj8b91h8mi459k7q5jp2xgd9b"; + url = "https://red.libssh.org/attachments/download/107/${name}.tar.gz"; + sha256 = "0lkb45sc7w0wd67p46yh8rsprglssnkqar1sp0impwsvx7i0acky"; }; - buildInputs = [ zlib libgcrypt ]; + # option we don't provide (yet): use libgcrypt instead of openssl + buildInputs = [ zlib /*libgcrypt*/ openssl ]; nativeBuildInputs = [ cmake pkgconfig ]; - cmakeFlags = "-DWITH_GCRYPT=ON"; - - meta = { + meta = with stdenv.lib; { description = "SSH client library"; - license = "LGPL"; + license = licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index d569cf28c37..de224f6b613 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses, libopus +{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus , libvpx, check, libconfig, pkgconfig }: let version = "f6b3e6e8fe98d2457827ac6da944e715f008a08a"; - date = "20141203"; + date = "20141219"; in stdenv.mkDerivation rec { - name = "tox-core-${date}-${version}"; + name = "tox-core-${date}-${builtins.substring 0 7 version}"; - src = fetchurl { - url = "https://github.com/irungentoo/toxcore/tarball/${version}"; - name = "${name}.tar.gz"; - sha256 = "1zsx7saqs25vva3pp0bw31yqzrn40fx84w42ig6fiv723k9gpdzy"; + src = fetchFromGitHub { + owner = "irungentoo"; + repo = "toxcore"; + rev = version; + sha256 = "1wd817kix3zjyzzb68jz02iir3z4y5k5p40dgl7a29757yb9m608"; }; NIX_LDFLAGS = "-lgcc_s"; @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { "--with-libsodium-headers=${libsodium}/include" "--with-libsodium-libs=${libsodium}/lib" "--enable-ntox" + "--enable-daemon" ]; buildInputs = [ diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 61f519dfe51..785ed0db7d7 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl , pkgconfig, libxml2, glibmm, perl }: stdenv.mkDerivation rec { - name = "libxml++-2.37.1"; + name = "libxml++-2.37.2"; src = fetchurl { url = "mirror://gnome/sources/libxml++/2.37/${name}.tar.xz"; - sha256 = "17xkdndcambij33k25cb5c4mg2457wi114kiaprjma9j0mh87cgk"; + sha256 = "0fvpm95iapi5qrz6sil6vnqqdrsd7f9a16c415hzr44f2ji10gmv"; }; buildInputs = [ pkgconfig glibmm perl ]; diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix new file mode 100644 index 00000000000..5a2723487a4 --- /dev/null +++ b/pkgs/development/libraries/libzen/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }: + +let version = "0.4.30"; in + +stdenv.mkDerivation { + name = "libzen-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; + sha256 = "1ripvyzz2lw9nx2j8mkjgjfpabrz6knwxri52asqf1abnszbry64"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig ]; + configureFlags = [ "--enable-shared" ]; + + sourceRoot = "./ZenLib/Project/GNU/Library/"; + + preConfigure = "sh autogen"; + + meta = { + description = "Shared library for libmediainfo and mediainfo"; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix new file mode 100644 index 00000000000..20003f23874 --- /dev/null +++ b/pkgs/development/libraries/opencollada/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre }: + +# The exact revision specified by Blender's install_deps.sh script. +let rev = "18da7f4109a8eafaa290a33f5550501cc4c8bae8"; in + +stdenv.mkDerivation { + name = "opencollada-1.3-${rev}"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "OpenCOLLADA"; + inherit rev; + sha256 = "0ach32ws95mh0ijd8sr22kxka3riq72bb9ng46vs3615dxn7h18d"; + }; + + buildInputs = [ cmake pkgconfig ]; + + propagatedBuildInputs = [ libxml2 pcre ]; + + enableParallelBuilding = true; + + meta = { + description = "A library for handling the COLLADA file format"; + homepage = https://github.com/KhronosGroup/OpenCOLLADA/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix index 4b0ccc0903f..302ac10d4ab 100644 --- a/pkgs/development/libraries/opencv/2.1.nix +++ b/pkgs/development/libraries/opencv/2.1.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.willowgarage.com/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 45ac75340b1..fe4aaecbfe3 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -2,14 +2,14 @@ , pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip , enableBloat ? false }: -let v = "2.4.9"; in +let v = "2.4.10"; in stdenv.mkDerivation rec { name = "opencv-${v}"; src = fetchurl { url = "mirror://sourceforge/opencvlibrary/opencv-${v}.zip"; - sha256 = "0wacpc00dr57w4lxfvllqa177cnbgy2zmcx8pnf8x62lh6210c40"; + sha256 = "1ilnfm7id8jqg5xmfjhbq81sjxx64av90kwxcs8zv5rp523wpx0v"; }; buildInputs = @@ -20,11 +20,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + ]; + meta = { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = http://opencv.willowgarage.com/; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; + homepage = http://opencv.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [viric flosse]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 97981218478..7f23929efb0 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.openjpeg.org/; description = "Open-source JPEG 2000 codec written in C language"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index b9943b44331..a71709b554b 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = http://pointclouds.org/; description = "Open project for 2D/3D image and point cloud processing"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index 5067a3bd2c2..844c2e58009 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -1,39 +1,28 @@ -{ stdenv, fetchurl, cmake, automoc4, pkgconfig, gst_all_1 -, phonon, qt4 ? null, qt5 ? null, withQt5 ? false }: - -with stdenv.lib; - -assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); +{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gstreamer +, gst_plugins_base }: let - version = "4.8.0"; + version = "4.7.2"; pname = "phonon-backend-gstreamer"; - qt = if withQt5 then qt5 else qt4; - # Force same Qt version in phonon - phonon_ = phonon.override { inherit qt4 qt5 withQt5; }; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/${name}.tar.xz"; - sha256 = "0zjqf1gpj6h9hj27225vihg5gj0fjgvh4n9nkrbij7kf57bcn6gq"; + url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "1cfjk450aajr8hfhnfq7zbmryprxiwr9ha5x585dsh7mja82mdw0"; }; - buildInputs = with gst_all_1; [ phonon_ qt gstreamer gst-plugins-base ]; + buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - cmakeFlags = - [ "-DCMAKE_INSTALL_LIBDIR=lib" - ] ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = { homepage = http://phonon.kde.org/; description = "GStreamer backend for Phonon"; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel ]; - license = licenses.lgpl21Plus; - }; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/poker-eval/default.nix b/pkgs/development/libraries/poker-eval/default.nix new file mode 100644 index 00000000000..1291617ad6f --- /dev/null +++ b/pkgs/development/libraries/poker-eval/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "poker-eval-138.0"; + + src = fetchurl { + url = "http://download.gna.org/pokersource/sources/${name}.tar.gz"; + sha256 = "0s6gvcdwdi6j7nrg6mmb5l971gclk0p99bcbfsynx1gnj159wrcj"; + }; + + patchPhase = '' + sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' Makefile.in + sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' include/Makefile.in + sed -i -e 's#includedir=@includedir@/poker-eval#includedir=@includedir@/#g' poker-eval.pc.in + ''; + + meta = { + homepage = http://pokersource.org/poker-eval/; + description = "poker hand evaluator"; + license = stdenv.lib.licenses.gpl3; + maintainers = [stdenv.lib.maintainers.mtreskin]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 1f820b33e81..dcf453fd8e1 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Graphical effect and filter library for KDE4"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; homepage = "http://${pn}.sourceforge.net"; }; } diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix index 7e51d411bc4..207e3d023f9 100644 --- a/pkgs/development/libraries/sodium/default.nix +++ b/pkgs/development/libraries/sodium/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="sodium"; - version="1.0.0"; + version="1.0.1"; name="${baseName}-${version}"; - hash="19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff"; - url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.0.tar.gz"; - sha256="19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff"; + hash="1x9src824c3ansgvnphhnnnnyrd0spspf7hwmxijv7pglj3hh2f3"; + url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.1.tar.gz"; + sha256="1x9src824c3ansgvnphhnnnnyrd0spspf7hwmxijv7pglj3hh2f3"; }; buildInputs = [ ]; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index 2683a01a290..b4b29b54881 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.freedesktop.org/software/startup-notification; description = "Application startup notification and feedback library"; - license = "BSD"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index d55ea6166e8..c8eb6e3bdab 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://xiph.org/tremor/; description = "Fixed-point version of the Ogg Vorbis decoder"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 9d16edb0f2e..62fce3c1d2d 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ viric bbenoist ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 72efaa0606d..123641ba1ac 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 92a5fd2dc07..c85b959a120 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: +{ stdenv, fetchurl, python, pythonPackages, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: let version = "4.10.2"; # kde410.pykde4 doesn't build with 4.10.3 in @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ python pkgconfig makeWrapper qt4 lndir ]; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ pythonPackages.sip ]; postInstall = '' for i in $out/bin/*; do diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix index 210346062f9..b10852d17f3 100644 --- a/pkgs/development/python-modules/sip/4.16.nix +++ b/pkgs/development/python-modules/sip/4.16.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, isPyPy }: if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "sip-4.16.1"; + name = "sip-4.16.4"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "1hknl71ij924syc9ik9nk4z051q3n75y7w27q9i07awpd39sp7m4"; + sha256 = "1xapklcz5ndilax0gr2h1fqzhdzh7yvxfb3y0rxfcag1qlzl9nnf"; }; configurePhase = '' diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index 447aed27570..0eb728bad28 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -14,16 +14,16 @@ rec { else throw "no snapshot to boostrap for this platform (missing platform url suffix)"; snapshotHash = if stdenv.system == "i686-linux" - then "3204c8a38721199f69d2971db887d1dc71a63825" + then "4dea04e278192c5409f43794a98f20a8f59df2d9" else if stdenv.system == "x86_64-linux" - then "39ca0d02eac184bc764ff9c1f645ca361715c5c2" + then "3e48c573d3c4d26591feb7bfe988174720f08374" else if stdenv.system == "i686-darwin" - then "ebc1836424c4b3ba49f9adef271c50d2a8e134c0" + then "dc3d498c0567af4a0820e91756dcfff8fde0efac" else if stdenv.system == "x86_64-darwin" - then "a2045e95984b65eab4a704152566f8ab9a3be518" + then "f301bd8c3c93a5c88698c69190e464af1525ac96" else throw "no snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-11-22"; + snapshotDate = "2014-12-21"; snapshotName = "cargo-nightly-${platform}.tar.gz"; snapshot = stdenv.mkDerivation { diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 7ba30991d20..4b9a8280f5e 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "1.579"; + version = "1.594"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1l2a8h3js42gkqn8kiysbgrxksqmhmmfp9l4kbrmw609q2wn5119"; + sha256 = "1ypinl78avvir9499xargjbrzxv2b8kspjicsg8xzk5wsymzybn1"; }; meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; diff --git a/pkgs/development/tools/haskell/packdeps/default.nix b/pkgs/development/tools/haskell/packdeps/default.nix new file mode 100644 index 00000000000..292f6af944f --- /dev/null +++ b/pkgs/development/tools/haskell/packdeps/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, filepath, split, tar, text, time }: + +cabal.mkDerivation (self: { + pname = "packdeps"; + version = "0.4.0.3"; + sha256 = "08an9nwg448d3w4yds67l02mgikmjmn52pvva3i386fv4hfkabhp"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal filepath split tar text time ]; + meta = { + homepage = "http://packdeps.haskellers.com/"; + description = "Check your cabal packages for lagging dependencies"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; + }; +}) diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix new file mode 100644 index 00000000000..0e6ca01c625 --- /dev/null +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, xz }: +stdenv.mkDerivation rec { + name = "autoconf-archive-${version}"; + version = "2014.10.15"; + + src = fetchurl { + url = "http://ftp.heanet.ie/mirrors/gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; + sha256 = "198yrdf8bhrpl7insdyzn65zd60qll0gr9vpz7fl7dpcj78yc7gy"; + }; + buildInputs = [ xz ]; + + meta = with stdenv.lib; { + description = "Archive of autoconf m4 macros."; + homepage = http://www.gnu.org/software/autoconf-archive/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/tools/misc/gdb/pstack.nix b/pkgs/development/tools/misc/gdb/pstack.nix deleted file mode 100644 index 12cdc654260..00000000000 --- a/pkgs/development/tools/misc/gdb/pstack.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, gdb }: -stdenv.mkDerivation { - name = "pstack-20120823"; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/pstack <bitmap.width + (this->fs == FS_NORMAL)); +- int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); ++ unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL)); ++ unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL)); + + /* Limit glyph size to prevent overflows later on. */ +@@ -554,6 +554,6 @@ + /* Draw shadow for medium size */ + if (this->fs == FS_NORMAL && !aa) { +- for (int y = 0; y < slot->bitmap.rows; y++) { +- for (int x = 0; x < slot->bitmap.width; x++) { ++ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { ++ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { + if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { + sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; +@@ -564,6 +564,6 @@ + } + +- for (int y = 0; y < slot->bitmap.rows; y++) { +- for (int x = 0; x < slot->bitmap.width; x++) { ++ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { ++ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { + if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { + sprite.data[x + y * sprite.width].m = FACE_COLOUR; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 8a0406203ae..524662a0ee6 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cups, poppler, fontconfig -, libjpeg, libpng, perl, ijs, qpdf, dbus }: +, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash }: stdenv.mkDerivation rec { name = "cups-filters-${version}"; @@ -34,6 +34,13 @@ stdenv.mkDerivation rec { substituteInPlace filter/gstoraster.c --replace execve execvpe ''; + patches = [ + (substituteAll { + src = ./longer-shell-path.patch; + bash = "${bash}/bin/bash"; + }) + ]; + postInstall = '' for i in $out/lib/cups/filter/{pstopdf,texttops,imagetops}; do diff --git a/pkgs/misc/cups/longer-shell-path.patch b/pkgs/misc/cups/longer-shell-path.patch new file mode 100644 index 00000000000..a15fd483225 --- /dev/null +++ b/pkgs/misc/cups/longer-shell-path.patch @@ -0,0 +1,13 @@ +diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c +index 1c019aa..431d2f9 100644 +--- a/filter/foomatic-rip/foomaticrip.c ++++ b/filter/foomatic-rip/foomaticrip.c +@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:" + "/opt/cups/filter:" + "/usr/lib/cups/filter"; + +-char modern_shell[64] = "/bin/bash"; ++char modern_shell[128] = "@bash@"; + + void config_set_option(const char *key, const char *value) + { diff --git a/pkgs/misc/emulators/nestopia/build-fix.patch b/pkgs/misc/emulators/nestopia/build-fix.patch new file mode 100644 index 00000000000..a7d82ead15c --- /dev/null +++ b/pkgs/misc/emulators/nestopia/build-fix.patch @@ -0,0 +1,18 @@ +diff -wbBur rdanbrook-nestopia-f1dde9b/Makefile rdanbrook-nestopia-f1dde9b.my/Makefile +--- rdanbrook-nestopia-f1dde9b/Makefile 2013-01-20 20:10:25.000000000 +0400 ++++ rdanbrook-nestopia-f1dde9b.my/Makefile 2013-01-21 15:18:54.727577673 +0400 +@@ -197,11 +197,11 @@ + install -m 0644 NstDatabase.xml $(DATADIR) + install -m 0644 source/unix/icons/*.png $(DATADIR)/icons + install -m 0644 source/unix/icons/*.svg $(DATADIR)/icons +- install -m 0644 source/unix/icons/nestopia.svg $(PREFIX)/share/pixmaps +- xdg-desktop-menu install --novendor $(DATADIR)/nestopia.desktop ++ install -m 0644 source/unix/icons/nestopia.svg $(PREFIX)/share/pixmaps/nestopia.svg ++ install -Dm0644 $(DATADIR)/nestopia.desktop $(PREFIX)/share/applications/nestopia.desktop + + uninstall: +- xdg-desktop-menu uninstall $(DATADIR)/nestopia.desktop ++ rm $(PREFIX)/share/applications/nestopia.desktop + rm $(PREFIX)/share/pixmaps/nestopia.svg + rm $(BINDIR)/$(BIN) + rm -rf $(DATADIR) diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix new file mode 100644 index 00000000000..f2aa1e06ec8 --- /dev/null +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, SDL2, alsaLib, gtk3, mesa_glu, makeWrapper +, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + name = "nestopia-1.46.2"; + src = fetchurl { + url = https://github.com/rdanbrook/nestopia/archive/1.46.2.tar.gz; + sha256 = "07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p"; + }; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig SDL2 alsaLib gtk3 mesa_glu mesa makeWrapper + libarchive libao unzip xdg_utils gsettings_desktop_schemas ]; + + installPhase = '' + mkdir -p $out/{bin,share/nestopia} + make install PREFIX=$out + ''; + + preFixup = '' + for f in $out/bin/*; do + wrapProgram $f \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + done + ''; + + patches = [ ./build-fix.patch ]; + + meta = { + homepage = http://0ldsk00l.ca/nestopia/; + description = "NES emulator with a focus on accuracy"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ MP2E ]; + }; +} + diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index aa99d696f5f..acbea4ba4eb 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.30"; + version = "1.7.33"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0v08w2av46y4wxrl8q4k9fhbi2cgawjaxclahqnpfw098bqcmxqh"; + sha256 = "0xcjsh3635i8wpzixzsl05m3dkq74vq193x3ipjr3fy0l9prslg3"; }; gecko = fetchurl { diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/gxemul/default.nix index 5cad3c964e4..8538932339c 100644 --- a/pkgs/misc/gxemul/default.nix +++ b/pkgs/misc/gxemul/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl }: +{ stdenv, composableDerivation, fetchurl }: let edf = composableDerivation.edf; name = "gxemul-0.4.6"; @@ -29,9 +29,9 @@ composableDerivation.composableDerivation {} { configurePhase = "./configure"; meta = { - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "A Machine Emulator, mainly emulates MIPS, but supports other CPU types"; - homepage = http://gavare.se/gxemul/; + homepage = http://gxemul.sourceforge.net/; }; mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; }; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 29acf04000c..cb937a94000 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "5.30"; + version = "5.32"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "0ljx10fsypdddcx43lwhrwqa9ksp9djv7p4i1y7760m4frl1fw9p"; + sha256 = "1gckra8lsd383av15r7lv9rszw6mp8n1gpcb5qs5nbrdkl3sclj2"; }; buildInputs = diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index eb8e7cf390a..9f3397fc8ef 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.16"; + version="0.9.18"; name="${baseName}-${version}"; - hash="1213ln6rqb1w0ba98zwi5p40f7gzpz4rqn621zz72v0z1q1vfkrp"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.16-rc1.tar.bz2"; - sha256="1213ln6rqb1w0ba98zwi5p40f7gzpz4rqn621zz72v0z1q1vfkrp"; + hash="0qsjbnx9xzvzcbq7wdcf51v5abi4ml9jsai7w6xmns51qx4325a2"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.18-rc1.tar.bz2"; + sha256="0qsjbnx9xzvzcbq7wdcf51v5abi4ml9jsai7w6xmns51qx4325a2"; }; buildInputs = [ ]; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index a3b2f23c8c7..262b673822b 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to use nl80211"; homepage = http://wireless.kernel.org/en/users/Documentation/iw; - license = "BSD"; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index c0a88c6a495..7d4c741193f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.26"; + version = "3.14.27"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "16sjrpgyl1h812czx1sj06b3krbkb7cxpjmd7snmdd1cc5b8h25q"; + sha256 = "09fxykm280zy3jq2zak6qiglsgv4756ryqwmx23hl014rk8bzszn"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.17.nix b/pkgs/os-specific/linux/kernel/linux-3.17.nix index 8963f006da1..fd21f3c285c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.17.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.17.6"; + version = "3.17.7"; # Remember to update grsecurity! extraMeta.branch = "3.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0z4xai2m8s6zd4mkxsa8dw2ny378y6p9l835z4xj8xwgl30hjaa1"; + sha256 = "074f56sz22wqnn21gamwf63llhsqc2hgb7dzkbkd5gqjx6pfdj53"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ba6fb2a8886..561eadf2f21 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,17 +60,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.26"; - revision = "201412071005"; + { kversion = "3.14.27"; + revision = "201412211908"; branch = "stable"; - sha256 = "1dy98l1kqc20735385pahwksjqmsk4j5vd6d39l61y6rwc9iqfan"; + sha256 = "1xs34v1k970sv4i0a9qjcgk7i4cihl2xlgp1q7v320idpxrcym3a"; }; grsecurity_unstable = grsecPatch - { kversion = "3.17.6"; - revision = "201412071639"; + { kversion = "3.17.7"; + revision = "201412211910"; branch = "test"; - sha256 = "182pr7whmr62bbbpn9dwcmmvvx68dbrkv33cb1dz7d29an7mx67w"; + sha256 = "1s3ksf44mah398ix4ar49m6d8xwkk991pl1m8m441yhpm8h1ss3w"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index dbce7602301..1d4ecdec98d 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: let - version = "2.02.111"; + version = "2.02.114"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "096xjcay4l2ph2dlyknic11pmz65jfgjs34fblqi9xh7zrr3x3vd"; + sha256 = "19bl536yylyi873p46prfwv086bg0sg0q5l4c7x6lnlwzfnb176y"; }; configureFlags = diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 1bbad958bfd..1f046de40ed 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A utility for viewing/manipulating the MAC address of network interfaces"; - maintainer = with stdenv.lib.maintainers; [ joachifm ]; + maintainers = with stdenv.lib.maintainers; [ joachifm ]; license = with stdenv.lib.licenses; gpl2Plus; homepage = "https://www.gnu.org/software/macchanger"; platform = with stdenv.lib.platforms; linux; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index e8dd56ab9e2..9834443a74d 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, docbook2x, docbook_xml_dtd_45 +{ stdenv, fetchurl, pkgconfig, docbook2x, docbook_xml_dtd_45 , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - name = "nftables-0.3"; + name = "nftables-0.4"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "0bww48hc424svxfx3fpqxmbmp0n42ahs1f28f5f6g29d8i2jcdsd"; + sha256 = "0g0x6mf5580kr1azrff0ryxxym43qr72fwir7agmz4b8bjvnkjpn"; }; configureFlags = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; - buildInputs = [ docbook2x flex bison libmnl libnftnl gmp readline ]; + buildInputs = [ pkgconfig docbook2x flex bison libmnl libnftnl gmp readline ]; meta = with stdenv.lib; { description = "the project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh new file mode 100755 index 00000000000..4291116f4ef --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -0,0 +1,107 @@ +source $stdenv/setup + +dontPatchELF=1 # must keep libXv, $out in RPATH + + +unpackFile() { + skip=$(sed 's/^skip=//; t; d' $src) + tail -n +$skip $src | xz -d | tar xvf - + sourceRoot=. +} + + +buildPhase() { + if test -z "$libsOnly"; then + # Create the module. + echo "Building linux driver against kernel: $kernel"; + cd kernel + kernelVersion=$(cd $kernel/lib/modules && ls) + sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) + sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) + unset src # used by the nv makefile + make SYSSRC=$sysSrc SYSOUT=$sysOut module + cd uvm + make SYSSRC=$sysSrc SYSOUT=$sysOut module + cd .. + cd .. + fi +} + + +installPhase() { + + if test -z "$libsOnly"; then + # Install the kernel module. + mkdir -p $out/lib/modules/$kernelVersion/misc + cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc + cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc + + # Install the X driver. + mkdir -p $out/lib/xorg/modules + cp -p libnvidia-wfb.* $out/lib/xorg/modules/ + mkdir -p $out/lib/xorg/modules/drivers + cp -p nvidia_drv.so $out/lib/xorg/modules/drivers + mkdir -p $out/lib/xorg/modules/extensions + cp -p libglx.so.* $out/lib/xorg/modules/extensions + + #patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* + + # Install the programs. + mkdir -p $out/bin + + for i in nvidia-settings nvidia-smi; do + cp $i $out/bin/$i + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + done + + # Header files etc. + mkdir -p $out/include/nvidia + cp -p *.h $out/include/nvidia + + mkdir -p $out/share/man/man1 + cp -p *.1.gz $out/share/man/man1 + rm $out/share/man/man1/nvidia-xconfig.1.gz + + mkdir -p $out/share/applications + cp -p *.desktop $out/share/applications + + mkdir -p $out/share/pixmaps + cp -p nvidia-settings.png $out/share/pixmaps + + # Patch the `nvidia-settings.desktop' file. + substituteInPlace $out/share/applications/nvidia-settings.desktop \ + --replace '__UTILS_PATH__' $out/bin \ + --replace '__PIXMAP_PATH__' $out/share/pixmaps + + # Test a bit. + $out/bin/nvidia-settings --version + fi + + + # Install libGL and friends. + mkdir -p "$out/lib/vendors" + cp -p nvidia.icd $out/lib/vendors/ + + cp -prd *.so.* tls "$out/lib/" + rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately + + for libname in `find "$out/lib/" -name '*.so.*'` + do + # I'm lazy to differentiate needed libs per-library, as the closure is the same. + # Unfortunately --shrink-rpath would strip too much. + patchelf --set-rpath "$out/lib:$allLibPath" "$libname" + + libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` + ln -srnf "$libname" "$libname_short" + ln -srnf "$libname" "$libname_short.1" + done + + #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* + #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* + #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* + #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* +} + + +genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix new file mode 100644 index 00000000000..e1a82da91f4 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +, gtk, atk, pango, glib, gdk_pixbuf +, # Whether to build the libraries only (i.e. not the kernel module or + # nvidia-settings). Used to support 32-bit binaries on 64-bit + # Linux. + libsOnly ? false +}: + +with stdenv.lib; + +assert (!libsOnly) -> kernel != null; + +let + + versionNumber = "343.36"; + # Policy: use the highest stable version as the default (on our master). + inherit (stdenv.lib) makeLibraryPath; +in + +stdenv.mkDerivation { + name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; + + builder = ./builder.sh; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; + sha256 = "17l23dp725883xcyy1n178pcl6lj27psrgbxymc356x2pngwkhcc"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; + sha256 = "0djvh9wmazrfvpgyiqrz81kjk2war20xyjjr2kncxyplzk28mw97"; + } + else throw "nvidia-x11 does not support platform ${stdenv.system}"; + + inherit versionNumber libsOnly; + + kernel = if libsOnly then null else kernel.dev; + + dontStrip = true; + + glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + cudaPath = makeLibraryPath [zlib stdenv.gcc.gcc]; + openclPath = makeLibraryPath [zlib]; + allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.gcc.gcc]; + + programPath = optionalString (!libsOnly) (makeLibraryPath + [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); + + buildInputs = [ perl ]; + + meta = with stdenv.lib.meta; { + homepage = http://www.nvidia.com/object/unix.html; + description = "X.org driver and kernel module for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 9acaee797f0..bec329a1a17 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "304.123"; in +let versionNumber = "304.125"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "09gljwxw14img7hw0xdxd24cvpvlymdxssmxa9gikdrw2w04j0ym"; + sha256 = "1xy4g3yc73mb932cfr25as648k12sxpyymppb8nia3lijakv7idf"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0vxw4gp78g06h5inwkhl989p9mq0m8rqipz9a67rdc4s364r243s"; + sha256 = "08p6hikn7pbfg0apnsbaqyyh2s9m5r0ckqzgjvxirn5qcyll0g5a"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index ad0c0c0b367..fd68b9aafde 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "340.58"; + versionNumber = "340.65"; /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them. Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs, will be included in 340.* legacy releases through the end of 2019. @@ -29,12 +29,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0nzvfqn3cv2n486i38r3badd5jlmfv7x6k9s47calrqnd3q8zi3w"; + sha256 = "0wyrxhkfyjpa0l5xxpy4g9h3c34dv5bqif8nk70cm53pbm1i31g7"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0h78wmb1yyr1xah6x22ifk9gzd2jvg3vhhg091nvyhcvpmbjq806"; + sha256 = "0yabf3d3aq2qmlzxw99y5lasdm5y7dq2n7l3gvak8iqx0k9cihh3"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/ocz-toolbox/default.nix b/pkgs/os-specific/linux/ocz-toolbox/default.nix new file mode 100644 index 00000000000..b41fc34be3e --- /dev/null +++ b/pkgs/os-specific/linux/ocz-toolbox/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, libXrender, fontconfig, freetype, libXext, libX11 }: + +let arch = if stdenv.system == "x86_64-linux" then "64" + else if stdenv.system == "i686-linux" then "32" + else abort "OCZ Toolbox only support {x86-64,i686}-linux targets"; +in stdenv.mkDerivation rec { + version = "4.9.0.634"; + name = "ocz-toolbox-${version}"; + + src = fetchurl { + url = "http://ocz.com/consumer/download/firmware/OCZToolbox_v${version}_linux.tar.gz"; + sha256 = "0h51p5bg9h2smxxy1r4xkzzjjavhgql7yy12qmjk0vbh13flgx3y"; + }; + + prePatch = '' + cd linux${arch} + ''; + + libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc libXrender fontconfig freetype libXext libX11 ]; + + installPhase = '' + install -Dm755 OCZToolbox $out/bin/OCZToolbox + patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "$libPath" \ + $out/bin/OCZToolbox + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "Update firmware and BIOS, secure erase, view SMART attributes, and view drive details of your OCZ SSD"; + homepage = "http://ocz.com/consumer/download/firmware"; + license = licenses.unfree; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 1398b91303b..6b9526c15b2 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.1.91"; + version = "0.1.93"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "0a34zinw54nkxawby847yzc3wzbw4dgi849pvwyd28391pxpxayy"; + sha256 = "0rcbls1i82z2mwd3kcsidvhbb0xf0f4p7l2z3168wbpsh5nm9clz"; }; buildInputs = [ cmake zlib luajit diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 69940ceb132..28d6f0b21a8 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, gettext, bzip2 }: - stdenv.mkDerivation rec { - name = "sysstat-11.0.1"; + name = "sysstat-11.0.2"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "1cwgsxvs7jkr3il6r344mw46502yjnhrsbcp4217vh4b7xv6czaq"; + sha256 = "15hv3ylr5i6nrrdhyjnp4xld51gpv0cn3hjgy6068ybwpvgpzn5c"; }; buildInputs = [ gettext ]; @@ -15,10 +14,13 @@ stdenv.mkDerivation rec { export PATH_CHKCONFIG=/no-such-program export BZIP=${bzip2}/bin/bzip2 export SYSTEMCTL=systemctl - makeFlagsArray=(DESTDIR=$out SYSCONFIG_DIR=$out/etc IGNORE_MAN_GROUP=y CHOWN=true) - installTargets="install_base install_nls install_man" ''; + makeFlags = "SYSCONFIG_DIR=$(out)/etc IGNORE_MAN_GROUP=y CHOWN=true"; + installTargets = "install_base install_nls install_man"; + + patches = [ ./install.patch ]; + meta = { homepage = http://sebastien.godard.pagesperso-orange.fr/; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; diff --git a/pkgs/os-specific/linux/sysstat/install.patch b/pkgs/os-specific/linux/sysstat/install.patch new file mode 100644 index 00000000000..473fa30b98b --- /dev/null +++ b/pkgs/os-specific/linux/sysstat/install.patch @@ -0,0 +1,13 @@ +diff -rc sysstat-11.0.1/Makefile.in sysstat-11.0.1-new/Makefile.in +*** sysstat-11.0.1/Makefile.in 2014-08-30 15:38:39.000000000 +0200 +--- sysstat-11.0.1-new/Makefile.in 2014-12-18 14:40:45.466349009 +0100 +*************** +*** 331,337 **** + install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \ + contrib/isag/isag + mkdir -p $(DESTDIR)$(SA_LIB_DIR) +- mkdir -p $(DESTDIR)$(SA_DIR) + ifeq ($(CLEAN_SA_DIR),y) + find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \ + -exec rm -f {} \; +--- 331,336 ---- diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2df23cf0e16..ef8d5891d25 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -20,11 +20,8 @@ stdenv.mkDerivation rec { patches = [ # These are all changes between upstream and - # https://github.com/edolstra/systemd/tree/nixos-v216. + # https://github.com/edolstra/systemd/tree/nixos-v217. ./fixes.patch - # Fixes systemd-journald so that it does not get killed - # by systemd-journal-flush starting too quickly - ./systemd-journald-type-notify.patch ]; buildInputs = diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch index ff31b4a75d4..182927486c5 100644 --- a/pkgs/os-specific/linux/systemd/fixes.patch +++ b/pkgs/os-specific/linux/systemd/fixes.patch @@ -13,6 +13,186 @@ index e30d9a8..a3d399b 100644 # Ignore raid devices that are not yet assembled and started SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0" SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0" +diff --git a/src/core/job.c b/src/core/job.c +index eaa4bb1..db44fee 100644 +--- a/src/core/job.c ++++ b/src/core/job.c +@@ -352,6 +352,9 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) { + return + b == UNIT_ACTIVATING; + ++ case JOB_NOP: ++ return true; ++ + default: + assert_not_reached("Invalid job type"); + } +diff --git a/src/core/job.h b/src/core/job.h +index 1e7c61b..ee8e54a 100644 +--- a/src/core/job.h ++++ b/src/core/job.h +@@ -49,9 +49,11 @@ enum JobType { + _JOB_TYPE_MAX_MERGING, + + /* JOB_NOP can enter into a transaction, but as it won't pull in +- * any dependencies, it won't have to merge with anything. +- * job_install() avoids the problem of merging JOB_NOP too (it's +- * special-cased, only merges with other JOB_NOPs). */ ++ * any dependencies and it uses the special 'nop_job' slot in Unit, ++ * it won't have to merge with anything (except possibly into another ++ * JOB_NOP, previously installed). JOB_NOP is special-cased in ++ * job_type_is_*() functions so that the transaction can be ++ * activated. */ + JOB_NOP = _JOB_TYPE_MAX_MERGING, /* do nothing */ + + _JOB_TYPE_MAX_IN_TRANSACTION, +@@ -190,11 +192,15 @@ _pure_ static inline bool job_type_is_mergeable(JobType a, JobType b) { + } + + _pure_ static inline bool job_type_is_conflicting(JobType a, JobType b) { +- return !job_type_is_mergeable(a, b); ++ return a != JOB_NOP && b != JOB_NOP && !job_type_is_mergeable(a, b); + } + + _pure_ static inline bool job_type_is_superset(JobType a, JobType b) { + /* Checks whether operation a is a "superset" of b in its actions */ ++ if (b == JOB_NOP) ++ return true; ++ if (a == JOB_NOP) ++ return false; + return a == job_type_lookup_merge(a, b); + } + +diff --git a/src/core/manager.c b/src/core/manager.c +index d427d88..256d6f7 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -662,9 +662,11 @@ static int manager_setup_notify(Manager *m) { + return -errno; + } + +- if (m->running_as == SYSTEMD_SYSTEM) ++ if (m->running_as == SYSTEMD_SYSTEM) { + m->notify_socket = strdup("/run/systemd/notify"); +- else { ++ if (!m->notify_socket) ++ return log_oom(); ++ } else { + const char *e; + + e = getenv("XDG_RUNTIME_DIR"); +@@ -674,9 +676,11 @@ static int manager_setup_notify(Manager *m) { + } + + m->notify_socket = strappend(e, "/systemd/notify"); ++ if (!m->notify_socket) ++ return log_oom(); ++ ++ mkdir_parents_label(m->notify_socket, 0755); + } +- if (!m->notify_socket) +- return log_oom(); + + strncpy(sa.un.sun_path, m->notify_socket, sizeof(sa.un.sun_path)-1); + r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)); +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index 20cf526..03cfddc 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -75,7 +75,9 @@ static int parse_argv(int argc, char *argv[]) { + assert(argc >= 1); + assert(argv); + +- while ((c = getopt_long(argc, argv, "", options, NULL)) >= 0) ++ /* "-" prevents getopt from permuting argv[] and moving the verb away ++ * from argv[1]. Our interface to initrd promises it'll be there. */ ++ while ((c = getopt_long(argc, argv, "-", options, NULL)) >= 0) + switch (c) { + + case ARG_LOG_LEVEL: +@@ -113,6 +115,13 @@ static int parse_argv(int argc, char *argv[]) { + + break; + ++ case '\001': ++ if (!arg_verb) ++ arg_verb = optarg; ++ else ++ log_error("Excess arguments, ignoring"); ++ break; ++ + case '?': + return -EINVAL; + +@@ -120,15 +129,11 @@ static int parse_argv(int argc, char *argv[]) { + assert_not_reached("Unhandled option code."); + } + +- if (optind >= argc) { ++ if (!arg_verb) { + log_error("Verb argument missing."); + return -EINVAL; + } + +- arg_verb = argv[optind]; +- +- if (optind + 1 < argc) +- log_error("Excess arguments, ignoring"); + return 0; + } + +diff --git a/src/core/snapshot.c b/src/core/snapshot.c +index 5eed615..c2678cb 100644 +--- a/src/core/snapshot.c ++++ b/src/core/snapshot.c +@@ -208,7 +208,7 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, sd_bus_error *e, + return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s lacks snapshot suffix.", name); + + if (manager_get_unit(m, name)) +- sd_bus_error_setf(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name); ++ return sd_bus_error_setf(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name); + + } else { + +diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in +index d5b86bf..9c66e7b 100644 +--- a/src/core/systemd.pc.in ++++ b/src/core/systemd.pc.in +@@ -14,8 +14,8 @@ systemduserunitdir=@userunitdir@ + systemduserpresetdir=@userpresetdir@ + systemdsystemconfdir=@pkgsysconfdir@/system + systemduserconfdir=@pkgsysconfdir@/user +-systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system +-systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user ++systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/system:${systemdsystemunitdir} ++systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/user:${systemduserunitdir} + systemdsystemgeneratordir=@systemgeneratordir@ + systemdusergeneratordir=@usergeneratordir@ + systemdsleepdir=@systemsleepdir@ +diff --git a/src/core/timer.c b/src/core/timer.c +index a3713e2..5c4e9f9 100644 +--- a/src/core/timer.c ++++ b/src/core/timer.c +@@ -521,6 +521,7 @@ fail: + + static int timer_start(Unit *u) { + Timer *t = TIMER(u); ++ TimerValue *v; + + assert(t); + assert(t->state == TIMER_DEAD || t->state == TIMER_FAILED); +@@ -530,6 +531,11 @@ static int timer_start(Unit *u) { + + t->last_trigger = DUAL_TIMESTAMP_NULL; + ++ /* Reenable all timers that depend on unit activation time */ ++ LIST_FOREACH(value, v, t->values) ++ if (v->base == TIMER_ACTIVE) ++ v->disabled = false; ++ + if (t->stamp_path) { + struct stat st; + diff --git a/src/core/umount.c b/src/core/umount.c index cffa453..4d1a9ff 100644 --- a/src/core/umount.c @@ -26,6 +206,19 @@ index cffa453..4d1a9ff 100644 #ifndef HAVE_SPLIT_USR || path_equal(m->path, "/usr") #endif +diff --git a/src/delta/delta.c b/src/delta/delta.c +index 25c4a0b..e1f2d6d 100644 +--- a/src/delta/delta.c ++++ b/src/delta/delta.c +@@ -487,7 +487,7 @@ static int parse_flags(const char *flag_str, int flags) { + const char *word, *state; + size_t l; + +- FOREACH_WORD(word, l, flag_str, state) { ++ FOREACH_WORD_SEPARATOR(word, l, flag_str, ",", state) { + if (strneq("masked", word, l)) + flags |= SHOW_MASKED; + else if (strneq ("equivalent", word, l)) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 70a5918..1926e52 100644 --- a/src/fsck/fsck.c @@ -40,19 +233,377 @@ index 70a5918..1926e52 100644 cmdline[i++] = "-T"; /* +diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c +index e257c12..1e04553 100644 +--- a/src/fstab-generator/fstab-generator.c ++++ b/src/fstab-generator/fstab-generator.c +@@ -485,7 +485,7 @@ static int add_usr_mount(void) { + return log_oom(); + } + +- if (!arg_usr_what || !arg_usr_options) ++ if (!arg_usr_what) + return 0; + + what = fstab_node_to_udev_node(arg_usr_what); +@@ -494,7 +494,13 @@ static int add_usr_mount(void) { + return -1; + } + +- opts = arg_usr_options; ++ if (!arg_usr_options) ++ opts = arg_root_rw > 0 ? "rw" : "ro"; ++ else if (!mount_test_option(arg_usr_options, "ro") && ++ !mount_test_option(arg_usr_options, "rw")) ++ opts = strappenda(arg_usr_options, ",", arg_root_rw > 0 ? "rw" : "ro"); ++ else ++ opts = arg_usr_options; + + log_debug("Found entry what=%s where=/sysroot/usr type=%s", what, strna(arg_usr_fstype)); + return add_mount(what, +diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c +index e487369..ff4e9c9 100644 +--- a/src/hostname/hostnamectl.c ++++ b/src/hostname/hostnamectl.c +@@ -536,5 +536,5 @@ int main(int argc, char *argv[]) { + r = hostnamectl_main(bus, argc, argv); + + finish: +- return r < 0 ? EXIT_FAILURE : r; ++ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + } +diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c +index 8a2c0fc..9de3ddd 100644 +--- a/src/journal/journal-file.c ++++ b/src/journal/journal-file.c +@@ -1657,7 +1657,7 @@ static int generic_array_bisect( + } + } + +- if (k > n) { ++ if (k >= n) { + if (direction == DIRECTION_UP) { + i = n; + subtract_one = true; +diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c +index f50faf4..03579fd 100644 +--- a/src/journal/journalctl.c ++++ b/src/journal/journalctl.c +@@ -682,7 +682,7 @@ static int parse_argv(int argc, char *argv[]) { + assert_not_reached("Unhandled option"); + } + +- if (arg_follow && !arg_no_tail && arg_lines == ARG_LINES_DEFAULT) ++ if (arg_follow && !arg_no_tail && !arg_since && arg_lines == ARG_LINES_DEFAULT) + arg_lines = 10; + + if (!!arg_directory + !!arg_file + !!arg_machine > 1) { +diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c +index 12735c4..08b143b 100644 +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -1655,6 +1655,7 @@ void server_done(Server *s) { + free(s->buffer); + free(s->tty_path); + free(s->cgroup_root); ++ free(s->hostname_field); + + if (s->mmap) + mmap_cache_unref(s->mmap); +diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c +index 372f3ed..d56ee51 100644 +--- a/src/libsystemd-network/network-internal.c ++++ b/src/libsystemd-network/network-internal.c +@@ -392,10 +392,12 @@ void serialize_dhcp_routes(FILE *f, const char *key, struct sd_dhcp_route *route + + fprintf(f, "%s=", key); + +- for (i = 0; i < size; i++) +- fprintf(f, "%s/%" PRIu8 ",%s%s", inet_ntoa(routes[i].dst_addr), +- routes[i].dst_prefixlen, inet_ntoa(routes[i].gw_addr), ++ for (i = 0; i < size; i++) { ++ fprintf(f, "%s/%" PRIu8, inet_ntoa(routes[i].dst_addr), ++ routes[i].dst_prefixlen); ++ fprintf(f, ",%s%s", inet_ntoa(routes[i].gw_addr), + (i < (size - 1)) ? " ": ""); ++ } + + fputs("\n", f); + } +diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c +index 0eba4c3..9986b52 100644 +--- a/src/libsystemd-network/sd-dhcp-client.c ++++ b/src/libsystemd-network/sd-dhcp-client.c +@@ -68,7 +68,6 @@ struct sd_dhcp_client { + uint32_t mtu; + uint32_t xid; + usec_t start_time; +- uint16_t secs; + unsigned int attempt; + usec_t request_sent; + sd_event_source *timeout_t1; +@@ -321,10 +320,12 @@ static int client_message_init(sd_dhcp_client *client, DHCPPacket **ret, + _cleanup_free_ DHCPPacket *packet; + size_t optlen, optoffset, size; + be16_t max_size; ++ usec_t time_now; ++ uint16_t secs; + int r; + + assert(client); +- assert(client->secs); ++ assert(client->start_time); + assert(ret); + assert(_optlen); + assert(_optoffset); +@@ -344,7 +345,15 @@ static int client_message_init(sd_dhcp_client *client, DHCPPacket **ret, + + /* Although 'secs' field is a SHOULD in RFC 2131, certain DHCP servers + refuse to issue an DHCP lease if 'secs' is set to zero */ +- packet->dhcp.secs = htobe16(client->secs); ++ r = sd_event_now(client->event, clock_boottime_or_monotonic(), &time_now); ++ if (r < 0) ++ return r; ++ assert(time_now >= client->start_time); ++ ++ /* seconds between sending first and last DISCOVER ++ * must always be strictly positive to deal with broken servers */ ++ secs = ((time_now - client->start_time) / USEC_PER_SEC) ? : 1; ++ packet->dhcp.secs = htobe16(secs); + + /* RFC2132 section 4.1 + A client that cannot receive unicast IP datagrams until its protocol +@@ -441,24 +450,12 @@ static int dhcp_client_send_raw(sd_dhcp_client *client, DHCPPacket *packet, + static int client_send_discover(sd_dhcp_client *client) { + _cleanup_free_ DHCPPacket *discover = NULL; + size_t optoffset, optlen; +- usec_t time_now; + int r; + + assert(client); + assert(client->state == DHCP_STATE_INIT || + client->state == DHCP_STATE_SELECTING); + +- /* See RFC2131 section 4.4.1 */ +- +- r = sd_event_now(client->event, clock_boottime_or_monotonic(), &time_now); +- if (r < 0) +- return r; +- assert(time_now >= client->start_time); +- +- /* seconds between sending first and last DISCOVER +- * must always be strictly positive to deal with broken servers */ +- client->secs = ((time_now - client->start_time) / USEC_PER_SEC) ? : 1; +- + r = client_message_init(client, &discover, DHCP_DISCOVER, + &optlen, &optoffset); + if (r < 0) +@@ -875,10 +872,8 @@ static int client_start(sd_dhcp_client *client) { + } + client->fd = r; + +- if (client->state == DHCP_STATE_INIT) { ++ if (client->state == DHCP_STATE_INIT || client->state == DHCP_STATE_INIT_REBOOT) + client->start_time = now(clock_boottime_or_monotonic()); +- client->secs = 0; +- } + + return client_initialize_events(client, client_receive_message_raw); + } +@@ -1269,6 +1264,9 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, + if (r >= 0) { + client->timeout_resend = + sd_event_source_unref(client->timeout_resend); ++ client->receive_message = ++ sd_event_source_unref(client->receive_message); ++ client->fd = asynchronous_close(client->fd); + + if (IN_SET(client->state, DHCP_STATE_REQUESTING, + DHCP_STATE_REBOOTING)) +diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c +index 4fb01c0..b7c9a07 100644 +--- a/src/libsystemd-network/sd-dhcp-lease.c ++++ b/src/libsystemd-network/sd-dhcp-lease.c +@@ -50,7 +50,7 @@ int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) { + + int sd_dhcp_lease_get_lifetime(sd_dhcp_lease *lease, uint32_t *lifetime) { + assert_return(lease, -EINVAL); +- assert_return(lease, -EINVAL); ++ assert_return(lifetime, -EINVAL); + + *lifetime = lease->lifetime; + +diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c +index fa4f9b5..dbec1a2 100644 +--- a/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libsystemd-network/sd-dhcp6-client.c +@@ -200,19 +200,19 @@ int sd_dhcp6_client_set_duid(sd_dhcp6_client *client, uint16_t type, uint8_t *du + + switch (type) { + case DHCP6_DUID_LLT: +- if (duid_len <= sizeof(client->duid.llt)) ++ if (duid_len <= sizeof(client->duid.llt) - 2) + return -EINVAL; + break; + case DHCP6_DUID_EN: +- if (duid_len != sizeof(client->duid.en)) ++ if (duid_len != sizeof(client->duid.en) - 2) + return -EINVAL; + break; + case DHCP6_DUID_LL: +- if (duid_len <= sizeof(client->duid.ll)) ++ if (duid_len <= sizeof(client->duid.ll) - 2) + return -EINVAL; + break; + case DHCP6_DUID_UUID: +- if (duid_len != sizeof(client->duid.uuid)) ++ if (duid_len != sizeof(client->duid.uuid) - 2) + return -EINVAL; + break; + default: +@@ -222,7 +222,7 @@ int sd_dhcp6_client_set_duid(sd_dhcp6_client *client, uint16_t type, uint8_t *du + + client->duid.raw.type = htobe16(type); + memcpy(&client->duid.raw.data, duid, duid_len); +- client->duid_len = duid_len; ++ client->duid_len = duid_len + 2; /* +2 for sizeof(type) */ + + return 0; + } +diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c +index 18afe0f..5658c61 100644 +--- a/src/libsystemd/sd-bus/bus-match.c ++++ b/src/libsystemd/sd-bus/bus-match.c +@@ -537,7 +537,7 @@ static int bus_match_find_compare_value( + else if (BUS_MATCH_CAN_HASH(t)) + n = hashmap_get(c->compare.children, value_str); + else { +- for (n = c->child; !value_node_same(n, t, value_u8, value_str); n = n->next) ++ for (n = c->child; n && !value_node_same(n, t, value_u8, value_str); n = n->next) + ; + } + +diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c +index 0ab1119..6c3230a 100644 +--- a/src/libsystemd/sd-bus/bus-objects.c ++++ b/src/libsystemd/sd-bus/bus-objects.c +@@ -617,6 +617,9 @@ static int property_get_set_callbacks_run( + return r; + + } else { ++ const char *signature = NULL; ++ char type = 0; ++ + if (c->vtable->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY) + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_PROPERTY_READ_ONLY, "Property '%s' is not writable.", c->member); + +@@ -628,6 +631,13 @@ static int property_get_set_callbacks_run( + + c->last_iteration = bus->iteration_counter; + ++ r = sd_bus_message_peek_type(m, &type, &signature); ++ if (r < 0) ++ return r; ++ ++ if (type != 'v' || !streq(strempty(signature), strempty(c->vtable->x.property.signature))) ++ return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Incorrect parameters for property '%s', expected '%s', got '%s'.", c->member, strempty(c->vtable->x.property.signature), strempty(signature)); ++ + r = sd_bus_message_enter_container(m, 'v', c->vtable->x.property.signature); + if (r < 0) + return r; +diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c +index b501a52..740133a 100644 +--- a/src/libsystemd/sd-rtnl/rtnl-message.c ++++ b/src/libsystemd/sd-rtnl/rtnl-message.c +@@ -36,6 +36,8 @@ + #define GET_CONTAINER(m, i) ((i) < (m)->n_containers ? (struct rtattr*)((uint8_t*)(m)->hdr + (m)->container_offsets[i]) : NULL) + #define PUSH_CONTAINER(m, new) (m)->container_offsets[(m)->n_containers ++] = (uint8_t*)(new) - (uint8_t*)(m)->hdr; + ++#define RTA_TYPE(rta) ((rta)->rta_type & NLA_TYPE_MASK) ++ + static int message_new_empty(sd_rtnl *rtnl, sd_rtnl_message **ret) { + sd_rtnl_message *m; + +@@ -566,8 +568,8 @@ int sd_rtnl_message_append_string(sd_rtnl_message *m, unsigned short type, const + size = (size_t)r; + + if (size) { +- length = strnlen(data, size); +- if (length >= size) ++ length = strnlen(data, size+1); ++ if (length > size) + return -EINVAL; + } else + length = strlen(data); +@@ -1066,7 +1068,7 @@ int rtnl_message_parse(sd_rtnl_message *m, + *rta_tb_size = max + 1; + + for (; RTA_OK(rta, rt_len); rta = RTA_NEXT(rta, rt_len)) { +- type = rta->rta_type; ++ type = RTA_TYPE(rta); + + /* if the kernel is newer than the headers we used + when building, we ignore out-of-range attributes +@@ -1222,7 +1224,7 @@ int socket_read_message(sd_rtnl *rtnl) { + } + } + +- for (new_msg = rtnl->rbuffer; NLMSG_OK(new_msg, len); new_msg = NLMSG_NEXT(new_msg, len)) { ++ for (new_msg = rtnl->rbuffer; NLMSG_OK(new_msg, len) && !done; new_msg = NLMSG_NEXT(new_msg, len)) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; + const NLType *nl_type; + +@@ -1237,7 +1239,8 @@ int socket_read_message(sd_rtnl *rtnl) { + if (new_msg->nlmsg_type == NLMSG_DONE) { + /* finished reading multi-part message */ + done = true; +- break; ++ ++ continue; + } + + /* check that we support this message type */ +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index 2699374..e2afcb8 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -730,8 +730,13 @@ _public_ struct udev_device *udev_device_new_from_syspath(struct udev *udev, con + return NULL; + } else { + /* everything else just needs to be a directory */ +- if (stat(path, &statbuf) != 0 || !S_ISDIR(statbuf.st_mode)) ++ if (stat(path, &statbuf) != 0) + return NULL; ++ ++ if (!S_ISDIR(statbuf.st_mode)) { ++ errno = EISDIR; ++ return NULL; ++ } + } + + udev_device = udev_device_new(udev); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index b6d9bc6..04fbe57 100644 +index b6d9bc6..759794f 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -758,7 +758,7 @@ static int mount_binds(const char *dest, +@@ -758,7 +758,7 @@ static int mount_binds(const char *dest, char **l, bool ro) { * and char devices. */ if (S_ISDIR(source_st.st_mode)) { r = mkdir_label(where, 0755); - if (r < 0) { -+ if (r < 0 && r != -EEXIST) { ++ if (r < 0 && errno != EEXIST) { log_error("Failed to create mount point %s: %s", where, strerror(-r)); - + return r; +@@ -818,7 +818,7 @@ static int mount_tmpfs(const char *dest) { + return log_oom(); + + r = mkdir_label(where, 0755); +- if (r < 0) { ++ if (r < 0 && errno != EEXIST) { + log_error("creating mount point for tmpfs %s failed: %s", where, strerror(-r)); + + return r; @@ -3073,6 +3073,7 @@ int main(int argc, char *argv[]) { goto finish; } @@ -69,8 +620,234 @@ index b6d9bc6..04fbe57 100644 } } else { char template[] = "/tmp/nspawn-root-XXXXXX"; +diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c +index 7375f77..ec8efcc 100644 +--- a/src/resolve/resolved-dns-packet.c ++++ b/src/resolve/resolved-dns-packet.c +@@ -866,7 +866,7 @@ fail: + + int dns_packet_read_name(DnsPacket *p, char **_ret, + bool allow_compression, size_t *start) { +- size_t saved_rindex, after_rindex = 0; ++ size_t saved_rindex, after_rindex = 0, jump_barrier; + _cleanup_free_ char *ret = NULL; + size_t n = 0, allocated = 0; + bool first = true; +@@ -876,6 +876,7 @@ int dns_packet_read_name(DnsPacket *p, char **_ret, + assert(_ret); + + saved_rindex = p->rindex; ++ jump_barrier = p->rindex; + + for (;;) { + uint8_t c, d; +@@ -922,7 +923,7 @@ int dns_packet_read_name(DnsPacket *p, char **_ret, + goto fail; + + ptr = (uint16_t) (c & ~0xc0) << 8 | (uint16_t) d; +- if (ptr < DNS_PACKET_HEADER_SIZE || ptr >= saved_rindex) { ++ if (ptr < DNS_PACKET_HEADER_SIZE || ptr >= jump_barrier) { + r = -EBADMSG; + goto fail; + } +@@ -930,9 +931,13 @@ int dns_packet_read_name(DnsPacket *p, char **_ret, + if (after_rindex == 0) + after_rindex = p->rindex; + ++ /* Jumps are limited to a "prior occurence" (RFC-1035 4.1.4) */ ++ jump_barrier = ptr; + p->rindex = ptr; +- } else ++ } else { ++ r = -EBADMSG; + goto fail; ++ } + } + + if (!GREEDY_REALLOC(ret, allocated, n + 1)) { +diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c +index 7d258c9..6dd4cad 100644 +--- a/src/resolve/resolved.c ++++ b/src/resolve/resolved.c +@@ -108,7 +108,7 @@ int main(int argc, char *argv[]) { + + finish: + sd_notify(false, +- "STOPPIN=1\n" ++ "STOPPING=1\n" + "STATUS=Shutting down..."); + + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +diff --git a/src/run/run.c b/src/run/run.c +index e3b6293..dcefb5c 100644 +--- a/src/run/run.c ++++ b/src/run/run.c +@@ -573,9 +573,12 @@ int main(int argc, char* argv[]) { + if (r <= 0) + goto finish; + +- r = find_binary(argv[optind], &command); ++ r = find_binary(argv[optind], arg_transport == BUS_TRANSPORT_LOCAL, &command); + if (r < 0) { +- log_error("Failed to find executable %s: %s", argv[optind], strerror(-r)); ++ log_error("Failed to find executable %s%s: %s", ++ argv[optind], ++ arg_transport == BUS_TRANSPORT_LOCAL ? "" : " on local system", ++ strerror(-r)); + goto finish; + } + argv[optind] = command; +diff --git a/src/shared/install.c b/src/shared/install.c +index 035b44c..cab93e8 100644 +--- a/src/shared/install.c ++++ b/src/shared/install.c +@@ -1620,12 +1620,10 @@ int unit_file_enable( + STRV_FOREACH(i, files) { + UnitFileState state; + ++ /* We only want to know if this unit is masked, so we ignore ++ * errors from unit_file_get_state, deferring other checks. ++ * This allows templated units to be enabled on the fly. */ + state = unit_file_get_state(scope, root_dir, *i); +- if (state < 0) { +- log_error("Failed to get unit file state for %s: %s", *i, strerror(-state)); +- return state; +- } +- + if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) { + log_error("Failed to enable unit: Unit %s is masked", *i); + return -ENOTSUP; +diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c +index 8f75a8e..c800e01 100644 +--- a/src/shared/path-lookup.c ++++ b/src/shared/path-lookup.c +@@ -86,17 +86,14 @@ static char** user_dirs( + const char * const config_unit_paths[] = { + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", + NULL + }; + + const char * const runtime_unit_path = "/run/systemd/user"; + + const char * const data_unit_paths[] = { +- "/usr/local/lib/systemd/user", +- "/usr/local/share/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", +- "/usr/share/systemd/user", + NULL + }; + +@@ -260,13 +257,11 @@ int lookup_paths_init( + STRV_IFNOTNULL(generator_early), + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", ++ "/nix/var/nix/profiles/default/lib/systemd/user", + "/run/systemd/user", + STRV_IFNOTNULL(generator), +- "/usr/local/lib/systemd/user", +- "/usr/local/share/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", +- "/usr/share/systemd/user", + STRV_IFNOTNULL(generator_late), + NULL); + } else +@@ -276,14 +271,11 @@ int lookup_paths_init( + STRV_IFNOTNULL(generator_early), + SYSTEM_CONFIG_UNIT_PATH, + "/etc/systemd/system", ++ "/etc/systemd-mutable/system", ++ "/nix/var/nix/profiles/default/lib/systemd/system", + "/run/systemd/system", + STRV_IFNOTNULL(generator), +- "/usr/local/lib/systemd/system", + SYSTEM_DATA_UNIT_PATH, +- "/usr/lib/systemd/system", +-#ifdef HAVE_SPLIT_USR +- "/lib/systemd/system", +-#endif + STRV_IFNOTNULL(generator_late), + NULL); + +diff --git a/src/shared/path-util.c b/src/shared/path-util.c +index 67566bc..be03695 100644 +--- a/src/shared/path-util.c ++++ b/src/shared/path-util.c +@@ -563,11 +563,11 @@ int path_is_os_tree(const char *path) { + return r >= 0; + } + +-int find_binary(const char *name, char **filename) { ++int find_binary(const char *name, bool local, char **filename) { + assert(name); + + if (is_path(name)) { +- if (access(name, X_OK) < 0) ++ if (local && access(name, X_OK) < 0) + return -errno; + + if (filename) { +@@ -657,7 +657,7 @@ int fsck_exists(const char *fstype) { + + checker = strappenda("fsck.", fstype); + +- r = find_binary(checker, &p); ++ r = find_binary(checker, true, &p); + if (r < 0) + return r; + +diff --git a/src/shared/path-util.h b/src/shared/path-util.h +index 8d171a5..bd0d324 100644 +--- a/src/shared/path-util.h ++++ b/src/shared/path-util.h +@@ -55,7 +55,7 @@ int path_is_mount_point(const char *path, bool allow_symlink); + int path_is_read_only_fs(const char *path); + int path_is_os_tree(const char *path); + +-int find_binary(const char *name, char **filename); ++int find_binary(const char *name, bool local, char **filename); + + bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool update); + +diff --git a/src/shared/virt.c b/src/shared/virt.c +index f9c4e67..f10baab 100644 +--- a/src/shared/virt.c ++++ b/src/shared/virt.c +@@ -293,8 +293,26 @@ int detect_container(const char **id) { + + r = read_one_line_file("/run/systemd/container", &m); + if (r == -ENOENT) { +- r = 0; +- goto finish; ++ ++ /* Fallback for cases where PID 1 was not ++ * systemd (for example, cases where ++ * init=/bin/sh is used. */ ++ ++ r = getenv_for_pid(1, "container", &m); ++ if (r <= 0) { ++ ++ /* If that didn't work, give up, ++ * assume no container manager. ++ * ++ * Note: This means we still cannot ++ * detect containers if init=/bin/sh ++ * is passed but privileges dropped, ++ * as /proc/1/environ is only readable ++ * with privileges. */ ++ ++ r = 0; ++ goto finish; ++ } + } + if (r < 0) + return r; diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 28eaa6a..6292c09 100644 +index 28eaa6a..3866308 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2651,7 +2651,7 @@ static int start_unit_one( @@ -82,6 +859,89 @@ index 28eaa6a..6292c09 100644 return log_oom(); } +@@ -6917,8 +6917,13 @@ done: + + static int halt_now(enum action a) { + +-/* Make sure C-A-D is handled by the kernel from this +- * point on... */ ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. */ ++ sync(); ++ ++ /* Make sure C-A-D is handled by the kernel from this point ++ * on... */ + reboot(RB_ENABLE_CAD); + + switch (a) { +diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c +index 63d64b2..57264de 100644 +--- a/src/test/test-path-util.c ++++ b/src/test/test-path-util.c +@@ -85,29 +85,30 @@ static void test_path(void) { + } + } + +-static void test_find_binary(const char *self) { ++static void test_find_binary(const char *self, bool local) { + char *p; + +- assert_se(find_binary("/bin/sh", &p) == 0); ++ assert_se(find_binary("/bin/sh", local, &p) == 0); + puts(p); + assert_se(streq(p, "/bin/sh")); + free(p); + +- assert_se(find_binary(self, &p) == 0); ++ assert_se(find_binary(self, local, &p) == 0); + puts(p); + assert_se(endswith(p, "/test-path-util")); + assert_se(path_is_absolute(p)); + free(p); + +- assert_se(find_binary("sh", &p) == 0); ++ assert_se(find_binary("sh", local, &p) == 0); + puts(p); + assert_se(endswith(p, "/sh")); + assert_se(path_is_absolute(p)); + free(p); + +- assert_se(find_binary("xxxx-xxxx", &p) == -ENOENT); ++ assert_se(find_binary("xxxx-xxxx", local, &p) == -ENOENT); + +- assert_se(find_binary("/some/dir/xxxx-xxxx", &p) == -ENOENT); ++ assert_se(find_binary("/some/dir/xxxx-xxxx", local, &p) == ++ (local ? -ENOENT : 0)); + } + + static void test_prefixes(void) { +@@ -244,7 +245,8 @@ static void test_strv_resolve(void) { + + int main(int argc, char **argv) { + test_path(); +- test_find_binary(argv[0]); ++ test_find_binary(argv[0], true); ++ test_find_binary(argv[0], false); + test_prefixes(); + test_path_join(); + test_fsck_exists(); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 2e6c713..193702c 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -994,9 +994,9 @@ static void kernel_cmdline_options(struct udev *udev) { + if (r < 0) + log_warning("Invalid udev.exec-delay ignored: %s", opt + 16); + } else if (startswith(opt, "udev.event-timeout=")) { +- r = safe_atou64(opt + 16, &arg_event_timeout_usec); ++ r = safe_atou64(opt + 19, &arg_event_timeout_usec); + if (r < 0) { +- log_warning("Invalid udev.event-timeout ignored: %s", opt + 16); ++ log_warning("Invalid udev.event-timeout ignored: %s", opt + 19); + break; + } + arg_event_timeout_usec *= USEC_PER_SEC; diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in index 8ac51a4..cae9fb5 100644 --- a/units/console-getty.service.m4.in @@ -95,11 +955,14 @@ index 8ac51a4..cae9fb5 100644 Restart=always RestartSec=0 diff --git a/units/container-getty@.service.m4.in b/units/container-getty@.service.m4.in -index 4f7794b..bad2a9a 100644 +index 4f7794b..6dfc2e9 100644 --- a/units/container-getty@.service.m4.in +++ b/units/container-getty@.service.m4.in -@@ -16,7 +16,6 @@ Before=getty.target +@@ -14,9 +14,9 @@ After=rc-local.service + )m4_dnl + Before=getty.target IgnoreOnIsolate=yes ++ConditionPathExists=/dev/pts/%I [Service] -ExecStart=-/sbin/agetty --noclear --keep-baud pts/%I 115200,38400,9600 $TERM @@ -216,25 +1079,34 @@ index ecf3de4..7e83446 100644 ExecStop=@rootlibexecdir@/systemd-backlight save %i +X-RestartIfChanged=false diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in -index 699670b..2612220 100644 +index 699670b..ba22c6d 100644 --- a/units/systemd-journal-flush.service.in +++ b/units/systemd-journal-flush.service.in -@@ -10,8 +10,9 @@ Description=Trigger Flushing of Journal to Persistent Storage +@@ -10,8 +10,10 @@ Description=Trigger Flushing of Journal to Persistent Storage Documentation=man:systemd-journald.service(8) man:journald.conf(5) DefaultDependencies=no Requires=systemd-journald.service -After=systemd-journald.service local-fs.target remote-fs.target +After=systemd-journald.service ++After=systemd-remount-fs.service Before=systemd-user-sessions.service systemd-tmpfiles-setup.service +RequiresMountsFor=/var/log/journal [Service] ExecStart=@rootbindir@/journalctl --flush diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index 4de38fa..4b6daea 100644 +index 4de38fa..2f23c13 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in -@@ -26,3 +26,8 @@ WatchdogSec=1min +@@ -14,6 +14,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket + Before=sysinit.target + + [Service] ++Type=notify + Sockets=systemd-journald.socket systemd-journald-dev-log.socket + ExecStart=@rootlibexecdir@/systemd-journald + Restart=always +@@ -26,3 +27,8 @@ WatchdogSec=1min # Increase the default a bit in order to allow many simultaneous # services being run since we keep one fd open per service. LimitNOFILE=16384 diff --git a/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch b/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch deleted file mode 100644 index 820b23fbfa2..00000000000 --- a/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a87a38c20196a4aeb56b6ba71d688eefd0b21c30 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Tue, 4 Nov 2014 20:28:08 +0100 -Subject: [PATCH] units: make systemd-journald.service Type=notify - -It already calls sd_notify(), so it looks like an oversight. - -Without it, its ordering to systemd-journal-flush.service is -non-deterministic and the SIGUSR1 from flushing may kill journald before -it has its signal handlers set up. - -https://bugs.freedesktop.org/show_bug.cgi?id=85871 -https://bugzilla.redhat.com/show_bug.cgi?id=1159641 ---- -(foutrelis: dropped systemd-journald-audit.socket from Sockets= in order to - apply to systemd 217) - - units/systemd-journald.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index 7ee67fd..8d380c8 100644 ---- a/units/systemd-journald.service.in -+++ b/units/systemd-journald.service.in -@@ -14,6 +14,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-a - Before=sysinit.target - - [Service] -+Type=notify - Sockets=systemd-journald.socket systemd-journald-dev-log.socket - ExecStart=@rootlibexecdir@/systemd-journald - Restart=always --- -2.1.3 - diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 2ad3087d6a1..f7e0c5ca5e2 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A userspace helper that runs x86 code in an emulated environment"; homepage = http://dev.gentoo.org/~spock/projects/uvesafb/; - license = "BSD"; + license = stdenv.lib.licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 899914b6446..8803b8134f7 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight high-performance web server"; homepage = http://www.lighttpd.net/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index a946672f9a7..009b091d15f 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.7.7"; + version = "1.7.8"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "1lmzq36ysi0hwvqpiaz0dpmwvdwbrn9aw1rm1xcabkl2g855l0by"; + sha256 = "1rg8c2z6df6flz5vz6k7iixm4f3d27svnncf810vilyk0b1mxxqj"; }; rtmp-ext = fetchFromGitHub { diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in index 219ab9763ad..1afe8854fed 100644 --- a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in +++ b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in @@ -51,7 +51,7 @@ case "$QUERY_STRING" in *.narinfo) hash=${QUERY_STRING%.narinfo} hash=${hash#/} - path="$(echo "$STORE_DIR/$hash-"* )" + path="$(echo "$STORE_DIR/$hash-"* | @coreutils@/sort | @coreutils@/head -n 1)" if [ -n "$path" ] && [ -e "$path" ]; then header info="$( diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 6b8a75e6901..4a89c5ad83b 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -3,11 +3,11 @@ , libvorbis, libtheora, speex, libkate, libopus }: stdenv.mkDerivation rec { - name = "icecast-2.4.0"; + name = "icecast-2.4.1"; src = fetchurl { url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; - sha256 = "0chg8v3c0wkbakjcw73rsfccx13f28arrmmbz9p5fsmiw5bykdqp"; + sha256 = "0js5lylrgklhvvaksx46zc8lc975qb1bns8h1ms545nv071rxy23"; }; buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate libopus ]; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 7c442bf8c7e..8cabb8cac94 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.postfix.org/; + homepage = https://www.opensmtpd.org/; description = '' A free implementation of the server-side SMTP protocol as defined by RFC 5321, with some additional standard extensions diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix new file mode 100644 index 00000000000..7551bdf9669 --- /dev/null +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +assert stdenv.system == "x86_64-linux"; + +stdenv.mkDerivation rec { + name = "newrelic-sysmond-1.5.1.93"; + + src = fetchurl { + url = "http://download.newrelic.com/server_monitor/release/newrelic-sysmond-1.5.1.93-linux.tar.gz"; + + sha256 = "1bfwyczcf7pvji8lx566jxgy8dhyf1gmqmi64lj10673a86axnwz"; + }; + + installPhase = '' + mkdir -p $out/bin + install -v -m755 daemon/nrsysmond.x64 $out/bin/nrsysmond + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + $out/bin/nrsysmond + ''; + + meta = { + homepage = http://newrelic.com/; + + description = "System-wide monitoring for newrelic"; + + license = stdenv.lib.licenses.unfree; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index ca4df9ce340..47f1b7a867b 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "1ssqi31blkl1lyv9vjrsrrn494grdng187s8xwfv79adk2w94paw"; + sha256 = "0cjj3c4j4b9sl3hgh1fck330z9q0gz2k68g227y0paal6k6f54g7"; }; preConfigure = diff --git a/pkgs/servers/nosql/hyperdex/busybee.nix b/pkgs/servers/nosql/hyperdex/busybee.nix new file mode 100644 index 00000000000..19482db6f5a --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/busybee.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, + libpo6, libe, pkgconfig }: + +stdenv.mkDerivation rec { + name = "busybee-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/busybee/archive/releases/${version}.zip"; + sha256 = "0gr5h2j9rzwarblgcgddnxj39i282rvgn9vqlrcd60dx8c4dkm29"; + }; + buildInputs = [ + autoconf + automake + libe + libpo6 + libtool + pkgconfig + unzip + ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "BusyBee is a high-performance messaging layer."; + homepage = https://github.com/rescrv/busybee; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix new file mode 100644 index 00000000000..036a3412b86 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool, + python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc, + flex, haskellPackages, help2man, autoconf-archive, callPackage }: + +assert stdenv.isLinux; + +let +hyperleveldb = callPackage ./hyperleveldb.nix {}; +libpo6 = callPackage ./libpo6.nix {}; +libe = callPackage ./libe.nix { inherit libpo6; }; +busybee = callPackage ./busybee.nix { inherit libpo6 libe; }; +replicant = callPackage ./replicant.nix { + inherit libpo6 libe busybee hyperleveldb; +}; +libmacaroons = callPackage ./libmacaroons.nix { }; + +in +stdenv.mkDerivation rec { + name = "hyperdex-${version}"; + version = "1.5.0"; + + src = fetchurl { + url = "https://github.com/rescrv/HyperDex/archive/releases/${version}.zip"; + sha256 = "0s1capy2hj45f5rmdb4fk0wxy7vz69krplhba57f6wrkpcz1zb57"; + }; + + buildInputs = [ + autoconf + autoconf-archive + automake + busybee + glog + hyperleveldb + json_c + libe + libmacaroons + libpo6 + libtool + pkgconfig + popt + python + replicant + unzip + gperf + yacc + flex + help2man + haskellPackages.pandoc + ]; + preConfigure = "autoreconf -fi"; + + meta = with stdenv.lib; { + description = "HyperDex is a scalable, searchable key-value store"; + homepage = http://hyperdex.org; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/hyperleveldb.nix b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix new file mode 100644 index 00000000000..c39f618f6cb --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "hyperleveldb-${version}"; + version = "1.2.1"; + + src = fetchurl { + url = "https://github.com/rescrv/HyperLevelDB/archive/releases/${version}.zip"; + sha256 = "0xrzhwkrm7f2wz3jn4iqn1dim2pmgjhmpb1fy23fwa06v0q18hw8"; + }; + buildInputs = [ unzip autoconf automake libtool ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = ''A fork of LevelDB intended to meet the needs of + HyperDex while remaining compatible with LevelDB.''; + homepage = https://github.com/rescrv/HyperLevelDB; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libe.nix b/pkgs/servers/nosql/hyperdex/libe.nix new file mode 100644 index 00000000000..cc5232e13f2 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libe.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, libpo6, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libe-${version}"; + version = "0.8.1"; + + src = fetchurl { + url = "https://github.com/rescrv/e/archive/releases/0.8.1.zip"; + sha256 = "1l13axsi52j2qaxbdnszdvfxksi7rwm2j1rrf0nlh990m6a3yg3s"; + }; + buildInputs = [ unzip autoconf automake libtool libpo6 pkgconfig ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "Library containing high-performance datastructures and utilities for C++"; + homepage = https://github.com/rescrv/e; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libmacaroons.nix b/pkgs/servers/nosql/hyperdex/libmacaroons.nix new file mode 100644 index 00000000000..2d709c5bbd1 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libmacaroons.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, + pkgconfig, sodium, python }: +stdenv.mkDerivation rec { + name = "libmacaroons-${version}"; + version = "HEAD"; + + src = fetchurl { + url = "https://github.com/rescrv/libmacaroons/archive/6febf3ce6c4c77a46d24b40ed29b03ffbfb175a7.zip"; + sha256 = "0b4qgim87398chvc3qhxfqv2l1cyl65rhyknln8lk0gq9y00p1ik"; + }; + buildInputs = [ unzip autoconf automake libtool python sodium pkgconfig ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = ''Macaroons are flexible authorization credentials that + support decentralized delegation, attenuation, and verification.''; + homepage = https://github.com/rescrv/libmacaroons; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libpo6.nix b/pkgs/servers/nosql/hyperdex/libpo6.nix new file mode 100644 index 00000000000..166a5e21c6b --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libpo6.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "libpo6-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/po6/archive/releases/${version}.zip"; + sha256 = "14g3ichshnc4wd0iq3q3ymgaq84gjsbqcyn6lri7c7djgkhqijjx"; + }; + buildInputs = [ unzip autoconf automake libtool ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "POSIX wrappers for C++"; + homepage = https://github.com/rescrv/po6; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/replicant.nix b/pkgs/servers/nosql/hyperdex/replicant.nix new file mode 100644 index 00000000000..c064aa419cd --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/replicant.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, glog, + hyperleveldb, libe, pkgconfig, popt, libpo6, busybee }: + +stdenv.mkDerivation rec { + name = "replicant-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/Replicant/archive/releases/0.6.3.zip"; + sha256 = "1fbagz0nbvinkqr5iw5y187dm4klkswrxnl5ysq8waglg2nj8zzi"; + }; + buildInputs = [ + autoconf + automake + busybee + glog + hyperleveldb + libe + libpo6 + libtool + pkgconfig + popt + unzip + ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "A system for maintaining replicated state machines."; + homepage = https://github.com/rescrv/Replicant; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index e733ef3d009..b9c2e83d582 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://redis.io; description = "An open source, advanced key-value store"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.berdario ]; }; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 8d8a677647c..31be5eef7c8 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "ONC RPC portmapper"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' Universal addresses to RPC program number mapper. ''; diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index b422b993832..3389f811489 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "mysql-5.1.73"; src = fetchurl { - url = "http://cdn.mysql.com/Downloads/MySQL-5.1/${name}.tar.gz"; + url = "mirror://mysql/MySQL-5.1/${name}.tar.gz"; sha256 = "1dfwi4ck0vq6sdci6gz0031s7zz5lc3pddqlgm0292s00l9y5sq5"; }; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 5c57ae87d20..64fbabb0800 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "5.5.40"; src = fetchurl { - url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz"; + url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; sha256 = "0q29nzmmxm78b89qjfzgm93r0glaam3xw3zfx1k8ihii39v22dsd"; }; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b0d84da3547..4fe6354fd33 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1561,8 +1561,8 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.99.916.tar.bz2; sha256 = "00gd3v3xgrmj8aliwjxkml13gfqvcbjazb6l5m1wkry39agq36j0"; }; - buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXvMC ]; - }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXvMC ;}; + buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; + }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { name = "xf86-video-mach64-6.9.4"; @@ -1991,8 +1991,8 @@ let url = mirror://xorg/individual/xserver/xorg-server-1.16.2.901.tar.bz2; sha256 = "19jb8v26wc332ramwjdg5vjh3s36kr7n46s6fdfaxrj1wif5m27g"; }; - buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ]; - }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;}; + buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ]; + }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;}; xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9c6618d3b10..7b2c20e05eb 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -36,6 +36,8 @@ $pcMap{"libudev"} = "udev"; $pcMap{"gl"} = "mesa"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "renderproto"; +$pcMap{"\$DRI3PROTO"} = "dri3proto"; +$pcMap{"\$DRI2PROTO"} = "dri2proto"; my $downloadCache = "./download-cache"; @@ -207,6 +209,7 @@ while (<>) { process \@requires, $1 while $file =~ /XDMCP_MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /NEEDED=\"(.*)\"/g; + process \@requires, $1 while $file =~ /ivo_requires=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g; push @requires, "libxslt" if $pkg =~ /libxcb/; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a95d8818651..45122780cdd 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -266,7 +266,7 @@ in recordproto libXext pixman libXfont damageproto xcmiscproto bigreqsproto libpciaccess inputproto xextproto randrproto renderproto presentproto - dri2proto kbproto xineramaproto resourceproto scrnsaverproto videoproto + dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; commonPatches = [ ./xorgserver-xkbcomp-path.patch ]; # XQuartz requires two compilations: the first to get X / XQuartz, diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index b101e25f574..09b2d30ea7c 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null, sip ? null +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null , notebookSupport ? true # ipython notebook , qtconsoleSupport ? true # ipython qtconsole , pylabSupport ? true # ipython --pylab (backend: agg - no gui, just file) @@ -10,7 +10,7 @@ # pyqt4 for both. assert qtconsoleSupport == true -> pyqt4 != null; -assert pylabQtSupport == true -> pyqt4 != null && sip != null; +assert pylabQtSupport == true -> pyqt4 != null; buildPythonPackage rec { name = "ipython-2.3.1"; @@ -37,7 +37,6 @@ buildPythonPackage rec { ] ++ stdenv.lib.optionals pylabQtSupport [ pythonPackages.matplotlib pyqt4 - sip ]; doCheck = false; @@ -45,7 +44,7 @@ buildPythonPackage rec { meta = { homepage = http://ipython.scipy.org/; description = "An interactive computing environment for Python"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The goal of IPython is to create a comprehensive environment for interactive and exploratory computing. It consists of an diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index f457d25fe1b..684713bebb1 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/amonakov/primus; description = "Faster OpenGL offloading for Bumblebee"; - maintainer = maintainers.coconnor; + maintainers = maintainers.coconnor; }; } diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 9224c3b2d9c..2eeb61dfaf4 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.semicomplete.com/projects/xdotool/; description = "Fake keyboard/mouse input, window management, and more"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 1ed5866a692..f1338e9ecb5 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="655"; + version="660"; name="${baseName}-${version}"; - hash="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; - url="http://mattmahoney.net/dc/zpaq655.zip"; - sha256="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; + hash="1p6b56zf676bkfc20lxhjh9bsgh92z6bln7b0kxibh8s8aa7vzjq"; + url="http://mattmahoney.net/dc/zpaq660.zip"; + sha256="1p6b56zf676bkfc20lxhjh9bsgh92z6bln7b0kxibh8s8aa7vzjq"; }; buildInputs = [ unzip @@ -29,14 +29,14 @@ stdenv.mkDerivation { }; sourceRoot = "."; buildPhase = '' - g++ -shared -O3 libzpaq.cpp ${compileFlags} -o libzpaq.so - g++ -O3 -L. -L"$out/lib" -lzpaq divsufsort.c zpaq.cpp -o zpaq + g++ -O3 -march=native -Dunix libzpaq.cpp -pthread --shared -o libzpaq.so -fPIC + g++ -O3 -march=native -Dunix zpaq.cpp -lzpaq -L. -L"$out/lib" -pthread -o zpaq ''; installPhase = '' mkdir -p "$out"/{bin,include,lib,share/doc/zpaq} cp libzpaq.so "$out/lib" cp zpaq "$out/bin" - cp libzpaq.h divsufsort.h "$out/include" + cp libzpaq.h "$out/include" cp readme.txt "$out/share/doc/zpaq" ''; meta = { diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index 13011a36bc4..e9a8ca46612 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -1,19 +1,26 @@ -{stdenv, fetchurl, python3Packages, openssl, acl }: +{ stdenv, fetchurl, python3Packages, openssl, acl }: python3Packages.buildPythonPackage rec { - name = "attic-0.13"; + name = "attic-0.14"; + namePrefix = ""; src = fetchurl { - url = "https://github.com/jborg/attic/archive/0.13.tar.gz"; - sha256 = "da1c4c0759b541e72f6928341c863b406448351769113165d86d8393a5db98a3"; - }; + url = "https://github.com/jborg/attic/archive/0.14.tar.gz"; + sha256 = "0zabh6cq7v1aml83y2r475vvy3mmmjbvkijk0bnyfx73z8hmsa3z"; + }; - buildInputs = with python3Packages; + propagatedBuildInputs = with python3Packages; [ cython msgpack openssl acl ]; + preConfigure = '' + export ATTIC_OPENSSL_PREFIX="${openssl}" + ''; + meta = with stdenv.lib; { description = "A deduplication backup program"; homepage = "https://attic-backup.org"; - license = stdenv.lib.licenses.bsd3; - }; + license = licenses.bsd3; + maintainers = [ maintainers.wscott ]; + platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage + }; } diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 69109353fea..93352e4d129 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { name="ceph-${version}"; - version="0.90-pre"; + version="0.90"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "eef1705354d7661914dd09adc9627d52e03ac8dc"; - sha256 = "134m7kqqni7vlhjh5vfhyq7micr7gxibyav9xrqfnqnp2wnznhgg"; + rev = "refs/tags/v${version}"; + sha256 = "17w06qw38cxmin30ssz981hkkpnh5kp7f8xpnwga7rb7fhi8w6ia"; }; patches = [ diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix new file mode 100644 index 00000000000..3e483a29364 --- /dev/null +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, help2man}: + +stdenv.mkDerivation { + name = "fatsort"; + src = fetchurl { + url = mirror://sourceforge/fatsort/fatsort-1.3.365.tar.gz; + sha256 = "0g9zn2ns86g7zmy0y8hw1w1zhnd51hy8yl6kflyhxs49n5sc7b3p"; + }; + + patches = [ ./fatsort-Makefiles.patch ]; + + buildInputs = [ help2man ]; + + meta = { + homepage = http://fatsort.sourceforge.net/; + description = "Sorts FAT partition table, for devices that don't do sorting of files."; + maintainers = [ stdenv.lib.maintainers.kovirobi ]; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch new file mode 100644 index 00000000000..9c9f58e97ab --- /dev/null +++ b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch @@ -0,0 +1,31 @@ +diff -uNr fatsort-1.3.365-a/Makefile fatsort-1.3.365-b/Makefile +--- fatsort-1.3.365-a/Makefile 2014-04-08 19:19:36.000000000 +0100 ++++ fatsort-1.3.365-b/Makefile 2014-12-14 18:31:55.982857720 +0000 +@@ -1,4 +1,5 @@ +-MANDIR=/usr/local/share/man/man1 ++PREFIX=$(out) ++MANDIR=$(PREFIX)/share/man/man1 + + INSTALL_FLAGS=-m 0755 -p -D + +diff -uNr fatsort-1.3.365-a/src/Makefile fatsort-1.3.365-b/src/Makefile +--- fatsort-1.3.365-a/src/Makefile 2014-04-08 19:19:36.000000000 +0100 ++++ fatsort-1.3.365-b/src/Makefile 2014-12-14 18:32:08.282870461 +0000 +@@ -1,3 +1,5 @@ ++PREFIX=$(out) ++ + CC=gcc + LD=gcc + +@@ -33,9 +35,9 @@ + + # Mac OS X does not have a "/usr/local/sbin" + ifeq ($(UNAME),Darwin) +-SBINDIR=/usr/local/bin ++SBINDIR=$(PREFIX)/bin + else +-SBINDIR=/usr/local/sbin ++SBINDIR=$(PREFIX)/sbin + endif + + OBJ=fatsort.o FAT_fs.o fileio.o endianness.o signal.o entrylist.o errors.o options.o clusterchain.o sort.o misc.o natstrcmp.o stringlist.o diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index a101958d828..28f14a9fe78 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -4,11 +4,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.6.0"; + version="3.6.1"; name="${baseName}-${version}"; - hash="1c4lscqc5kvn5yj5pspvml59n1czspfqqdwhz73hbjd5lbqak9ml"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.0/glusterfs-3.6.0.tar.gz"; - sha256="1c4lscqc5kvn5yj5pspvml59n1czspfqqdwhz73hbjd5lbqak9ml"; + hash="1p16h5l3bg463l2zhw0rrbfdbkjnykssjmpwzlplsbq38aqqzcnh"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.1/glusterfs-3.6.1.tar.gz"; + sha256="1p16h5l3bg463l2zhw0rrbfdbkjnykssjmpwzlplsbq38aqqzcnh"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline @@ -19,12 +19,17 @@ stdenv.mkDerivation rec { inherit (s) name version; inherit buildInputs; + preConfigure = '' ./autogen.sh ''; + configureFlags = [ - ''--with-mountutildir="$out/sbin"'' + ''--with-mountutildir="$out/sbin" --localstatedir=/var'' ]; + + makeFlags = "DESTDIR=$(out)"; + preInstall = '' substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out @@ -32,6 +37,12 @@ rec { substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out ''; + + postInstall = '' + cp -r $out/$out/* $out + rm -r $out/nix + ''; + src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 78383f4185d..3be824d9a40 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -1,18 +1,21 @@ { stdenv, fetchurl, perl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "bfr-1.6"; + version = "1.6"; src = fetchurl { - url = http://www.glines.org/bin/pk/bfr-1.6.tar.bz2; + url = "http://www.sourcefiles.org/Utilities/Text_Utilities/bfr-${version}.tar.bz2"; sha256 = "0fadfssvj9klj4dq9wdrzys1k2a1z2j0p6kgnfgbjv0n1bq6h4cy"; }; buildInputs = [ perl ]; - meta = { - description = "general-purpose command-line pipe buffer"; + meta = with stdenv.lib; { + description = "A general-purpose command-line pipe buffer"; homepage = http://www.glines.org/wiki/bfr; license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 615063bbbcc..f7790fd3468 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "less-470"; + name = "less-471"; src = fetchurl { url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "1vw6bp9wkr2ymvhmf0ikrv8m1zm5ww78s48ny7ks0zjf2i8xr4gi"; + sha256 = "1y17zfrn91fs71jry5gp9ibj7darglhr42krimw7hqsjkbx17xip"; }; # Look for ‘sysless’ in /etc. diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix index 961dbc08335..0874ef38eb3 100644 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ b/pkgs/tools/misc/logstash-forwarder/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchgit, go_1_1 }: +{ stdenv, fetchgit, go }: stdenv.mkDerivation { - name = "logstash-forwarder-20140410"; + name = "logstash-forwarder-20141216"; src = fetchgit { url = https://github.com/elasticsearch/logstash-forwarder.git; - rev = "ec504792108ab6536b45bcf6dff6d26a6b56fef3"; - sha256 = "309545ceaec171bee997cad260bef1433e041b9f3bfe617d475bcf79924f943d"; + rev = "6082bd8aaecb2180f5b56f4fb1b2940a6935ef7b"; + sha256 = "1686rlx5p7d2806cg8y4376m4l7nvg1yjgg52ccrs0v4fnqs6292"; }; - buildInputs = [ go_1_1 ]; + buildInputs = [ go ]; installPhase = '' mkdir -p $out/bin cp build/bin/logstash-forwarder $out/bin @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.asl20; homepage = https://github.com/elasticsearch/logstash-forwarder; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 42882c2701a..5ead0e7c8ba 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -3,13 +3,13 @@ }: let - wine_patches_version = "1.7.30"; - wine_hash = "0v08w2av46y4wxrl8q4k9fhbi2cgawjaxclahqnpfw098bqcmxqh"; + wine_patches_version = "1.7.33"; + wine_hash = "0xcjsh3635i8wpzixzsl05m3dkq74vq193x3ipjr3fy0l9prslg3"; wine_patches = fetchgit { url = "git://github.com/compholio/wine-compholio.git"; rev = "refs/tags/v${wine_patches_version}"; - sha256 = "02i0bpxxiyxavlcd5qm7wv0q4bm9bxr3ng3w2k234ww7cyndm0ws"; + sha256 = "09af0cwdskz4clps39f48cp4lzm41kdzg30q8b511nyl0dppd75r"; }; wine_custom = @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { - version = "0.2.7.3"; + version = "0.2.8"; name = "pipelight-${version}"; src = fetchurl { url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz"; - sha256 = "0lifgs3aakyxfk6r2f2p27z0iqzgz1dinqfgwx3vdh3l93s8aifv"; + sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f"; }; buildInputs = [ wine_custom xlibs.libX11 gcc48_multi mesa curl ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 95d3b5f183f..18137312a3d 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl} : stdenv.mkDerivation { - name = "remind-3.1.8"; + name = "remind-3.1.13"; src = fetchurl { url = http://www.roaringpenguin.com/files/download/remind-03.01.13.tar.gz; sha256 = "0kzw1d53nlj90qfsibbs2gkzp1hamqqxpj57ip4kz1j1xgan69ng"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { homepage = http://www.roaringpenguin.com/products/remind; description = "Sophisticated calendar and alarm program for the console"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric raskin]; + maintainers = with stdenv.lib.maintainers; [viric raskin kovirobi]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index afe75c572c0..664647514aa 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -4,11 +4,11 @@ let inherit (composableDerivation) edf; in composableDerivation.composableDerivation {} { - name = "timidity-2.13.0"; + name = "timidity-2.14.0"; src = fetchurl { - url = mirror://sourceforge/timidity/TiMidity++-2.13.0.tar.bz2; - sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf"; + url = mirror://sourceforge/timidity/TiMidity++-2.14.0.tar.bz2; + sha256 = "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr"; }; mergeAttrBy.audioModes = a : b : "${a},${b}"; @@ -55,8 +55,10 @@ composableDerivation.composableDerivation {} { tar --strip-components=1 -xf $instruments -C $out/share/timidity/ ''; - meta = { + meta = with stdenv.lib; { + homepage = http://sourceforge.net/projects/timidity/; + license = licenses.gpl2; description = "A software MIDI renderer"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; + maintainers = [ maintainers.marcweber ]; }; } diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix new file mode 100644 index 00000000000..30fc6a92d89 --- /dev/null +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, substituteAll, coreutils, python2, python2Packages }: + +assert stdenv.isLinux; + +python2Packages.buildPythonPackage rec { + name = "trash-cli-${version}"; + version = "0.12.9.14"; + namePrefix = ""; + + src = fetchurl { + url = "https://github.com/andreafrancia/trash-cli/archive/${version}.tar.gz"; + sha256 = "10idvzrlppj632pw6mpk1zy9arn1x4lly4d8nfy9cz4zqv06lhvh"; + }; + + + patches = [ + # Fix paths. + (substituteAll { + src = ./nix-paths.patch; + df = "${coreutils}/bin/df"; + python = "${python2}/bin/${python2.executable}"; + libc = "${stdenv.gcc.libc}/lib/libc.so.6"; + }) + + # Apply https://github.com/JaviMerino/trash-cli/commit/4f45a37a3 + # to fix failing test case. + ./fix_should_output_info_for_multiple_files.patch + ]; + + buildInputs = with python2Packages; [ nose mock ]; + + checkPhase = "nosetests"; + + meta = with stdenv.lib; { + homepage = https://github.com/andreafrancia/trash-cli; + description = "Command line tool for the desktop trash can"; + maintainer = [ maintainers.rycee ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch b/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch new file mode 100644 index 00000000000..17947be7482 --- /dev/null +++ b/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch @@ -0,0 +1,60 @@ +From 4f45a37a390d7c844dd9c9b58fff7259a77ffff9 Mon Sep 17 00:00:00 2001 +From: Javi Merino +Date: Sun, 31 Aug 2014 05:45:17 -0700 +Subject: [PATCH] Fix should_output_info_for_multiple_files + +Test should_output_info_for_multiple_files fails because the output is +not in the same order as the input. Add assert_equal_any_order() to +the OutputCollector, which sorts the expected and actual lines so that +the output matches even if the order in which they are shown in +trash-list is different. +--- + integration_tests/describe_trash_list.py | 8 +++++--- + integration_tests/output_collector.py | 8 ++++++++ + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/integration_tests/describe_trash_list.py b/integration_tests/describe_trash_list.py +index 6dd8d30..3489a22 100644 +--- a/integration_tests/describe_trash_list.py ++++ b/integration_tests/describe_trash_list.py +@@ -73,9 +73,9 @@ def should_output_info_for_multiple_files(self): + + self.user.run_trash_list() + +- self.user.should_read_output( "2000-01-01 00:00:01 /file1\n" +- "2000-01-01 00:00:02 /file2\n" +- "2000-01-01 00:00:03 /file3\n") ++ self.user.should_read_output_any_order( "2000-01-01 00:00:01 /file1\n" ++ "2000-01-01 00:00:02 /file2\n" ++ "2000-01-01 00:00:03 /file3\n") + + @istest + def should_output_unknown_dates_with_question_marks(self): +@@ -294,6 +294,8 @@ def error(self): + raise ValueError() + def should_read_output(self, expected_value): + self.stdout.assert_equal_to(expected_value) ++ def should_read_output_any_order(self, expected_value): ++ self.stdout.assert_equal_any_order(expected_value) + def should_read_error(self, expected_value): + self.stderr.assert_equal_to(expected_value) + def output(self): +diff --git a/integration_tests/output_collector.py b/integration_tests/output_collector.py +index 06dc002..7f3704f 100644 +--- a/integration_tests/output_collector.py ++++ b/integration_tests/output_collector.py +@@ -9,6 +9,14 @@ def write(self,data): + self.stream.write(data) + def assert_equal_to(self, expected): + return self.should_be(expected) ++ def assert_equal_any_order(self, expected): ++ actual_sorted = sorted(self.stream.getvalue().splitlines(1)) ++ actual = "".join(actual_sorted) ++ ++ expected_sorted = sorted(expected.splitlines(1)) ++ expected = "".join(expected_sorted) ++ ++ assert_equals_with_unidiff(expected, actual) + def should_be(self, expected): + assert_equals_with_unidiff(expected, self.stream.getvalue()) + def should_match(self, regex): diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/pkgs/tools/misc/trash-cli/nix-paths.patch new file mode 100644 index 00000000000..29412027b7a --- /dev/null +++ b/pkgs/tools/misc/trash-cli/nix-paths.patch @@ -0,0 +1,39 @@ +diff -Nurp trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py +--- trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py 2014-12-23 10:10:43.808470486 +0100 ++++ trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py 2014-12-23 10:11:02.688517975 +0100 +@@ -9,7 +9,7 @@ from pprint import pprint + @istest + class WhenNoArgs: + def setUp(self): +- process = Popen(['python', 'trashcli/rm.py'], ++ process = Popen(['@python@', 'trashcli/rm.py'], + env={'PYTHONPATH':'.'}, + stdin=None, + stdout=PIPE, +diff -Nurp trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py trash-cli-0.12.9.14/trashcli/list_mount_points.py +--- trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100 ++++ trash-cli-0.12.9.14/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100 +@@ -12,7 +12,7 @@ def mount_points_from_getmnt(): + + def mount_points_from_df(): + import subprocess +- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout ++ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout + return list(_mount_points_from_df_output(df_output)) + + def _mount_points_from_df_output(df_output): +@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() : + ("mnt_freq", c_int), # Dump frequency (in days). + ("mnt_passno", c_int)] # Pass number for `fsck'. + +- if sys.platform == "cygwin": +- libc_name = "cygwin1.dll" +- else: +- libc_name = find_library("c") +- +- if libc_name == None : +- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0 ++ libc_name = "@libc@" + + libc = cdll.LoadLibrary(libc_name) + libc.getmntent.restype = POINTER(mntent_struct) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index de366618c17..585dead7354 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.12.16"; + version = "2014.12.17.2"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "13rczrjvabihvirsr6p3ccy1f2f0n6vw2xpzqgc95syjlff52qh7"; + sha256 = "1yk8dw0p4nh68p4rcncwl95gcjwn147wyp2anfhn0gr8b95wcb1h"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 4103d17bfa2..8726f4aae21 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,16 +1,18 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "axel-2.4"; +stdenv.mkDerivation rec { + name = "axel-${version}"; + version = "2.4"; + src = fetchurl { - urls = [ - #https://alioth.debian.org/frs/download.php/3016/axel-2.4.tar.bz2 - mirror://debian/pool/main/a/axel/axel_2.4.orig.tar.gz - ]; + url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; sha256 = "0dl0r9byd2ps90cq2nj1y7ib6gnkb5y9f3a3fmhcnjrm9smmg6im"; }; - meta = { + meta = with stdenv.lib; { description = "Console downloading program with some features for parallel connections for faster downloading"; + homepage = http://axel.alioth.debian.org/; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 8723c53c322..5ccbc8d0cae 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "connect-1.95"; +let + + version = "1.104"; + +in stdenv.mkDerivation { + name = "connect-${version}"; src = fetchurl { - url = http://savannah.gnu.org/maintenance/connect.c; - sha256 = "11dx07pcanwaq71g4xh8d4blr5j7iy0ilmb0fkgpj8p22blb74mf"; + url = "https://bitbucket.org/gotoh/connect/get/${version}.tar.bz2"; + sha256 = "0h7bfh1b2kcw5ddpbif57phdxpf8if0cm01pgwc6avp6dqxcsqp2"; }; - phases = "unpackPhase buildPhase fixupPhase"; + makeFlags = [ "CC=cc" ]; # gcc and/or clang compat - unpackPhase = '' - cp $src connect.c - ''; - - buildPhase = '' - mkdir -p $out/bin - gcc -o $out/bin/connect connect.c + installPhase = '' + install -D -m ugo=rx connect $out/bin/connect ''; meta = { @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { This proxy traversal tool is intended to assist OpenSSH (via ProxyCommand in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies. ''; - homepage = http://bent.latency.net/bent/git/goto-san-connect-1.85/src/connect.html; # source URL is busted there + homepage = https://bitbucket.org/gotoh/connect/wiki/Home; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 927d60e8124..c84a140d4bc 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.5.1"; + name = "dhcpcd-6.6.6"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "0y0falxxlahr2i630ydraq4ldr7d5mg8ar0s5np5ddl76w58dlrp"; + sha256 = "0893gixhz68ngqa1vcshmvkwy58kmlj3f1qvd877sgrir06bpg96"; }; patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index 00984a4ee70..c1a41d98f4b 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "libpcap application that displays DNS traffic on your network"; - homepage = "http://dns.measurement-factory.com/tools/dnstop"; - license = "BSD"; + homepage = http://dns.measurement-factory.com/tools/dnstop; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index 37d38555e61..3afa17b0a82 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/; - maintainer = maintainers.abbradar; + maintainers = maintainers.abbradar; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/oslrd/default.nix b/pkgs/tools/networking/oslrd/default.nix index 44f32e93474..90f686f77ea 100644 --- a/pkgs/tools/networking/oslrd/default.nix +++ b/pkgs/tools/networking/oslrd/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "An adhoc wireless mesh routing daemon"; - license = "BSD"; - homepage = "http://olsr.org/"; + license = stdenv.lib.licenses.bsd3; + homepage = http://olsr.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index c6a57c238a4..2d213690729 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: stdenv.mkDerivation { - name = "privoxy-3.0.21"; + name = "privoxy-3.0.22"; src = fetchurl { - url = mirror://sourceforge/ijbswa/Sources/3.0.21%20%28stable%29/privoxy-3.0.21-stable-src.tar.gz; - sha256 = "1f6xb7aa47p90c26vqaw74y6drs9gpnhxsgby3mx0awdjh0ydisy"; + url = mirror://sourceforge/ijbswa/Sources/3.0.22%20%28stable%29/privoxy-3.0.22-stable-src.tar.gz; + sha256 = "0hfcxyb0i7dr6jfxw0y4kqcr09p8gjvcs7igyizyl5in3zn4y88s"; }; buildInputs = [ autoreconfHook zlib pcre w3m man ]; diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index 9006fadfcdb..f73a1bc5bcc 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/slimrat/; description = "Linux Rapidshare downloader"; - license = "BSD"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index a41bc5e5b8f..871cd3e8f47 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, pkgconfig, python }: +{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook }: stdenv.mkDerivation rec { name = "strongswan-5.2.1"; @@ -10,7 +10,13 @@ stdenv.mkDerivation rec { dontPatchELF = true; - buildInputs = [ gmp pkgconfig python ]; + buildInputs = [ gmp pkgconfig python autoreconfHook ]; + + patches = [ + ./ext_auth-path.patch + ./firewall_defaults.patch + ./updown-path.patch + ]; configureFlags = [ "--enable-swanctl" "--enable-cmd" ]; diff --git a/pkgs/tools/networking/strongswan/ext_auth-path.patch b/pkgs/tools/networking/strongswan/ext_auth-path.patch new file mode 100644 index 00000000000..397537ad8d8 --- /dev/null +++ b/pkgs/tools/networking/strongswan/ext_auth-path.patch @@ -0,0 +1,13 @@ +Index: strongswan-5.2.1/src/libcharon/plugins/ext_auth/ext_auth_listener.c +=================================================================== +--- strongswan-5.2.1.orig/src/libcharon/plugins/ext_auth/ext_auth_listener.c ++++ strongswan-5.2.1/src/libcharon/plugins/ext_auth/ext_auth_listener.c +@@ -101,6 +101,8 @@ METHOD(listener_t, authorize, bool, + + *success = FALSE; + ++ push_env(envp, countof(envp), "PATH=%s", getenv("PATH")); ++ + push_env(envp, countof(envp), "IKE_UNIQUE_ID=%u", + ike_sa->get_unique_id(ike_sa)); + push_env(envp, countof(envp), "IKE_NAME=%s", diff --git a/pkgs/tools/networking/strongswan/firewall_defaults.patch b/pkgs/tools/networking/strongswan/firewall_defaults.patch new file mode 100644 index 00000000000..12c446c8c9a --- /dev/null +++ b/pkgs/tools/networking/strongswan/firewall_defaults.patch @@ -0,0 +1,32 @@ +Index: strongswan-5.2.1/src/starter/confread.c +=================================================================== +--- strongswan-5.2.1.orig/src/starter/confread.c ++++ strongswan-5.2.1/src/starter/confread.c +@@ -43,7 +43,7 @@ + static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536"; + static const char esp_defaults[] = "aes128-sha1,3des-sha1"; + +-static const char firewall_defaults[] = IPSEC_SCRIPT " _updown iptables"; ++static const char firewall_defaults[] = IPSEC_SBINDIR "/" IPSEC_SCRIPT " _updown iptables"; + + /** + * Provided by GPERF +Index: strongswan-5.2.1/src/starter/Makefile.am +=================================================================== +--- strongswan-5.2.1.orig/src/starter/Makefile.am ++++ strongswan-5.2.1/src/starter/Makefile.am +@@ -18,10 +18,12 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src/libhydra \ + -I$(top_srcdir)/src/starter \ + -I$(top_srcdir)/src/stroke \ +- -DIPSEC_DIR=\"${ipsecdir}\" \ ++ -DIPSEC_BINDIR=\"${bindir}\" \ + -DIPSEC_CONFDIR=\"${sysconfdir}\" \ +- -DIPSEC_PIDDIR=\"${piddir}\" \ ++ -DIPSEC_DIR=\"${ipsecdir}\" \ + -DIPSEC_EAPDIR=\"${eapdir}\" \ ++ -DIPSEC_PIDDIR=\"${piddir}\" \ ++ -DIPSEC_SBINDIR=\"${sbindir}\" \ + -DIPSEC_SCRIPT=\"${ipsec_script}\" \ + -DDEV_RANDOM=\"${random_device}\" \ + -DDEV_URANDOM=\"${urandom_device}\" \ diff --git a/pkgs/tools/networking/strongswan/updown-path.patch b/pkgs/tools/networking/strongswan/updown-path.patch new file mode 100644 index 00000000000..f01da7d7bce --- /dev/null +++ b/pkgs/tools/networking/strongswan/updown-path.patch @@ -0,0 +1,26 @@ +Index: strongswan-5.2.1/src/_updown/_updown.in +=================================================================== +--- strongswan-5.2.1.orig/src/_updown/_updown.in ++++ strongswan-5.2.1/src/_updown/_updown.in +@@ -125,7 +125,7 @@ + # + + # define a minimum PATH environment in case it is not set +-PATH="/sbin:/bin:/usr/sbin:/usr/bin:@sbindir@" ++PATH="${PATH:-/sbin:/bin:/usr/sbin:/usr/bin}" + export PATH + + # uncomment to log VPN connections +Index: strongswan-5.2.1/src/libcharon/plugins/updown/updown_listener.c +=================================================================== +--- strongswan-5.2.1.orig/src/libcharon/plugins/updown/updown_listener.c ++++ strongswan-5.2.1/src/libcharon/plugins/updown/updown_listener.c +@@ -240,6 +240,8 @@ static void invoke_once(private_updown_l + process_t *process; + char *envp[128] = {}; + ++ push_env(envp, countof(envp), "PATH=%s", getenv("PATH")); ++ + me = ike_sa->get_my_host(ike_sa); + other = ike_sa->get_other_host(ike_sa); + diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 254dc168ec8..d10e645dc87 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = http://monkey.org/~marius/pages/?page=trickle; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix b/pkgs/tools/package-management/cabal-install/1.20.0.4.nix similarity index 63% rename from pkgs/tools/package-management/cabal-install/1.20.0.3.nix rename to pkgs/tools/package-management/cabal-install/1.20.0.4.nix index 1a18222ed6b..a6222dfc688 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.4.nix @@ -1,35 +1,36 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck -, random, stm, testFramework, testFrameworkHunit +{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, networkUri +, QuickCheck, random, stm, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time, zlib }: cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.20.0.3"; - sha256 = "050b9dc4khfc1fs283p1635zni25z4b55gi5ffwvg4mfpkrmdgfj"; + version = "1.20.0.4"; + sha256 = "171lkr8jw5k3l58gn41jmbp47kf3b8iq9dds0v8qx7wxzlxy0kz1"; isLibrary = false; isExecutable = true; buildDepends = [ - Cabal filepath HTTP mtl network random stm time zlib + Cabal filepath HTTP mtl network networkUri random stm time zlib ]; testDepends = [ Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework testFrameworkHunit testFrameworkQuickcheck2 time zlib ]; + doCheck = false; postInstall = '' mkdir $out/etc mv bash-completion $out/etc/bash_completion.d ''; patchPhase = '' - sed -i -e 's|random .*1.1,|random,|' cabal-install.cabal + sed -i -e 's|random .*< 1.1,|random,|' cabal-install.cabal ''; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 50107a6e222..d6fe93bab9c 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "12q5shx6ldqad3rky154nv8f2cy57sxy9idivz93ggqm1bsw7a0a"; + sha256 = "0jffj23a02gw7gmrh9j9ynp50bvl2pc2y74i9ii65nvm50fx1v3h"; }; patches = [ ./socket-activate.patch ]; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 1448aa93c7d..783bd1ad7ff 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -3,20 +3,20 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.11"; + name = "sudo-1.8.11p2"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0if82pvmz7m3qkj3sc9yy8mpcd7lmbn0mhrgnd1zpszvnpkps5x3"; + sha256 = "1bd1zf85q15z015268w9vchzwypzalc3v2dnddmwy67s32a88cw1"; }; configureFlags = [ "--with-env-editor" "--with-editor=/run/current-system/sw/bin/nano" - "--with-rundir=/var/run" + "--with-rundir=/run" "--with-vardir=/var/db/sudo" "--with-logpath=/var/log/sudo.log" "--with-sendmail=${sendmailPath}" @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = + postInstall = '' rm -f $out/share/doc/sudo/ChangeLog ''; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "A command to run commands as root"; - longDescription = + longDescription = '' Sudo (su "do") allows a system administrator to delegate authority to give certain users (or groups of users) the ability diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index c07d5d98805..343e532e34b 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.4.6"; + version = "1.4.7"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "1br68qlg0hw6mc4v64hliqydl83qg2ldfxc50yi4xvca6wll6h3f"; + sha256 = "1j33b2spj1vzjf1ymfrgka5h7imijmdwg9jdjfb92b2ccld9jj6l"; }; buildInputs = [ libgcrypt readline ]; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index e9592b36666..3d3809610e4 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -12,8 +12,11 @@ stdenv.mkDerivation rec { patches = [ ./get_sensitive.patch ./set_flags.patch ]; - meta = { + meta = with stdenv.lib; { homepage = http://gdmap.sourceforge.net; description = "Recursive rectangle map of disk usage"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 027017247b7..eedca8bd7fd 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { description = ''Command-line interface to IPMI-enabled devices''; - license = "BSD"; - homepage = "http://ipmitool.sourceforge.net"; + license = stdenv.lib.licenses.bsd3; + homepage = http://ipmitool.sourceforge.net; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 1bd40aca07b..2131a5bad86 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -1,4 +1,3 @@ -set -e source $stdenv/setup tar xvfz $src @@ -13,8 +12,12 @@ for p in $patches; do patch -p1 < $p done -./INSTALL -r $out/plan9 - export PLAN9=$out/plan9 mkdir -p $PLAN9 + +for f in `grep -l -r /usr/local/plan9`; do + sed "s,/usr/local/plan9,${PLAN9},g" -i $f +done + +./INSTALL -r $PLAN9 cp -R * $PLAN9 diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 76087f553d6..709f83d3cbe 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "http://swtch.com/plan9port/"; description = "Plan 9 from User Space"; license = licenses.lpl-102; + maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix index 1cd7743e152..6afb6a09f2e 100644 --- a/pkgs/tools/system/safe-rm/default.nix +++ b/pkgs/tools/system/safe-rm/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "safe-rm-${version}"; - version = "0.11"; + version = "0.12"; src = fetchgit { url = "https://gitorious.org/safe-rm/mainline.git"; rev = "refs/tags/${name}"; - sha256 = "1csnqq22pfbg9dwhv13x60jih0gn07bn5rwg2nhi0dsslzk4l496"; + sha256 = "1n8ir96rwsg9r47lp3avl5sw548gvyh12zk5riflmmdvq907yi0s"; }; propagatedBuildInputs = [ perl coreutils ]; diff --git a/pkgs/tools/typesetting/pdf2djvu/default.upstream b/pkgs/tools/typesetting/pdf2djvu/default.upstream deleted file mode 100644 index 1bb4aebdc61..00000000000 --- a/pkgs/tools/typesetting/pdf2djvu/default.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url http://code.google.com/p/pdf2djvu/downloads/list -version_link '[.]tar[.][a-z0-9]+$' -process 'code[.]google[.]com//' '' -version '.*_([0-9.]+[0-9]).*' '\1' - -do_overwrite () { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14af4411bc1..663fa14d076 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -252,7 +252,7 @@ let }; autoreconfHook = makeSetupHook - { substitutions = { inherit autoconf automake libtool; }; } + { substitutions = { inherit autoconf automake libtool gettext; }; } ../build-support/setup-hooks/autoreconf.sh; buildEnv = import ../build-support/buildenv { @@ -613,7 +613,9 @@ let bchunk = callPackage ../tools/cd-dvd/bchunk { }; - bfr = callPackage ../tools/misc/bfr { }; + bfr = callPackage ../tools/misc/bfr { + perl = perl516; # Docs fail to build with newer versions + }; bindfs = callPackage ../tools/filesystems/bindfs { }; @@ -1145,6 +1147,8 @@ let fakechroot = callPackage ../tools/system/fakechroot { }; + fatsort = callPackage ../tools/filesystems/fatsort { }; + fatrace = callPackage ../os-specific/linux/fatrace { }; fcitx = callPackage ../tools/inputmethods/fcitx { }; @@ -1836,6 +1840,8 @@ let ndjbdns = callPackage ../tools/networking/ndjbdns { }; + nestopia = callPackage ../misc/emulators/nestopia { }; + netatalk = callPackage ../tools/filesystems/netatalk { }; netcdf = callPackage ../development/libraries/netcdf { }; @@ -1959,6 +1965,8 @@ let obnam = callPackage ../tools/backup/obnam { }; + ocz-toolbox = callPackage ../os-specific/linux/ocz-toolbox { }; + odt2txt = callPackage ../tools/text/odt2txt { }; odamex = callPackage ../games/odamex { }; @@ -2575,6 +2583,8 @@ let traceroute = callPackage ../tools/networking/traceroute { }; + trash-cli = callPackage ../tools/misc/trash-cli { }; + trickle = callPackage ../tools/networking/trickle {}; trousers = callPackage ../tools/security/trousers { }; @@ -2809,7 +2819,7 @@ let }; wml = callPackage ../development/web/wml { }; - + wv = callPackage ../tools/misc/wv { }; wv2 = callPackage ../tools/misc/wv2 { }; @@ -3353,6 +3363,7 @@ let haskellPackages_ghc783_no_profiling = recurseIntoAttrs haskell.packages_ghc783.noProfiling; haskellPackages_ghc783_profiling = recurseIntoAttrs haskell.packages_ghc783.profiling; haskellPackages_ghc783 = recurseIntoAttrs haskell.packages_ghc783.highPrio; + haskellPackages_ghc784 = haskell.packages_ghc784; haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; haxe = callPackage ../development/compilers/haxe { }; @@ -4320,6 +4331,8 @@ let autoconf = callPackage ../development/tools/misc/autoconf { }; + autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; + autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; autocutsel = callPackage ../tools/X11/autocutsel{ }; @@ -4680,8 +4693,6 @@ let premake = premake4; - pstack = callPackage ../development/tools/misc/gdb/pstack.nix { }; - racerRust = callPackage ../development/tools/rust/racer { rust = rustcMaster; }; radare = callPackage ../development/tools/analysis/radare { @@ -5640,8 +5651,6 @@ let libpng = libpng12; }; - lgi = callPackage ../development/libraries/lgi { }; - lib3ds = callPackage ../development/libraries/lib3ds { }; libaacs = callPackage ../development/libraries/libaacs { }; @@ -5914,6 +5923,8 @@ let libmcrypt = callPackage ../development/libraries/libmcrypt {}; + libmediainfo = callPackage ../development/libraries/libmediainfo { }; + libmhash = callPackage ../development/libraries/libmhash {}; libmodbus = callPackage ../development/libraries/libmodbus {}; @@ -6322,6 +6333,8 @@ let libyubikey = callPackage ../development/libraries/libyubikey { }; + libzen = callPackage ../development/libraries/libzen { }; + libzip = callPackage ../development/libraries/libzip { }; libzdb = callPackage ../development/libraries/libzdb { }; @@ -6528,6 +6541,8 @@ let opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; + opencollada = callPackage ../development/libraries/opencollada { }; + opencsg = callPackage ../development/libraries/opencsg { }; openct = callPackage ../development/libraries/openct { }; @@ -6608,13 +6623,7 @@ let qt4 = null; }; - phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { inherit qt4; }; - - phonon_qt5_backend_gstreamer = phonon_backend_gstreamer.override { - withQt5 = true; - inherit qt5; - qt4 = null; - }; + phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { }; phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { inherit qt4; }; @@ -6636,6 +6645,8 @@ let podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; + poker-eval = callPackage ../development/libraries/poker-eval { }; + polkit = callPackage ../development/libraries/polkit { spidermonkey = spidermonkey_185; }; @@ -7211,6 +7222,8 @@ let cppzmq = callPackage ../development/libraries/cppzmq {}; + czmq = callPackage ../development/libraries/czmq { }; + zziplib = callPackage ../development/libraries/zziplib { }; ### DEVELOPMENT / LIBRARIES / AGDA @@ -7436,8 +7449,6 @@ let rhpl = callPackage ../development/python-modules/rhpl { }; - sip = pythonPackages.sip; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { stdenv = if stdenv.isDarwin then clangStdenv @@ -7722,6 +7733,7 @@ let mariadb = callPackage ../servers/sql/mariadb {}; mongodb = callPackage ../servers/nosql/mongodb { + boost = boost156; sasl = cyrus_sasl; }; @@ -7729,6 +7741,8 @@ let influxdb = callPackage ../servers/nosql/influxdb { }; + hyperdex = callPackage ../servers/nosql/hyperdex { }; + mysql51 = import ../servers/sql/mysql/5.1.x.nix { inherit fetchurl ncurses zlib perl openssl stdenv; ps = procps; /* !!! Linux only */ @@ -7750,6 +7764,8 @@ let net_snmp = callPackage ../servers/monitoring/net-snmp { }; + newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; + riemann = callPackage ../servers/monitoring/riemann { }; oidentd = callPackage ../servers/identd/oidentd { }; @@ -8347,11 +8363,10 @@ let nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidia_x11 = self.nvidia_x11_legacy340; - nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; openafsClient = callPackage ../servers/openafs-client { }; @@ -8895,6 +8910,8 @@ let inherit (gnome3) gsettings_desktop_schemas; + gyre-fonts = callPackage ../data/fonts/gyre {}; + hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; inconsolata = callPackage ../data/fonts/inconsolata {}; @@ -8907,6 +8924,8 @@ let kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; + liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; liberation_ttf = liberation_ttf_binary; @@ -9348,6 +9367,8 @@ let dunst = callPackage ../applications/misc/dunst { }; + devede = callPackage ../applications/video/devede { }; + dvb_apps = callPackage ../applications/video/dvb-apps { }; dvdauthor = callPackage ../applications/video/dvdauthor { }; @@ -9453,6 +9474,7 @@ let gitModes = callPackage ../applications/editors/emacs-modes/git-modes { }; haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; + haskellModeGit = lowPrio (callPackage ../applications/editors/emacs-modes/haskell/git.nix { }); hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { }; @@ -9906,6 +9928,10 @@ let gpsd = callPackage ../servers/gpsd { }; + gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { + inherit (gnome2) gtk; + }; + guitone = callPackage ../applications/version-management/guitone { graphviz = graphviz_2_32; }; @@ -10171,6 +10197,10 @@ let mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; + mediainfo = callPackage ../applications/misc/mediainfo { }; + + mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; + meld = callPackage ../applications/version-management/meld { inherit (gnome) scrollkeeper; pygtk = pyGtkGlade; @@ -10212,6 +10242,8 @@ let minidjvu = callPackage ../applications/graphics/minidjvu { }; + mimms = callPackage ../applications/audio/mimms {}; + mirage = callPackage ../applications/graphics/mirage {}; mixxx = callPackage ../applications/audio/mixxx { @@ -10264,9 +10296,11 @@ let }; easytag = callPackage ../applications/audio/easytag { - inherit (gnome3) gnome_icon_theme; + inherit (gnome3) gnome_icon_theme dconf; }; + mp3gain = callPackage ../applications/audio/mp3gain { }; + mp3info = callPackage ../applications/audio/mp3info { }; mp3splt = callPackage ../applications/audio/mp3splt { }; @@ -11183,7 +11217,7 @@ let ); libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); - gst_plugins = [ gst_plugins_base gst_plugins_good gst_ffmpeg ]; + gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; gtk_modules = [ libcanberra ]; }; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 9edabc13037..1b1ee488cc9 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,16 +15,19 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = null; }; + cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = null; }; mtl = self.mtl_2_2_1; - transformersCompat = super.transformersCompat_0_3_3; }; ghc783Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; + cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = self.Cabal_1_20_0_2; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; + jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_2; }; MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x mtl = self.mtl_2_1_3_1; + transformersCompat = super.transformersCompat.override { cabal = self.cabal.override { + extension = self: super: { configureFlags = "-fthree " + super.configureFlags or ""; }; + }; }; }; ghc763Prefs = self : super : ghc783Prefs self super // { @@ -81,7 +84,6 @@ binary = self.binary_0_7_2_2; # core package in ghc >= 7.2.2 caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2 HsSyck = self.HsSyck_0_51; - jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; random = null; # core package in ghc <= 7.0.x }; @@ -94,6 +96,7 @@ deepseq = self.deepseq_1_2_0_1; dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; exceptions = null; # none of our versions compile + jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; monadPar = self.monadPar_0_1_0_3; nats = null; # none of our versions compile @@ -229,6 +232,13 @@ prefFun = ghc783Prefs; }; + + packages_ghc784 = + packages { ghcPath = ../development/compilers/ghc/7.8.4.nix; + ghcBinary = if stdenv.isDarwin then ghc783Binary else ghc742Binary; + prefFun = ghc783Prefs; + }; + packages_ghc763 = packages { ghcPath = ../development/compilers/ghc/7.6.3.nix; ghcBinary = ghc704Binary; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 51b53743e94..04896aaa90e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -556,6 +556,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in csv = callPackage ../development/libraries/haskell/csv {}; + csv-conduit = callPackage ../development/libraries/haskell/csv-conduit {}; + cssText = callPackage ../development/libraries/haskell/css-text {}; cufft = callPackage ../development/libraries/haskell/cufft {}; @@ -1556,6 +1558,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libmpd = callPackage ../development/libraries/haskell/libmpd {}; + libnotify = callPackage ../development/libraries/haskell/libnotify {}; + liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal {}; @@ -1882,6 +1886,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in optparseApplicative_0_11_0_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.11.0.1.nix {}; optparseApplicative = self.optparseApplicative_0_11_0_1; + packdeps = callPackage ../development/tools/haskell/packdeps {}; + pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; patience = callPackage ../development/libraries/haskell/patience {}; @@ -2633,9 +2639,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; - transformersCompat_0_3_3 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.nix {}; - transformersCompat_0_3_3_4 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.4.nix {}; - transformersCompat = self.transformersCompat_0_3_3_4; + transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {}; transformersFree = callPackage ../development/libraries/haskell/transformers-free {}; @@ -3148,11 +3152,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { - HTTP = self.HTTP.override { network = self.network_2_5_0_0; }; - Cabal = self.Cabal_1_20_0_2; - }; - cabalInstall = self.cabalInstall_1_20_0_3; + cabalInstall_1_20_0_4 = callPackage ../tools/package-management/cabal-install/1.20.0.4.nix { Cabal = self.Cabal_1_20_0_2; }; + cabalInstall = self.cabalInstall_1_20_0_4; codex = callPackage ../development/tools/haskell/codex {}; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 245483e76b3..eeff4a47f9e 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,8 +5,9 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, callPackage, unzip, zziplib -, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat +{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool +, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo +, perl, gtk, python, glib, gobjectIntrospection }: let @@ -14,6 +15,7 @@ let isLua52 = lua.luaversion == "5.2"; self = _self; _self = with self; { + inherit lua; inherit (stdenv.lib) maintainers; #define build lua package function @@ -255,4 +257,31 @@ let license = stdenv.lib.licenses.mit; }; }; + + lgi = stdenv.mkDerivation rec { + name = "lgi-${version}"; + version = "0.7.2"; + + src = fetchurl { + url = "https://github.com/pavouk/lgi/archive/${version}.tar.gz"; + sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn"; + }; + + meta = with stdenv.lib; { + description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; + homepage = https://github.com/pavouk/lgi; + license = "custom"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + buildInputs = [ glib gobjectIntrospection lua pkgconfig ]; + + makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; + + preBuild = '' + sed -i "s|/usr/local|$out|" lgi/Makefile + ''; + }; + }; in self diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index b2ce39216cc..10a19fda8ae 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -137,44 +137,22 @@ self.by-version."abbrev"."1.0.5"; by-spec."abbrev"."~1.0.5" = self.by-version."abbrev"."1.0.5"; - by-spec."accepts"."1.0.0" = - self.by-version."accepts"."1.0.0"; - by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "accepts-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.0.0.tgz"; - name = "accepts-1.0.0.tgz"; - sha1 = "3604c765586c3b9cf7877b6937cdbd4587f947dc"; - }) - ]; - buildInputs = - (self.nativeDeps."accepts" or []); - deps = { - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "accepts" ]; - }; by-spec."accepts"."~1.1.0" = - self.by-version."accepts"."1.1.3"; - by-version."accepts"."1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "accepts-1.1.3"; + self.by-version."accepts"."1.1.4"; + by-version."accepts"."1.1.4" = lib.makeOverridable self.buildNodePackage { + name = "accepts-1.1.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.3.tgz"; - name = "accepts-1.1.3.tgz"; - sha1 = "14d99f8ee3ea69f8709d4bd17ffe153bef0f6c6d"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz"; + name = "accepts-1.1.4.tgz"; + sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a"; }) ]; buildInputs = (self.nativeDeps."accepts" or []); deps = { - "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9"; }; peerDependencies = [ @@ -182,9 +160,11 @@ passthru.names = [ "accepts" ]; }; by-spec."accepts"."~1.1.2" = - self.by-version."accepts"."1.1.3"; + self.by-version."accepts"."1.1.4"; by-spec."accepts"."~1.1.3" = - self.by-version."accepts"."1.1.3"; + self.by-version."accepts"."1.1.4"; + by-spec."accepts"."~1.1.4" = + self.by-version."accepts"."1.1.4"; by-spec."acorn"."^0.8.0" = self.by-version."acorn"."0.8.0"; by-version."acorn"."0.8.0" = lib.makeOverridable self.buildNodePackage { @@ -348,7 +328,7 @@ buildInputs = (self.nativeDeps."airplay-js" or []); deps = { - "mdns-js-0.2.2" = self.by-version."mdns-js"."0.2.2"; + "mdns-js-0.2.4" = self.by-version."mdns-js"."0.2.4"; "plist-with-patches-0.5.1" = self.by-version."plist-with-patches"."0.5.1"; }; peerDependencies = [ @@ -419,26 +399,6 @@ ]; passthru.names = [ "ansi" ]; }; - by-spec."ansi"."~0.2.1" = - self.by-version."ansi"."0.2.1"; - by-version."ansi"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "ansi-0.2.1"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz"; - name = "ansi-0.2.1.tgz"; - sha1 = "3ab568ec18cd0ab7753c83117d57dad684a1c017"; - }) - ]; - buildInputs = - (self.nativeDeps."ansi" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "ansi" ]; - }; by-spec."ansi"."~0.3.0" = self.by-version."ansi"."0.3.0"; by-version."ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -501,6 +461,26 @@ }; by-spec."ansi-regex"."^0.2.1" = self.by-version."ansi-regex"."0.2.1"; + by-spec."ansi-regex"."^1.0.0" = + self.by-version."ansi-regex"."1.1.0"; + by-version."ansi-regex"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "ansi-regex-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.0.tgz"; + name = "ansi-regex-1.1.0.tgz"; + sha1 = "67792c5d6ad05c792d6cd6057ac8f5e69ebf4357"; + }) + ]; + buildInputs = + (self.nativeDeps."ansi-regex" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ansi-regex" ]; + }; by-spec."ansi-remover"."*" = self.by-version."ansi-remover"."0.0.2"; by-version."ansi-remover"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -639,7 +619,7 @@ (self.nativeDeps."archiver" or []); deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; "lazystream-0.1.0" = self.by-version."lazystream"."0.1.0"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; @@ -718,7 +698,27 @@ passthru.names = [ "argparse" ]; }; by-spec."argparse"."~ 0.1.11" = - self.by-version."argparse"."0.1.15"; + self.by-version."argparse"."0.1.16"; + by-version."argparse"."0.1.16" = lib.makeOverridable self.buildNodePackage { + name = "argparse-0.1.16"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; + name = "argparse-0.1.16.tgz"; + sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; + }) + ]; + buildInputs = + (self.nativeDeps."argparse" or []); + deps = { + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore.string-2.4.0" = self.by-version."underscore.string"."2.4.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "argparse" ]; + }; by-spec."array-filter"."~0.0.0" = self.by-version."array-filter"."0.0.1"; by-version."array-filter"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -841,7 +841,7 @@ ]; passthru.names = [ "asn1" ]; }; - by-spec."asn1.js".">=0.6.0-0 >=0.6.4-0 <0.7.0-0" = + by-spec."asn1.js".">=0.6.0-0 >=0.6.5-0 <0.7.0-0" = self.by-version."asn1.js"."0.6.5"; by-version."asn1.js"."0.6.5" = lib.makeOverridable self.buildNodePackage { name = "asn1.js-0.6.5"; @@ -864,7 +864,7 @@ }; by-spec."asn1.js"."^0.6.0" = self.by-version."asn1.js"."0.6.5"; - by-spec."asn1.js"."^0.6.4" = + by-spec."asn1.js"."^0.6.5" = self.by-version."asn1.js"."0.6.5"; by-spec."asn1.js-rfc3280"."^0.5.1" = self.by-version."asn1.js-rfc3280"."0.5.1"; @@ -1135,26 +1135,8 @@ self.by-version."async"."0.2.10"; by-spec."async"."~0.2.9" = self.by-version."async"."0.2.10"; - by-spec."async"."~0.8" = - self.by-version."async"."0.8.0"; - by-version."async"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "async-0.8.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.8.0.tgz"; - name = "async-0.8.0.tgz"; - sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; + by-spec."async"."~0.9" = + self.by-version."async"."0.9.0"; by-spec."async"."~0.9.0" = self.by-version."async"."0.9.0"; by-spec."async-each"."~0.1.5" = @@ -1199,15 +1181,15 @@ passthru.names = [ "async-some" ]; }; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.0.29"; - by-version."aws-sdk"."2.0.29" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-2.0.29"; + self.by-version."aws-sdk"."2.1.4"; + by-version."aws-sdk"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-2.1.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.29.tgz"; - name = "aws-sdk-2.0.29.tgz"; - sha1 = "01c8f18d43a1174637e04dad20cd04673385e18b"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.4.tgz"; + name = "aws-sdk-2.1.4.tgz"; + sha1 = "228a70fb95bb8ccf721423b87ab1c60a147cd38d"; }) ]; buildInputs = @@ -1220,7 +1202,7 @@ ]; passthru.names = [ "aws-sdk" ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.0.29"; + "aws-sdk" = self.by-version."aws-sdk"."2.1.4"; by-spec."aws-sdk".">=1.2.0 <2" = self.by-version."aws-sdk"."1.18.0"; by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage { @@ -1365,6 +1347,26 @@ ]; passthru.names = [ "backoff" ]; }; + by-spec."balanced-match"."^0.2.0" = + self.by-version."balanced-match"."0.2.0"; + by-version."balanced-match"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "balanced-match-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; + name = "balanced-match-0.2.0.tgz"; + sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674"; + }) + ]; + buildInputs = + (self.nativeDeps."balanced-match" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "balanced-match" ]; + }; by-spec."base62"."0.1.1" = self.by-version."base62"."0.1.1"; by-version."base62"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1757,7 +1759,7 @@ deps = { "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "debug-1.0.4" = self.by-version."debug"."1.0.4"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; @@ -1765,7 +1767,7 @@ "once-1.3.1" = self.by-version."once"."1.3.1"; "portfinder-0.2.1" = self.by-version."portfinder"."0.2.1"; "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0"; - "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; peerDependencies = [ ]; @@ -1789,7 +1791,7 @@ "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0"; "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; @@ -1797,22 +1799,22 @@ "k-bucket-0.4.2" = self.by-version."k-bucket"."0.4.2"; "once-1.3.1" = self.by-version."once"."1.3.1"; "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0"; - "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; peerDependencies = [ ]; passthru.names = [ "bittorrent-dht" ]; }; by-spec."bittorrent-tracker"."^2.0.0" = - self.by-version."bittorrent-tracker"."2.9.1"; - by-version."bittorrent-tracker"."2.9.1" = lib.makeOverridable self.buildNodePackage { - name = "bittorrent-tracker-2.9.1"; + self.by-version."bittorrent-tracker"."2.10.0"; + by-version."bittorrent-tracker"."2.10.0" = lib.makeOverridable self.buildNodePackage { + name = "bittorrent-tracker-2.10.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.9.1.tgz"; - name = "bittorrent-tracker-2.9.1.tgz"; - sha1 = "a1168960898a02bc193f95d60d07504a31154cee"; + url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.10.0.tgz"; + name = "bittorrent-tracker-2.10.0.tgz"; + sha1 = "faa80f136d37432c2a3db6a9c21a4d92c89f2b56"; }) ]; buildInputs = @@ -1821,7 +1823,7 @@ "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; "extend.js-0.0.1" = self.by-version."extend.js"."0.0.1"; @@ -1830,14 +1832,15 @@ "ip-0.3.2" = self.by-version."ip"."0.3.2"; "once-1.3.1" = self.by-version."once"."1.3.1"; "portfinder-0.2.1" = self.by-version."portfinder"."0.2.1"; - "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + "run-series-1.0.2" = self.by-version."run-series"."1.0.2"; + "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; peerDependencies = [ ]; passthru.names = [ "bittorrent-tracker" ]; }; by-spec."bittorrent-tracker"."^2.6.0" = - self.by-version."bittorrent-tracker"."2.9.1"; + self.by-version."bittorrent-tracker"."2.10.0"; by-spec."bl"."^0.9.0" = self.by-version."bl"."0.9.3"; by-version."bl"."0.9.3" = lib.makeOverridable self.buildNodePackage { @@ -1885,15 +1888,15 @@ by-spec."block-stream"."0.0.7" = self.by-version."block-stream"."0.0.7"; by-spec."bluebird".">= 1.2.1" = - self.by-version."bluebird"."2.3.11"; - by-version."bluebird"."2.3.11" = lib.makeOverridable self.buildNodePackage { - name = "bluebird-2.3.11"; + self.by-version."bluebird"."2.4.0"; + by-version."bluebird"."2.4.0" = lib.makeOverridable self.buildNodePackage { + name = "bluebird-2.4.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.11.tgz"; - name = "bluebird-2.3.11.tgz"; - sha1 = "15bb78ed32abf27b090640c0f85e4b91f615c8b6"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.4.0.tgz"; + name = "bluebird-2.4.0.tgz"; + sha1 = "db8f4afa2682459cc625235e155e0782e719b279"; }) ]; buildInputs = @@ -1950,6 +1953,26 @@ self.by-version."bn.js"."0.15.2"; by-spec."bn.js"."^0.15.2" = self.by-version."bn.js"."0.15.2"; + by-spec."bn.js"."^0.16.0" = + self.by-version."bn.js"."0.16.0"; + by-version."bn.js"."0.16.0" = lib.makeOverridable self.buildNodePackage { + name = "bn.js-0.16.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bn.js/-/bn.js-0.16.0.tgz"; + name = "bn.js-0.16.0.tgz"; + sha1 = "5b6f7ea86ec2f8e065dee2b4d5f1540314bf523e"; + }) + ]; + buildInputs = + (self.nativeDeps."bn.js" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bn.js" ]; + }; by-spec."bncode"."^0.2.3" = self.by-version."bncode"."0.2.3"; by-version."bncode"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -2012,7 +2035,7 @@ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; "qs-2.2.4" = self.by-version."qs"."2.2.4"; "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; }; peerDependencies = [ ]; @@ -2040,7 +2063,7 @@ "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "raw-body-1.3.1" = self.by-version."raw-body"."1.3.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; }; peerDependencies = [ ]; @@ -2115,7 +2138,7 @@ "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; "decompress-zip-0.0.8" = self.by-version."decompress-zip"."0.0.8"; "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; - "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "handlebars-2.0.0" = self.by-version."handlebars"."2.0.0"; @@ -2143,7 +2166,7 @@ "tar-fs-0.5.2" = self.by-version."tar-fs"."0.5.2"; "tmp-0.0.23" = self.by-version."tmp"."0.0.23"; "update-notifier-0.2.0" = self.by-version."update-notifier"."0.2.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -2362,6 +2385,28 @@ ]; passthru.names = [ "bplist-parser" ]; }; + by-spec."brace-expansion"."^1.0.0" = + self.by-version."brace-expansion"."1.1.0"; + by-version."brace-expansion"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "brace-expansion-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; + name = "brace-expansion-1.1.0.tgz"; + sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9"; + }) + ]; + buildInputs = + (self.nativeDeps."brace-expansion" or []); + deps = { + "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; + "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "brace-expansion" ]; + }; by-spec."brfs"."0.0.8" = self.by-version."brfs"."0.0.8"; by-version."brfs"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -2529,28 +2574,28 @@ by-spec."browser-request"."~0.3.1" = self.by-version."browser-request"."0.3.3"; by-spec."browser-resolve"."^1.3.0" = - self.by-version."browser-resolve"."1.4.1"; - by-version."browser-resolve"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "browser-resolve-1.4.1"; + self.by-version."browser-resolve"."1.5.0"; + by-version."browser-resolve"."1.5.0" = lib.makeOverridable self.buildNodePackage { + name = "browser-resolve-1.5.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.4.1.tgz"; - name = "browser-resolve-1.4.1.tgz"; - sha1 = "65ac7963f65bd49fa50711c877a1e273bb17a85b"; + url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.5.0.tgz"; + name = "browser-resolve-1.5.0.tgz"; + sha1 = "716cc9008aa2161a38e4c823bb5aa097cff40447"; }) ]; buildInputs = (self.nativeDeps."browser-resolve" or []); deps = { - "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; + "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; }; peerDependencies = [ ]; passthru.names = [ "browser-resolve" ]; }; by-spec."browser-resolve"."^1.3.1" = - self.by-version."browser-resolve"."1.4.1"; + self.by-version."browser-resolve"."1.5.0"; by-spec."browser-resolve"."~1.2.1" = self.by-version."browser-resolve"."1.2.4"; by-version."browser-resolve"."1.2.4" = lib.makeOverridable self.buildNodePackage { @@ -2590,8 +2635,8 @@ (self.nativeDeps."browserchannel" or []); deps = { "hat-0.0.3" = self.by-version."hat"."0.0.3"; - "connect-2.27.4" = self.by-version."connect"."2.27.4"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "connect-2.27.6" = self.by-version."connect"."2.27.6"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0"; }; peerDependencies = [ @@ -2600,15 +2645,15 @@ }; "browserchannel" = self.by-version."browserchannel"."2.0.0"; by-spec."browserify"."*" = - self.by-version."browserify"."6.3.3"; - by-version."browserify"."6.3.3" = lib.makeOverridable self.buildNodePackage { - name = "browserify-6.3.3"; + self.by-version."browserify"."7.0.3"; + by-version."browserify"."7.0.3" = lib.makeOverridable self.buildNodePackage { + name = "browserify-7.0.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-6.3.3.tgz"; - name = "browserify-6.3.3.tgz"; - sha1 = "d2a5031a24aec8045eb8174b501bf3f6248455d4"; + url = "http://registry.npmjs.org/browserify/-/browserify-7.0.3.tgz"; + name = "browserify-7.0.3.tgz"; + sha1 = "b839f84ed22c24b67f79af68002e5684c73d534e"; }) ]; buildInputs = @@ -2617,29 +2662,29 @@ "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4"; "assert-1.1.2" = self.by-version."assert"."1.1.2"; "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0"; - "browser-resolve-1.4.1" = self.by-version."browser-resolve"."1.4.1"; + "browser-resolve-1.5.0" = self.by-version."browser-resolve"."1.5.0"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; - "buffer-2.8.1" = self.by-version."buffer"."2.8.1"; + "buffer-2.8.2" = self.by-version."buffer"."2.8.2"; "builtins-0.0.7" = self.by-version."builtins"."0.0.7"; "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0"; "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; - "crypto-browserify-3.6.0" = self.by-version."crypto-browserify"."3.6.0"; + "crypto-browserify-3.7.0" = self.by-version."crypto-browserify"."3.7.0"; "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5"; "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; "events-1.0.2" = self.by-version."events"."1.0.2"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0"; "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "insert-module-globals-6.1.0" = self.by-version."insert-module-globals"."6.1.0"; "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2"; - "module-deps-3.5.10" = self.by-version."module-deps"."3.5.10"; + "module-deps-3.6.3" = self.by-version."module-deps"."3.6.3"; "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; "parents-0.0.3" = self.by-version."parents"."0.0.3"; "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; @@ -2668,7 +2713,7 @@ ]; passthru.names = [ "browserify" ]; }; - "browserify" = self.by-version."browserify"."6.3.3"; + "browserify" = self.by-version."browserify"."7.0.3"; by-spec."browserify"."3.46.0" = self.by-version."browserify"."3.46.0"; by-version."browserify"."3.46.0" = lib.makeOverridable self.buildNodePackage { @@ -2855,16 +2900,16 @@ ]; passthru.names = [ "browserify" ]; }; - by-spec."browserify-aes"."0.6.0" = - self.by-version."browserify-aes"."0.6.0"; - by-version."browserify-aes"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "browserify-aes-0.6.0"; + by-spec."browserify-aes"."0.6.1" = + self.by-version."browserify-aes"."0.6.1"; + by-version."browserify-aes"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "browserify-aes-0.6.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.6.0.tgz"; - name = "browserify-aes-0.6.0.tgz"; - sha1 = "07df03037306a94f453da08cbaf1b42afcc3b18f"; + url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.6.1.tgz"; + name = "browserify-aes-0.6.1.tgz"; + sha1 = "a7466136ffcb0a2a955d98afa8dc2ced6dc6c004"; }) ]; buildInputs = @@ -2876,27 +2921,25 @@ ]; passthru.names = [ "browserify-aes" ]; }; - by-spec."browserify-sign"."2.4.0" = - self.by-version."browserify-sign"."2.4.0"; - by-version."browserify-sign"."2.4.0" = lib.makeOverridable self.buildNodePackage { - name = "browserify-sign-2.4.0"; + by-spec."browserify-sign"."2.6.0" = + self.by-version."browserify-sign"."2.6.0"; + by-version."browserify-sign"."2.6.0" = lib.makeOverridable self.buildNodePackage { + name = "browserify-sign-2.6.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.4.0.tgz"; - name = "browserify-sign-2.4.0.tgz"; - sha1 = "55bef52192091216336db4fb0bcc88c1d8f049fd"; + url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.6.0.tgz"; + name = "browserify-sign-2.6.0.tgz"; + sha1 = "35def87585f0d8f4b116783a55e1a3711a2c48e3"; }) ]; buildInputs = (self.nativeDeps."browserify-sign" or []); deps = { - "asn1.js-0.6.5" = self.by-version."asn1.js"."0.6.5"; - "asn1.js-rfc3280-0.5.1" = self.by-version."asn1.js-rfc3280"."0.5.1"; "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; "elliptic-0.15.15" = self.by-version."elliptic"."0.15.15"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1"; + "parse-asn1-1.2.0" = self.by-version."parse-asn1"."1.2.0"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = [ @@ -2966,36 +3009,16 @@ ]; passthru.names = [ "bson" ]; }; - by-spec."bson"."0.2.5" = - self.by-version."bson"."0.2.5"; - by-version."bson"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "bson-0.2.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.5.tgz"; - name = "bson-0.2.5.tgz"; - sha1 = "500d26d883ddc8e02f2c88011627636111c105c5"; - }) - ]; - buildInputs = - (self.nativeDeps."bson" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "bson" ]; - }; by-spec."bson"."~0.2" = - self.by-version."bson"."0.2.15"; - by-version."bson"."0.2.15" = lib.makeOverridable self.buildNodePackage { - name = "bson-0.2.15"; + self.by-version."bson"."0.2.16"; + by-version."bson"."0.2.16" = lib.makeOverridable self.buildNodePackage { + name = "bson-0.2.16"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.15.tgz"; - name = "bson-0.2.15.tgz"; - sha1 = "556402c74bf33d8008122cc3091dc8b3b90e330c"; + url = "http://registry.npmjs.org/bson/-/bson-0.2.16.tgz"; + name = "bson-0.2.16.tgz"; + sha1 = "c4d056d16631ec481e8ef33659c01e581d2b97ed"; }) ]; buildInputs = @@ -3008,15 +3031,15 @@ passthru.names = [ "bson" ]; }; by-spec."buffer"."^2.3.0" = - self.by-version."buffer"."2.8.1"; - by-version."buffer"."2.8.1" = lib.makeOverridable self.buildNodePackage { - name = "buffer-2.8.1"; + self.by-version."buffer"."2.8.2"; + by-version."buffer"."2.8.2" = lib.makeOverridable self.buildNodePackage { + name = "buffer-2.8.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/buffer/-/buffer-2.8.1.tgz"; - name = "buffer-2.8.1.tgz"; - sha1 = "6c632bf47cb7ec86509254ed42ab080937986114"; + url = "http://registry.npmjs.org/buffer/-/buffer-2.8.2.tgz"; + name = "buffer-2.8.2.tgz"; + sha1 = "d73c214c0334384dc29b04ee0ff5f5527c7974e7"; }) ]; buildInputs = @@ -3093,15 +3116,15 @@ passthru.names = [ "buffer-crc32" ]; }; by-spec."buffer-crc32"."~0.2.1" = - self.by-version."buffer-crc32"."0.2.4"; - by-version."buffer-crc32"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "buffer-crc32-0.2.4"; + self.by-version."buffer-crc32"."0.2.5"; + by-version."buffer-crc32"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "buffer-crc32-0.2.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.4.tgz"; - name = "buffer-crc32-0.2.4.tgz"; - sha1 = "f729c4c5d2eb39ba49f29422175cc20b0bf1b96f"; + url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"; + name = "buffer-crc32-0.2.5.tgz"; + sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91"; }) ]; buildInputs = @@ -3710,21 +3733,21 @@ by-spec."chmodr"."~0.1.0" = self.by-version."chmodr"."0.1.0"; by-spec."chokidar".">=0.8.2" = - self.by-version."chokidar"."0.11.1"; - by-version."chokidar"."0.11.1" = lib.makeOverridable self.buildNodePackage { - name = "chokidar-0.11.1"; + self.by-version."chokidar"."0.12.5"; + by-version."chokidar"."0.12.5" = lib.makeOverridable self.buildNodePackage { + name = "chokidar-0.12.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-0.11.1.tgz"; - name = "chokidar-0.11.1.tgz"; - sha1 = "b00e01717de445783782ef5c48a803e05fed0fc4"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-0.12.5.tgz"; + name = "chokidar-0.12.5.tgz"; + sha1 = "69ce0c49752dc4d32b5a45023b4b83661f858107"; }) ]; buildInputs = (self.nativeDeps."chokidar" or []); deps = { - "readdirp-1.1.0" = self.by-version."readdirp"."1.1.0"; + "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0"; "async-each-0.1.6" = self.by-version."async-each"."0.1.6"; "fsevents-0.3.1" = self.by-version."fsevents"."0.3.1"; }; @@ -3753,15 +3776,15 @@ passthru.names = [ "chownr" ]; }; by-spec."clean-css"."2.2.x" = - self.by-version."clean-css"."2.2.19"; - by-version."clean-css"."2.2.19" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.2.19"; + self.by-version."clean-css"."2.2.22"; + by-version."clean-css"."2.2.22" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.2.22"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.19.tgz"; - name = "clean-css-2.2.19.tgz"; - sha1 = "b5863312e2e13fdf693e44d60b41ce45cbb6fdbd"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.22.tgz"; + name = "clean-css-2.2.22.tgz"; + sha1 = "2346e4656bb16a0afc25f00bd75273fdcd53ff35"; }) ]; buildInputs = @@ -3774,7 +3797,7 @@ passthru.names = [ "clean-css" ]; }; by-spec."clean-css"."~2.2.0" = - self.by-version."clean-css"."2.2.19"; + self.by-version."clean-css"."2.2.22"; by-spec."cli"."0.6.x" = self.by-version."cli"."0.6.5"; by-version."cli"."0.6.5" = lib.makeOverridable self.buildNodePackage { @@ -3821,7 +3844,7 @@ ]; passthru.names = [ "cli-color" ]; }; - by-spec."cli-table"."^0.3.0" = + by-spec."cli-table"."^0.3.1" = self.by-version."cli-table"."0.3.1"; by-version."cli-table"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "cli-table-0.3.1"; @@ -3889,7 +3912,28 @@ passthru.names = [ "cliff" ]; }; by-spec."cliff"."~0.1.9" = - self.by-version."cliff"."0.1.9"; + self.by-version."cliff"."0.1.10"; + by-version."cliff"."0.1.10" = lib.makeOverridable self.buildNodePackage { + name = "cliff-0.1.10"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz"; + name = "cliff-0.1.10.tgz"; + sha1 = "53be33ea9f59bec85609ee300ac4207603e52013"; + }) + ]; + buildInputs = + (self.nativeDeps."cliff" or []); + deps = { + "colors-1.0.3" = self.by-version."colors"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "winston-0.8.3" = self.by-version."winston"."0.8.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cliff" ]; + }; by-spec."clivas"."^0.1.4" = self.by-version."clivas"."0.1.4"; by-version."clivas"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -3970,16 +4014,16 @@ ]; passthru.names = [ "clone" ]; }; - by-spec."clone"."^0.1.18" = - self.by-version."clone"."0.1.18"; - by-version."clone"."0.1.18" = lib.makeOverridable self.buildNodePackage { - name = "clone-0.1.18"; + by-spec."clone"."^0.2.0" = + self.by-version."clone"."0.2.0"; + by-version."clone"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "clone-0.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/clone/-/clone-0.1.18.tgz"; - name = "clone-0.1.18.tgz"; - sha1 = "64a0d5d57eaa85a1a8af380cd1db8c7b3a895f66"; + url = "http://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; + name = "clone-0.2.0.tgz"; + sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; }) ]; buildInputs = @@ -3990,10 +4034,28 @@ ]; passthru.names = [ "clone" ]; }; - by-spec."clone"."~0.1.18" = - self.by-version."clone"."0.1.18"; by-spec."clone"."~0.1.5" = - self.by-version."clone"."0.1.18"; + self.by-version."clone"."0.1.19"; + by-version."clone"."0.1.19" = lib.makeOverridable self.buildNodePackage { + name = "clone-0.1.19"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz"; + name = "clone-0.1.19.tgz"; + sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85"; + }) + ]; + buildInputs = + (self.nativeDeps."clone" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "clone" ]; + }; + by-spec."clone"."~0.2.0" = + self.by-version."clone"."0.2.0"; by-spec."clone-stats"."^0.0.1" = self.by-version."clone-stats"."0.0.1"; by-version."clone-stats"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4038,8 +4100,6 @@ ]; passthru.names = [ "cmd-shim" ]; }; - by-spec."cmd-shim"."~1.1.1" = - self.by-version."cmd-shim"."1.1.2"; by-spec."cmd-shim"."~2.0.1" = self.by-version."cmd-shim"."2.0.1"; by-version."cmd-shim"."2.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4191,7 +4251,7 @@ (self.nativeDeps."color" or []); deps = { "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2"; - "color-string-0.2.1" = self.by-version."color-string"."0.2.1"; + "color-string-0.2.4" = self.by-version."color-string"."0.2.4"; }; peerDependencies = [ ]; @@ -4217,22 +4277,42 @@ ]; passthru.names = [ "color-convert" ]; }; - by-spec."color-string"."0.2.x" = - self.by-version."color-string"."0.2.1"; - by-version."color-string"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "color-string-0.2.1"; + by-spec."color-name"."1.0.x" = + self.by-version."color-name"."1.0.0"; + by-version."color-name"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "color-name-1.0.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/color-string/-/color-string-0.2.1.tgz"; - name = "color-string-0.2.1.tgz"; - sha1 = "2f3c1e6c1d04ddf751633b28db7fbc152055d34e"; + url = "http://registry.npmjs.org/color-name/-/color-name-1.0.0.tgz"; + name = "color-name-1.0.0.tgz"; + sha1 = "ce3579a4ef43b672bee4f37e8876332b5a36e6b5"; + }) + ]; + buildInputs = + (self.nativeDeps."color-name" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "color-name" ]; + }; + by-spec."color-string"."0.2.x" = + self.by-version."color-string"."0.2.4"; + by-version."color-string"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "color-string-0.2.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/color-string/-/color-string-0.2.4.tgz"; + name = "color-string-0.2.4.tgz"; + sha1 = "221ff64234f71aaa3e13bc8c7e8c95f3cdd8f81a"; }) ]; buildInputs = (self.nativeDeps."color-string" or []); deps = { - "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2"; + "color-name-1.0.0" = self.by-version."color-name"."1.0.0"; }; peerDependencies = [ ]; @@ -4302,42 +4382,24 @@ }; by-spec."colors"."~0.6.2" = self.by-version."colors"."0.6.2"; - by-spec."columnify"."0.1.2" = - self.by-version."columnify"."0.1.2"; - by-version."columnify"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "columnify-0.1.2"; + by-spec."colors"."~1.0.3" = + self.by-version."colors"."1.0.3"; + by-spec."columnify"."~1.3.2" = + self.by-version."columnify"."1.3.2"; + by-version."columnify"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "columnify-1.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz"; - name = "columnify-0.1.2.tgz"; - sha1 = "ab1a1f1e37b26ba4b87c6920fb717fe51c827042"; + url = "http://registry.npmjs.org/columnify/-/columnify-1.3.2.tgz"; + name = "columnify-1.3.2.tgz"; + sha1 = "61bd578a9269ae6fd949ce36fff589f3702c7867"; }) ]; buildInputs = (self.nativeDeps."columnify" or []); deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "columnify" ]; - }; - by-spec."columnify"."~1.2.1" = - self.by-version."columnify"."1.2.1"; - by-version."columnify"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "columnify-1.2.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz"; - name = "columnify-1.2.1.tgz"; - sha1 = "921ec51c178f4126d3c07e9acecd67a55c7953e4"; - }) - ]; - buildInputs = - (self.nativeDeps."columnify" or []); - deps = { - "strip-ansi-1.0.0" = self.by-version."strip-ansi"."1.0.0"; + "strip-ansi-2.0.0" = self.by-version."strip-ansi"."2.0.0"; "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0"; }; peerDependencies = [ @@ -4361,7 +4423,7 @@ deps = { "inline-source-map-0.3.0" = self.by-version."inline-source-map"."0.3.0"; "convert-source-map-0.3.5" = self.by-version."convert-source-map"."0.3.5"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -4472,8 +4534,6 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."2.0.x" = - self.by-version."commander"."2.0.0"; by-spec."commander"."2.1.0" = self.by-version."commander"."2.1.0"; by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -4534,16 +4594,16 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."2.x" = - self.by-version."commander"."2.5.0"; - by-version."commander"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "commander-2.5.0"; + by-spec."commander"."2.5.x" = + self.by-version."commander"."2.5.1"; + by-version."commander"."2.5.1" = lib.makeOverridable self.buildNodePackage { + name = "commander-2.5.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.5.0.tgz"; - name = "commander-2.5.0.tgz"; - sha1 = "d777b6a4d847d423e5d475da864294ac1ff5aa9d"; + url = "http://registry.npmjs.org/commander/-/commander-2.5.1.tgz"; + name = "commander-2.5.1.tgz"; + sha1 = "23c61f6e47be143cc02e7ad4bb1c47f5cd5a2883"; }) ]; buildInputs = @@ -4554,14 +4614,14 @@ ]; passthru.names = [ "commander" ]; }; + by-spec."commander"."2.x" = + self.by-version."commander"."2.5.1"; by-spec."commander"."~2.0.0" = self.by-version."commander"."2.0.0"; by-spec."commander"."~2.1.0" = self.by-version."commander"."2.1.0"; - by-spec."commander"."~2.3.0" = - self.by-version."commander"."2.3.0"; by-spec."commander"."~2.5.0" = - self.by-version."commander"."2.5.0"; + self.by-version."commander"."2.5.1"; by-spec."commondir"."0.0.1" = self.by-version."commondir"."0.0.1"; by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4585,20 +4645,21 @@ by-spec."commondir"."~0.0.1" = self.by-version."commondir"."0.0.1"; by-spec."compact2string"."^1.2.0" = - self.by-version."compact2string"."1.3.0"; - by-version."compact2string"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "compact2string-1.3.0"; + self.by-version."compact2string"."1.4.0"; + by-version."compact2string"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "compact2string-1.4.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/compact2string/-/compact2string-1.3.0.tgz"; - name = "compact2string-1.3.0.tgz"; - sha1 = "5e5d32fe4d40ca853ec0f6f22f7952aa9fe36135"; + url = "http://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz"; + name = "compact2string-1.4.0.tgz"; + sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49"; }) ]; buildInputs = (self.nativeDeps."compact2string" or []); deps = { + "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6"; }; peerDependencies = [ ]; @@ -4639,7 +4700,7 @@ buildInputs = (self.nativeDeps."compress-commons" or []); deps = { - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "crc32-stream-0.3.1" = self.by-version."crc32-stream"."0.3.1"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; @@ -4682,7 +4743,7 @@ buildInputs = (self.nativeDeps."compressible" or []); deps = { - "mime-db-1.2.0" = self.by-version."mime-db"."1.2.0"; + "mime-db-1.3.1" = self.by-version."mime-db"."1.3.1"; }; peerDependencies = [ ]; @@ -4726,7 +4787,7 @@ buildInputs = (self.nativeDeps."compression" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; @@ -4737,22 +4798,22 @@ ]; passthru.names = [ "compression" ]; }; - by-spec."compression"."~1.2.1" = - self.by-version."compression"."1.2.1"; - by-version."compression"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "compression-1.2.1"; + by-spec."compression"."~1.2.2" = + self.by-version."compression"."1.2.2"; + by-version."compression"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "compression-1.2.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.2.1.tgz"; - name = "compression-1.2.1.tgz"; - sha1 = "12ebaac04d308ca6103618a9716ce5634b939e9c"; + url = "http://registry.npmjs.org/compression/-/compression-1.2.2.tgz"; + name = "compression-1.2.2.tgz"; + sha1 = "637604c25ed659c0d5c9fac1038fc2f2d5494dbf"; }) ]; buildInputs = (self.nativeDeps."compression" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; @@ -4763,6 +4824,26 @@ ]; passthru.names = [ "compression" ]; }; + by-spec."concat-map"."0.0.1" = + self.by-version."concat-map"."0.0.1"; + by-version."concat-map"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "concat-map-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + name = "concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }) + ]; + buildInputs = + (self.nativeDeps."concat-map" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "concat-map" ]; + }; by-spec."concat-stream"."^1.4.1" = self.by-version."concat-stream"."1.4.7"; by-version."concat-stream"."1.4.7" = lib.makeOverridable self.buildNodePackage { @@ -4811,7 +4892,7 @@ deps = { "js-yaml-0.3.7" = self.by-version."js-yaml"."0.3.7"; "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "vows-0.8.1" = self.by-version."vows"."0.8.1"; + "vows-0.9.0-rc1" = self.by-version."vows"."0.9.0-rc1"; }; peerDependencies = [ ]; @@ -4886,7 +4967,7 @@ deps = { "qs-2.3.3" = self.by-version."qs"."2.3.3"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "formidable-1.0.15" = self.by-version."formidable"."1.0.15"; + "formidable-1.0.16" = self.by-version."formidable"."1.0.16"; }; peerDependencies = [ ]; @@ -4969,16 +5050,16 @@ ]; passthru.names = [ "connect" ]; }; - by-spec."connect"."2.27.4" = - self.by-version."connect"."2.27.4"; - by-version."connect"."2.27.4" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.27.4"; + by-spec."connect"."2.27.6" = + self.by-version."connect"."2.27.6"; + by-version."connect"."2.27.6" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.27.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.27.4.tgz"; - name = "connect-2.27.4.tgz"; - sha1 = "12592c9d105326c5191176f8d57e760d6650c830"; + url = "http://registry.npmjs.org/connect/-/connect-2.27.6.tgz"; + name = "connect-2.27.6.tgz"; + sha1 = "3a097322ce731ce302e736d42e262b6d3b753d48"; }) ]; buildInputs = @@ -4990,16 +5071,16 @@ "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "compression-1.2.1" = self.by-version."compression"."1.2.1"; + "compression-1.2.2" = self.by-version."compression"."1.2.2"; "connect-timeout-1.4.0" = self.by-version."connect-timeout"."1.4.0"; "csurf-1.6.3" = self.by-version."csurf"."1.6.3"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; "depd-1.0.0" = self.by-version."depd"."1.0.0"; "errorhandler-1.2.3" = self.by-version."errorhandler"."1.2.3"; - "express-session-1.9.2" = self.by-version."express-session"."1.9.2"; + "express-session-1.9.3" = self.by-version."express-session"."1.9.3"; "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "method-override-2.3.0" = self.by-version."method-override"."2.3.0"; "morgan-1.4.1" = self.by-version."morgan"."1.4.1"; @@ -5009,9 +5090,9 @@ "qs-2.3.3" = self.by-version."qs"."2.3.3"; "response-time-2.2.0" = self.by-version."response-time"."2.2.0"; "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7"; - "serve-index-1.5.1" = self.by-version."serve-index"."1.5.1"; + "serve-index-1.5.3" = self.by-version."serve-index"."1.5.3"; "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; @@ -5109,7 +5190,7 @@ passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.27.4"; + self.by-version."connect"."2.27.6"; by-spec."connect"."~2.26.0" = self.by-version."connect"."2.26.6"; by-version."connect"."2.26.6" = lib.makeOverridable self.buildNodePackage { @@ -5151,7 +5232,7 @@ "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7"; "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1"; "serve-static-1.6.4" = self.by-version."serve-static"."1.6.4"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; }; @@ -5215,7 +5296,7 @@ buildInputs = (self.nativeDeps."connect-jade-static" or []); deps = { - "jade-1.8.1" = self.by-version."jade"."1.8.1"; + "jade-1.8.2" = self.by-version."jade"."1.8.2"; }; peerDependencies = [ ]; @@ -5223,27 +5304,27 @@ }; "connect-jade-static" = self.by-version."connect-jade-static"."0.1.4"; by-spec."connect-mongo"."*" = - self.by-version."connect-mongo"."0.4.1"; - by-version."connect-mongo"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "connect-mongo-0.4.1"; + self.by-version."connect-mongo"."0.4.2"; + by-version."connect-mongo"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "connect-mongo-0.4.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.1.tgz"; - name = "connect-mongo-0.4.1.tgz"; - sha1 = "01ed3e71558fb3f0fdc97b784ef974f9909ddd11"; + url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.2.tgz"; + name = "connect-mongo-0.4.2.tgz"; + sha1 = "a9817a9a229d790460ab0bf946ee0ce8ac3ccba7"; }) ]; buildInputs = (self.nativeDeps."connect-mongo" or []); deps = { - "mongodb-1.3.23" = self.by-version."mongodb"."1.3.23"; + "mongodb-1.4.25" = self.by-version."mongodb"."1.4.25"; }; peerDependencies = [ ]; passthru.names = [ "connect-mongo" ]; }; - "connect-mongo" = self.by-version."connect-mongo"."0.4.1"; + "connect-mongo" = self.by-version."connect-mongo"."0.4.2"; by-spec."connect-timeout"."1.0.0" = self.by-version."connect-timeout"."1.0.0"; by-version."connect-timeout"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -5304,7 +5385,7 @@ (self.nativeDeps."connect-timeout" or []); deps = { "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; "ms-0.6.2" = self.by-version."ms"."0.6.2"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; }; @@ -5390,7 +5471,7 @@ buildInputs = (self.nativeDeps."constantinople" or []); deps = { - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; peerDependencies = [ ]; @@ -5888,7 +5969,7 @@ buildInputs = (self.nativeDeps."couch-login" or []); deps = { - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; }; peerDependencies = [ ]; @@ -5997,7 +6078,7 @@ (self.nativeDeps."crc32-stream" or []); deps = { "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; }; peerDependencies = [ ]; @@ -6109,25 +6190,26 @@ passthru.names = [ "crypto" ]; }; by-spec."crypto-browserify"."^3.0.0" = - self.by-version."crypto-browserify"."3.6.0"; - by-version."crypto-browserify"."3.6.0" = lib.makeOverridable self.buildNodePackage { - name = "crypto-browserify-3.6.0"; + self.by-version."crypto-browserify"."3.7.0"; + by-version."crypto-browserify"."3.7.0" = lib.makeOverridable self.buildNodePackage { + name = "crypto-browserify-3.7.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.6.0.tgz"; - name = "crypto-browserify-3.6.0.tgz"; - sha1 = "6f74a6d30cf0bd11ef5168410bbdc7a65f6d01cb"; + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.7.0.tgz"; + name = "crypto-browserify-3.7.0.tgz"; + sha1 = "5b9de9b65b04f22a087cb0339db5232f536323cc"; }) ]; buildInputs = (self.nativeDeps."crypto-browserify" or []); deps = { - "browserify-aes-0.6.0" = self.by-version."browserify-aes"."0.6.0"; - "browserify-sign-2.4.0" = self.by-version."browserify-sign"."2.4.0"; + "browserify-aes-0.6.1" = self.by-version."browserify-aes"."0.6.1"; "create-ecdh-1.0.0" = self.by-version."create-ecdh"."1.0.0"; "diffie-hellman-2.2.0" = self.by-version."diffie-hellman"."2.2.0"; + "browserify-sign-2.6.0" = self.by-version."browserify-sign"."2.6.0"; "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1"; + "public-encrypt-1.0.1" = self.by-version."public-encrypt"."1.0.1"; "ripemd160-0.2.0" = self.by-version."ripemd160"."0.2.0"; "sha.js-2.3.0" = self.by-version."sha.js"."2.3.0"; }; @@ -6301,7 +6383,7 @@ "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; "csrf-2.0.2" = self.by-version."csrf"."2.0.2"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; }; peerDependencies = [ ]; @@ -6643,7 +6725,7 @@ }; by-spec."debug"."^0.8.1" = self.by-version."debug"."0.8.1"; - by-spec."debug"."^1.0.0" = + by-spec."debug"."^1.0" = self.by-version."debug"."1.0.4"; by-version."debug"."1.0.4" = lib.makeOverridable self.buildNodePackage { name = "debug-1.0.4"; @@ -6664,16 +6746,18 @@ ]; passthru.names = [ "debug" ]; }; + by-spec."debug"."^1.0.0" = + self.by-version."debug"."1.0.4"; by-spec."debug"."^1.0.2" = self.by-version."debug"."1.0.4"; by-spec."debug"."^2.0.0" = self.by-version."debug"."2.1.0"; by-spec."debug"."^2.1.0" = self.by-version."debug"."2.1.0"; + by-spec."debug"."~0.7.2" = + self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.4" = self.by-version."debug"."0.7.4"; - by-spec."debug"."~0.8" = - self.by-version."debug"."0.8.1"; by-spec."debug"."~0.8.1" = self.by-version."debug"."0.8.1"; by-spec."debug"."~0.x" = @@ -6856,6 +6940,26 @@ ]; passthru.names = [ "deep-extend" ]; }; + by-spec."deep-is"."~0.1.2" = + self.by-version."deep-is"."0.1.3"; + by-version."deep-is"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "deep-is-0.1.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + name = "deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-is" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "deep-is" ]; + }; by-spec."deepmerge"."*" = self.by-version."deepmerge"."0.2.7"; by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -6892,7 +6996,7 @@ buildInputs = (self.nativeDeps."defaults" or []); deps = { - "clone-0.1.18" = self.by-version."clone"."0.1.18"; + "clone-0.1.19" = self.by-version."clone"."0.1.19"; }; peerDependencies = [ ]; @@ -7152,7 +7256,7 @@ deps = { "acorn-0.9.0" = self.by-version."acorn"."0.9.0"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; - "escodegen-1.4.1" = self.by-version."escodegen"."1.4.1"; + "escodegen-1.4.3" = self.by-version."escodegen"."1.4.3"; }; peerDependencies = [ ]; @@ -7290,8 +7394,26 @@ }; by-spec."diff"."~1.0.7" = self.by-version."diff"."1.0.8"; - by-spec."diff"."~1.0.8" = - self.by-version."diff"."1.0.8"; + by-spec."diff"."~1.2.0" = + self.by-version."diff"."1.2.0"; + by-version."diff"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "diff-1.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/diff/-/diff-1.2.0.tgz"; + name = "diff-1.2.0.tgz"; + sha1 = "52166e04bef0e146541015d0af19a7860ff95644"; + }) + ]; + buildInputs = + (self.nativeDeps."diff" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "diff" ]; + }; by-spec."diffie-hellman"."2.2.0" = self.by-version."diffie-hellman"."2.2.0"; by-version."diffie-hellman"."2.2.0" = lib.makeOverridable self.buildNodePackage { @@ -7314,16 +7436,16 @@ ]; passthru.names = [ "diffie-hellman" ]; }; - by-spec."director"."1.2.3" = - self.by-version."director"."1.2.3"; - by-version."director"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "director-1.2.3"; + by-spec."director"."1.2.7" = + self.by-version."director"."1.2.7"; + by-version."director"."1.2.7" = lib.makeOverridable self.buildNodePackage { + name = "director-1.2.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/director/-/director-1.2.3.tgz"; - name = "director-1.2.3.tgz"; - sha1 = "ba68a09312751bb77c52acc75e1f9fd9d3cb15bf"; + url = "http://registry.npmjs.org/director/-/director-1.2.7.tgz"; + name = "director-1.2.7.tgz"; + sha1 = "bfd3741075fd7fb1a5b2e13658c5f4bec77736f3"; }) ]; buildInputs = @@ -7523,6 +7645,28 @@ }; by-spec."duplexer2"."~0.0.2" = self.by-version."duplexer2"."0.0.2"; + by-spec."each-async"."^1.1.0" = + self.by-version."each-async"."1.1.0"; + by-version."each-async"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "each-async-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/each-async/-/each-async-1.1.0.tgz"; + name = "each-async-1.1.0.tgz"; + sha1 = "d7473d5140a870414d5736a337e596fee14d369b"; + }) + ]; + buildInputs = + (self.nativeDeps."each-async" or []); + deps = { + "onetime-1.0.0" = self.by-version."onetime"."1.0.0"; + "setimmediate-1.0.2" = self.by-version."setimmediate"."1.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "each-async" ]; + }; by-spec."editor"."0.0.4" = self.by-version."editor"."0.0.4"; by-version."editor"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -7543,26 +7687,6 @@ ]; passthru.names = [ "editor" ]; }; - by-spec."editor"."0.0.5" = - self.by-version."editor"."0.0.5"; - by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "editor-0.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz"; - name = "editor-0.0.5.tgz"; - sha1 = "8c38877781f2547011c1aeffdbe50cafcc59794a"; - }) - ]; - buildInputs = - (self.nativeDeps."editor" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "editor" ]; - }; by-spec."editor"."~0.1.0" = self.by-version."editor"."0.1.0"; by-version."editor"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -7688,6 +7812,31 @@ ]; passthru.names = [ "elliptic" ]; }; + by-spec."empty-trash"."*" = + self.by-version."empty-trash"."1.1.0"; + by-version."empty-trash"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "empty-trash-1.1.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/empty-trash/-/empty-trash-1.1.0.tgz"; + name = "empty-trash-1.1.0.tgz"; + sha1 = "6b3527ffb5edc2a27ed7e15886414af37a2c3e8e"; + }) + ]; + buildInputs = + (self.nativeDeps."empty-trash" or []); + deps = { + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1"; + "update-notifier-0.2.2" = self.by-version."update-notifier"."0.2.2"; + "xdg-empty-trash-1.0.0" = self.by-version."xdg-empty-trash"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "empty-trash" ]; + }; + "empty-trash" = self.by-version."empty-trash"."1.1.0"; by-spec."encoding"."~0.1.7" = self.by-version."encoding"."0.1.11"; by-version."encoding"."0.1.11" = lib.makeOverridable self.buildNodePackage { @@ -7851,7 +8000,7 @@ buildInputs = (self.nativeDeps."errorhandler" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; peerDependencies = [ @@ -7978,6 +8127,26 @@ "escape-html" = self.by-version."escape-html"."1.0.1"; by-spec."escape-html"."1.0.1" = self.by-version."escape-html"."1.0.1"; + by-spec."escape-string-applescript"."^1.0.0" = + self.by-version."escape-string-applescript"."1.0.0"; + by-version."escape-string-applescript"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "escape-string-applescript-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escape-string-applescript/-/escape-string-applescript-1.0.0.tgz"; + name = "escape-string-applescript-1.0.0.tgz"; + sha1 = "6f1c2294245d82c63bc03338dc19a94aa8428892"; + }) + ]; + buildInputs = + (self.nativeDeps."escape-string-applescript" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "escape-string-applescript" ]; + }; by-spec."escape-string-regexp"."1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; by-version."escape-string-regexp"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -8016,7 +8185,7 @@ (self.nativeDeps."escodegen" or []); deps = { "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8039,7 +8208,7 @@ deps = { "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8063,31 +8232,32 @@ "esutils-1.0.0" = self.by-version."esutils"."1.0.0"; "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; "esprima-1.1.1" = self.by-version."esprima"."1.1.1"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; passthru.names = [ "escodegen" ]; }; by-spec."escodegen"."^1.4.1" = - self.by-version."escodegen"."1.4.1"; - by-version."escodegen"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-1.4.1"; + self.by-version."escodegen"."1.4.3"; + by-version."escodegen"."1.4.3" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.4.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.4.1.tgz"; - name = "escodegen-1.4.1.tgz"; - sha1 = "8c2562ff45da348975953e8c0a57f40848962ec7"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.4.3.tgz"; + name = "escodegen-1.4.3.tgz"; + sha1 = "2b2422bf18c95e2542effaabc0c998712d490291"; }) ]; buildInputs = (self.nativeDeps."escodegen" or []); deps = { - "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; + "estraverse-1.9.0" = self.by-version."estraverse"."1.9.0"; "esutils-1.1.6" = self.by-version."esutils"."1.1.6"; "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "optionator-0.4.0" = self.by-version."optionator"."0.4.0"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8111,7 +8281,7 @@ "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; "esutils-1.0.0" = self.by-version."esutils"."1.0.0"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8132,7 +8302,7 @@ buildInputs = (self.nativeDeps."escope" or []); deps = { - "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; + "estraverse-1.9.0" = self.by-version."estraverse"."1.9.0"; }; peerDependencies = [ ]; @@ -8334,15 +8504,15 @@ passthru.names = [ "esrefactor" ]; }; by-spec."estraverse".">= 0.0.2" = - self.by-version."estraverse"."1.8.0"; - by-version."estraverse"."1.8.0" = lib.makeOverridable self.buildNodePackage { - name = "estraverse-1.8.0"; + self.by-version."estraverse"."1.9.0"; + by-version."estraverse"."1.9.0" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.9.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz"; - name = "estraverse-1.8.0.tgz"; - sha1 = "3f1264fb62c8500dbae5e4f73705cd576d6af428"; + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.9.0.tgz"; + name = "estraverse-1.9.0.tgz"; + sha1 = "738824ba445fab7ff2e42c7a7a98e7cf7ac2becf"; }) ]; buildInputs = @@ -8353,8 +8523,8 @@ ]; passthru.names = [ "estraverse" ]; }; - by-spec."estraverse"."^1.5.1" = - self.by-version."estraverse"."1.8.0"; + by-spec."estraverse"."^1.9.0" = + self.by-version."estraverse"."1.9.0"; by-spec."estraverse"."~0.0.4" = self.by-version."estraverse"."0.0.4"; by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -8397,7 +8567,25 @@ }; by-spec."estraverse"."~1.8.0" = self.by-version."estraverse"."1.8.0"; - by-spec."esutils"."^1.1.4" = + by-version."estraverse"."1.8.0" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.8.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz"; + name = "estraverse-1.8.0.tgz"; + sha1 = "3f1264fb62c8500dbae5e4f73705cd576d6af428"; + }) + ]; + buildInputs = + (self.nativeDeps."estraverse" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "estraverse" ]; + }; + by-spec."esutils"."^1.1.6" = self.by-version."esutils"."1.1.6"; by-version."esutils"."1.1.6" = lib.makeOverridable self.buildNodePackage { name = "esutils-1.1.6"; @@ -8544,10 +8732,10 @@ ]; passthru.names = [ "eventemitter2" ]; }; - by-spec."eventemitter2"."~0.4.11" = - self.by-version."eventemitter2"."0.4.14"; by-spec."eventemitter2"."~0.4.13" = self.by-version."eventemitter2"."0.4.14"; + by-spec."eventemitter2"."~0.4.14" = + self.by-version."eventemitter2"."0.4.14"; by-spec."eventemitter3"."*" = self.by-version."eventemitter3"."0.1.6"; by-version."eventemitter3"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -8623,7 +8811,7 @@ buildInputs = (self.nativeDeps."everyauth" or []); deps = { - "oauth-0.9.11" = self.by-version."oauth"."0.9.11"; + "oauth-0.9.12" = self.by-version."oauth"."0.9.12"; "request-2.9.203" = self.by-version."request"."2.9.203"; "connect-2.3.9" = self.by-version."connect"."2.3.9"; "openid-0.5.9" = self.by-version."openid"."0.5.9"; @@ -8631,7 +8819,7 @@ "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1"; "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1"; "debug-0.5.0" = self.by-version."debug"."0.5.0"; - "express-3.18.4" = self.by-version."express"."3.18.4"; + "express-3.18.6" = self.by-version."express"."3.18.6"; }; peerDependencies = [ ]; @@ -8676,7 +8864,7 @@ buildInputs = (self.nativeDeps."express" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; @@ -8695,7 +8883,7 @@ "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "send-0.10.1" = self.by-version."send"."0.10.1"; "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; @@ -8750,7 +8938,7 @@ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "cookie-0.0.5" = self.by-version."cookie"."0.0.5"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "methods-0.0.1" = self.by-version."methods"."0.0.1"; "send-0.1.0" = self.by-version."send"."0.1.0"; @@ -8793,22 +8981,22 @@ passthru.names = [ "express" ]; }; by-spec."express"."3.x" = - self.by-version."express"."3.18.4"; - by-version."express"."3.18.4" = lib.makeOverridable self.buildNodePackage { - name = "express-3.18.4"; + self.by-version."express"."3.18.6"; + by-version."express"."3.18.6" = lib.makeOverridable self.buildNodePackage { + name = "express-3.18.6"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.18.4.tgz"; - name = "express-3.18.4.tgz"; - sha1 = "7b40ad2c10a987692ee97a387c21593011f03712"; + url = "http://registry.npmjs.org/express/-/express-3.18.6.tgz"; + name = "express-3.18.6.tgz"; + sha1 = "cbcc7cb610d061ac619e5d090a5539353a3e870b"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = { "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "connect-2.27.4" = self.by-version."connect"."2.27.4"; + "connect-2.27.6" = self.by-version."connect"."2.27.6"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "commander-1.3.2" = self.by-version."commander"."1.3.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; @@ -8835,6 +9023,50 @@ }; by-spec."express".">=3.0.0" = self.by-version."express"."5.0.0-alpha.1"; + by-spec."express"."^4.0" = + self.by-version."express"."4.10.6"; + by-version."express"."4.10.6" = lib.makeOverridable self.buildNodePackage { + name = "express-4.10.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-4.10.6.tgz"; + name = "express-4.10.6.tgz"; + sha1 = "a9015979ccf38b11a39c0f726dcf6c4b85a4e758"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = { + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; + "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "methods-1.1.0" = self.by-version."methods"."1.1.0"; + "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; + "proxy-addr-1.0.4" = self.by-version."proxy-addr"."1.0.4"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "send-0.10.1" = self.by-version."send"."0.10.1"; + "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -8855,7 +9087,7 @@ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "cookie-0.0.5" = self.by-version."cookie"."0.0.5"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "methods-0.0.1" = self.by-version."methods"."0.0.1"; "send-0.1.0" = self.by-version."send"."0.1.0"; @@ -8898,87 +9130,8 @@ ]; passthru.names = [ "express" ]; }; - by-spec."express"."~4.0" = - self.by-version."express"."4.0.0"; - by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage { - name = "express-4.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz"; - name = "express-4.0.0.tgz"; - sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094"; - }) - ]; - buildInputs = - (self.nativeDeps."express" or []); - deps = { - "parseurl-1.0.1" = self.by-version."parseurl"."1.0.1"; - "accepts-1.0.0" = self.by-version."accepts"."1.0.0"; - "type-is-1.0.0" = self.by-version."type-is"."1.0.0"; - "range-parser-1.0.0" = self.by-version."range-parser"."1.0.0"; - "cookie-0.1.0" = self.by-version."cookie"."0.1.0"; - "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1"; - "fresh-0.2.2" = self.by-version."fresh"."0.2.2"; - "methods-0.1.0" = self.by-version."methods"."0.1.0"; - "send-0.2.0" = self.by-version."send"."0.2.0"; - "cookie-signature-1.0.3" = self.by-version."cookie-signature"."1.0.3"; - "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "qs-0.6.6" = self.by-version."qs"."0.6.6"; - "serve-static-1.0.1" = self.by-version."serve-static"."1.0.1"; - "path-to-regexp-0.1.2" = self.by-version."path-to-regexp"."0.1.2"; - "debug-0.8.1" = self.by-version."debug"."0.8.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; by-spec."express"."~4.10.3" = - self.by-version."express"."4.10.4"; - by-version."express"."4.10.4" = lib.makeOverridable self.buildNodePackage { - name = "express-4.10.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.10.4.tgz"; - name = "express-4.10.4.tgz"; - sha1 = "31aa70acdad6b6093945c30523df8537336deb58"; - }) - ]; - buildInputs = - (self.nativeDeps."express" or []); - deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; - "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; - "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "methods-1.1.0" = self.by-version."methods"."1.1.0"; - "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.4" = self.by-version."proxy-addr"."1.0.4"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "send-0.10.1" = self.by-version."send"."0.10.1"; - "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; - "vary-1.0.0" = self.by-version."vary"."1.0.0"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; + self.by-version."express"."4.10.6"; by-spec."express-form"."*" = self.by-version."express-form"."0.12.4"; by-version."express-form"."0.12.4" = lib.makeOverridable self.buildNodePackage { @@ -9080,15 +9233,15 @@ passthru.names = [ "express-session" ]; }; by-spec."express-session"."~1.9.2" = - self.by-version."express-session"."1.9.2"; - by-version."express-session"."1.9.2" = lib.makeOverridable self.buildNodePackage { - name = "express-session-1.9.2"; + self.by-version."express-session"."1.9.3"; + by-version."express-session"."1.9.3" = lib.makeOverridable self.buildNodePackage { + name = "express-session-1.9.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.9.2.tgz"; - name = "express-session-1.9.2.tgz"; - sha1 = "cb831ff8d2d9cb6e64c167f678af6f62ae6bb076"; + url = "http://registry.npmjs.org/express-session/-/express-session-1.9.3.tgz"; + name = "express-session-1.9.3.tgz"; + sha1 = "7d2fc387af6fd928775213bfe9d635a5705a84ce"; }) ]; buildInputs = @@ -9108,6 +9261,8 @@ ]; passthru.names = [ "express-session" ]; }; + by-spec."express-session"."~1.9.3" = + self.by-version."express-session"."1.9.3"; by-spec."extend"."*" = self.by-version."extend"."2.0.0"; by-version."extend"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -9272,6 +9427,8 @@ }; by-spec."eyes"."~0.1.6" = self.by-version."eyes"."0.1.8"; + by-spec."eyes"."~0.1.8" = + self.by-version."eyes"."0.1.8"; by-spec."falafel"."~0.1.6" = self.by-version."falafel"."0.1.6"; by-version."falafel"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -9293,7 +9450,51 @@ ]; passthru.names = [ "falafel" ]; }; + by-spec."fast-levenshtein"."~1.0.0" = + self.by-version."fast-levenshtein"."1.0.6"; + by-version."fast-levenshtein"."1.0.6" = lib.makeOverridable self.buildNodePackage { + name = "fast-levenshtein-1.0.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz"; + name = "fast-levenshtein-1.0.6.tgz"; + sha1 = "3bedb184e39f95cb0d88928688e6b1ee3273446a"; + }) + ]; + buildInputs = + (self.nativeDeps."fast-levenshtein" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "fast-levenshtein" ]; + }; by-spec."faye-websocket"."*" = + self.by-version."faye-websocket"."0.9.1"; + by-version."faye-websocket"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "faye-websocket-0.9.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.1.tgz"; + name = "faye-websocket-0.9.1.tgz"; + sha1 = "01a206fbf2aae351f1ef6e7d3adf6069dd7ccc13"; + }) + ]; + buildInputs = + (self.nativeDeps."faye-websocket" or []); + deps = { + "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "faye-websocket" ]; + }; + "faye-websocket" = self.by-version."faye-websocket"."0.9.1"; + by-spec."faye-websocket".">= 0.4.1" = + self.by-version."faye-websocket"."0.9.1"; + by-spec."faye-websocket"."^0.7.3 || ^0.8.0" = self.by-version."faye-websocket"."0.8.1"; by-version."faye-websocket"."0.8.1" = lib.makeOverridable self.buildNodePackage { name = "faye-websocket-0.8.1"; @@ -9308,17 +9509,12 @@ buildInputs = (self.nativeDeps."faye-websocket" or []); deps = { - "websocket-driver-0.4.0" = self.by-version."websocket-driver"."0.4.0"; + "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1"; }; peerDependencies = [ ]; passthru.names = [ "faye-websocket" ]; }; - "faye-websocket" = self.by-version."faye-websocket"."0.8.1"; - by-spec."faye-websocket".">= 0.4.1" = - self.by-version."faye-websocket"."0.8.1"; - by-spec."faye-websocket"."^0.7.3 || ^0.8.0" = - self.by-version."faye-websocket"."0.8.1"; by-spec."faye-websocket"."~0.7.0" = self.by-version."faye-websocket"."0.7.3"; by-version."faye-websocket"."0.7.3" = lib.makeOverridable self.buildNodePackage { @@ -9334,7 +9530,7 @@ buildInputs = (self.nativeDeps."faye-websocket" or []); deps = { - "websocket-driver-0.4.0" = self.by-version."websocket-driver"."0.4.0"; + "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1"; }; peerDependencies = [ ]; @@ -9381,7 +9577,7 @@ deps = { "colors-0.6.2" = self.by-version."colors"."0.6.2"; "keypress-0.2.1" = self.by-version."keypress"."0.2.1"; - "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4"; + "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; }; peerDependencies = [ ]; @@ -9601,15 +9797,15 @@ passthru.names = [ "flagged-respawn" ]; }; by-spec."flatiron"."*" = - self.by-version."flatiron"."0.4.2"; - by-version."flatiron"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "flatiron-0.4.2"; + self.by-version."flatiron"."0.4.3"; + by-version."flatiron"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "flatiron-0.4.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.2.tgz"; - name = "flatiron-0.4.2.tgz"; - sha1 = "cffae218dae8229d6668c34453eefd9a44c0e418"; + url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz"; + name = "flatiron-0.4.3.tgz"; + sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }) ]; buildInputs = @@ -9618,15 +9814,15 @@ "broadway-0.3.6" = self.by-version."broadway"."0.3.6"; "optimist-0.6.0" = self.by-version."optimist"."0.6.0"; "prompt-0.2.14" = self.by-version."prompt"."0.2.14"; - "director-1.2.3" = self.by-version."director"."1.2.3"; + "director-1.2.7" = self.by-version."director"."1.2.7"; }; peerDependencies = [ ]; passthru.names = [ "flatiron" ]; }; - "flatiron" = self.by-version."flatiron"."0.4.2"; + "flatiron" = self.by-version."flatiron"."0.4.3"; by-spec."flatiron"."~0.4.2" = - self.by-version."flatiron"."0.4.2"; + self.by-version."flatiron"."0.4.3"; by-spec."follow-redirects"."0.0.3" = self.by-version."follow-redirects"."0.0.3"; by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -9705,11 +9901,11 @@ (self.nativeDeps."forever" or []); deps = { "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "cliff-0.1.9" = self.by-version."cliff"."0.1.9"; - "flatiron-0.4.2" = self.by-version."flatiron"."0.4.2"; + "cliff-0.1.10" = self.by-version."cliff"."0.1.10"; + "flatiron-0.4.3" = self.by-version."flatiron"."0.4.3"; "forever-monitor-1.5.2" = self.by-version."forever-monitor"."1.5.2"; "nconf-0.6.9" = self.by-version."nconf"."0.6.9"; - "nssocket-0.5.2" = self.by-version."nssocket"."0.5.2"; + "nssocket-0.5.3" = self.by-version."nssocket"."0.5.3"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "timespan-2.3.0" = self.by-version."timespan"."2.3.0"; "utile-0.2.1" = self.by-version."utile"."0.2.1"; @@ -9906,7 +10102,30 @@ ]; passthru.names = [ "form-data" ]; }; - by-spec."formatio"."~1.1.1" = + by-spec."form-data"."~0.2.0" = + self.by-version."form-data"."0.2.0"; + by-version."form-data"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "form-data-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz"; + name = "form-data-0.2.0.tgz"; + sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466"; + }) + ]; + buildInputs = + (self.nativeDeps."form-data" or []); + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "form-data" ]; + }; + by-spec."formatio"."1.1.1" = self.by-version."formatio"."1.1.1"; by-version."formatio"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "formatio-1.1.1"; @@ -9921,7 +10140,7 @@ buildInputs = (self.nativeDeps."formatio" or []); deps = { - "samsam-1.1.1" = self.by-version."samsam"."1.1.1"; + "samsam-1.1.2" = self.by-version."samsam"."1.1.2"; }; peerDependencies = [ ]; @@ -9988,15 +10207,15 @@ passthru.names = [ "formidable" ]; }; by-spec."formidable"."1.0.x" = - self.by-version."formidable"."1.0.15"; - by-version."formidable"."1.0.15" = lib.makeOverridable self.buildNodePackage { - name = "formidable-1.0.15"; + self.by-version."formidable"."1.0.16"; + by-version."formidable"."1.0.16" = lib.makeOverridable self.buildNodePackage { + name = "formidable-1.0.16"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/formidable/-/formidable-1.0.15.tgz"; - name = "formidable-1.0.15.tgz"; - sha1 = "91363d59cc51ddca2be84ca0336ec0135606c155"; + url = "http://registry.npmjs.org/formidable/-/formidable-1.0.16.tgz"; + name = "formidable-1.0.16.tgz"; + sha1 = "4916cfdfc4cbed020b257a6a9505a9ab38c2cd0e"; }) ]; buildInputs = @@ -10109,6 +10328,30 @@ }; by-spec."fresh"."~0.2.1" = self.by-version."fresh"."0.2.4"; + by-spec."fs-extra"."^0.12.0" = + self.by-version."fs-extra"."0.12.0"; + by-version."fs-extra"."0.12.0" = lib.makeOverridable self.buildNodePackage { + name = "fs-extra-0.12.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.12.0.tgz"; + name = "fs-extra-0.12.0.tgz"; + sha1 = "407cf6e11321e440d66f9486fba1cc9eb4c21868"; + }) + ]; + buildInputs = + (self.nativeDeps."fs-extra" or []); + deps = { + "ncp-0.6.0" = self.by-version."ncp"."0.6.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "fs-extra" ]; + }; by-spec."fs-extra"."~0.6.1" = self.by-version."fs-extra"."0.6.4"; by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage { @@ -10133,22 +10376,23 @@ ]; passthru.names = [ "fs-extra" ]; }; - by-spec."fs-vacuum"."~1.2.2" = - self.by-version."fs-vacuum"."1.2.2"; - by-version."fs-vacuum"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "fs-vacuum-1.2.2"; + by-spec."fs-vacuum"."~1.2.5" = + self.by-version."fs-vacuum"."1.2.5"; + by-version."fs-vacuum"."1.2.5" = lib.makeOverridable self.buildNodePackage { + name = "fs-vacuum-1.2.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.2.tgz"; - name = "fs-vacuum-1.2.2.tgz"; - sha1 = "0e26ca2b14eb4ceb4b590a92aad585756ed18e40"; + url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.5.tgz"; + name = "fs-vacuum-1.2.5.tgz"; + sha1 = "a5cbaa844b4b3a7cff139f3cc90e7f7007e5fbb8"; }) ]; buildInputs = (self.nativeDeps."fs-vacuum" or []); deps = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; peerDependencies = [ @@ -10294,9 +10538,11 @@ }; by-spec."fstream"."^1.0.2" = self.by-version."fstream"."1.0.3"; - by-spec."fstream"."~0.1.23" = + by-spec."fstream"."~0.1.17" = self.by-version."fstream"."0.1.31"; - by-spec."fstream"."~0.1.25" = + by-spec."fstream"."~0.1.22" = + self.by-version."fstream"."0.1.31"; + by-spec."fstream"."~0.1.23" = self.by-version."fstream"."0.1.31"; by-spec."fstream"."~0.1.28" = self.by-version."fstream"."0.1.31"; @@ -10306,16 +10552,39 @@ self.by-version."fstream"."1.0.3"; by-spec."fstream"."~1.0.3" = self.by-version."fstream"."1.0.3"; - by-spec."fstream-ignore"."^1.0.0" = - self.by-version."fstream-ignore"."1.0.1"; - by-version."fstream-ignore"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "fstream-ignore-1.0.1"; + by-spec."fstream-ignore"."0.0.7" = + self.by-version."fstream-ignore"."0.0.7"; + by-version."fstream-ignore"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "fstream-ignore-0.0.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.1.tgz"; - name = "fstream-ignore-1.0.1.tgz"; - sha1 = "153df36c4fa2cb006fb915dc71ac9d75f6a17c82"; + url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; + name = "fstream-ignore-0.0.7.tgz"; + sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; + }) + ]; + buildInputs = + (self.nativeDeps."fstream-ignore" or []); + deps = { + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "fstream-ignore" ]; + }; + by-spec."fstream-ignore"."^1.0.0" = + self.by-version."fstream-ignore"."1.0.2"; + by-version."fstream-ignore"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "fstream-ignore-1.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"; + name = "fstream-ignore-1.0.2.tgz"; + sha1 = "18c891db01b782a74a7bff936a0f24997741c7ab"; }) ]; buildInputs = @@ -10323,14 +10592,14 @@ deps = { "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; }; peerDependencies = [ ]; passthru.names = [ "fstream-ignore" ]; }; by-spec."fstream-ignore"."~1.0.1" = - self.by-version."fstream-ignore"."1.0.1"; + self.by-version."fstream-ignore"."1.0.2"; by-spec."fstream-npm"."~0.1.3" = self.by-version."fstream-npm"."0.1.8"; by-version."fstream-npm"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -10346,15 +10615,13 @@ buildInputs = (self.nativeDeps."fstream-npm" or []); deps = { - "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; peerDependencies = [ ]; passthru.names = [ "fstream-npm" ]; }; - by-spec."fstream-npm"."~0.1.6" = - self.by-version."fstream-npm"."0.1.8"; by-spec."fstream-npm"."~1.0.1" = self.by-version."fstream-npm"."1.0.1"; by-version."fstream-npm"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -10370,7 +10637,7 @@ buildInputs = (self.nativeDeps."fstream-npm" or []); deps = { - "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; peerDependencies = [ @@ -10482,15 +10749,15 @@ passthru.names = [ "getobject" ]; }; by-spec."git-run"."*" = - self.by-version."git-run"."0.3.0"; - by-version."git-run"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "git-run-0.3.0"; + self.by-version."git-run"."0.3.1"; + by-version."git-run"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "git-run-0.3.1"; bin = true; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/git-run/-/git-run-0.3.0.tgz"; - name = "git-run-0.3.0.tgz"; - sha1 = "6ac02b93a93e10803ebfec8a5703fb416cafc0b1"; + url = "http://registry.npmjs.org/git-run/-/git-run-0.3.1.tgz"; + name = "git-run-0.3.1.tgz"; + sha1 = "34a59d4a90c1501d491ea87d478d26c877808415"; }) ]; buildInputs = @@ -10503,27 +10770,7 @@ ]; passthru.names = [ "git-run" ]; }; - "git-run" = self.by-version."git-run"."0.3.0"; - by-spec."github-url-from-git"."1.1.1" = - self.by-version."github-url-from-git"."1.1.1"; - by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "github-url-from-git-1.1.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; - name = "github-url-from-git-1.1.1.tgz"; - sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf"; - }) - ]; - buildInputs = - (self.nativeDeps."github-url-from-git" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "github-url-from-git" ]; - }; + "git-run" = self.by-version."git-run"."0.3.1"; by-spec."github-url-from-git"."^1.3.0" = self.by-version."github-url-from-git"."1.4.0"; by-version."github-url-from-git"."1.4.0" = lib.makeOverridable self.buildNodePackage { @@ -10546,28 +10793,26 @@ }; by-spec."github-url-from-git"."~1.1.1" = self.by-version."github-url-from-git"."1.1.1"; - by-spec."github-url-from-git"."~1.4.0" = - self.by-version."github-url-from-git"."1.4.0"; - by-spec."github-url-from-username-repo"."0.0.2" = - self.by-version."github-url-from-username-repo"."0.0.2"; - by-version."github-url-from-username-repo"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "github-url-from-username-repo-0.0.2"; + by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "github-url-from-git-1.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz"; - name = "github-url-from-username-repo-0.0.2.tgz"; - sha1 = "0d9ee8e2bca36d5f065a1bcd23eb3f1fa3d636bd"; + url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; + name = "github-url-from-git-1.1.1.tgz"; + sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf"; }) ]; buildInputs = - (self.nativeDeps."github-url-from-username-repo" or []); + (self.nativeDeps."github-url-from-git" or []); deps = { }; peerDependencies = [ ]; - passthru.names = [ "github-url-from-username-repo" ]; + passthru.names = [ "github-url-from-git" ]; }; + by-spec."github-url-from-git"."~1.4.0" = + self.by-version."github-url-from-git"."1.4.0"; by-spec."github-url-from-username-repo"."^0.1.0" = self.by-version."github-url-from-username-repo"."0.1.0"; by-version."github-url-from-username-repo"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -10635,15 +10880,15 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."3 || 4" = - self.by-version."glob"."4.2.2"; - by-version."glob"."4.2.2" = lib.makeOverridable self.buildNodePackage { - name = "glob-4.2.2"; + self.by-version."glob"."4.3.2"; + by-version."glob"."4.3.2" = lib.makeOverridable self.buildNodePackage { + name = "glob-4.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-4.2.2.tgz"; - name = "glob-4.2.2.tgz"; - sha1 = "ad2b047653a58c387e15deb43a19497f83fd2a80"; + url = "http://registry.npmjs.org/glob/-/glob-4.3.2.tgz"; + name = "glob-4.3.2.tgz"; + sha1 = "351ec7dafc29256b253ad86cd6b48c5a3404b76d"; }) ]; buildInputs = @@ -10651,7 +10896,7 @@ deps = { "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = [ @@ -10710,15 +10955,17 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."4.x" = - self.by-version."glob"."4.2.2"; + self.by-version."glob"."4.3.2"; by-spec."glob".">=3.2.7 <4" = self.by-version."glob"."3.2.11"; - by-spec."glob"."^4.0.0" = - self.by-version."glob"."4.2.2"; + by-spec."glob"."^3.2.1" = + self.by-version."glob"."3.2.11"; by-spec."glob"."^4.0.2" = - self.by-version."glob"."4.2.2"; + self.by-version."glob"."4.3.2"; by-spec."glob"."^4.0.5" = - self.by-version."glob"."4.2.2"; + self.by-version."glob"."4.3.2"; + by-spec."glob"."^4.3.1" = + self.by-version."glob"."4.3.2"; by-spec."glob"."~ 3.2.1" = self.by-version."glob"."3.2.11"; by-spec."glob"."~3.1.21" = @@ -10748,8 +10995,6 @@ self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.3" = self.by-version."glob"."3.2.11"; - by-spec."glob"."~3.2.6" = - self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.7" = self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.8" = @@ -10760,25 +11005,25 @@ self.by-version."glob"."4.0.6"; by-spec."glob"."~4.0.6" = self.by-version."glob"."4.0.6"; - by-spec."glob"."~4.2.1" = - self.by-version."glob"."4.2.2"; + by-spec."glob"."~4.3.1" = + self.by-version."glob"."4.3.2"; by-spec."glob-stream"."^3.1.5" = - self.by-version."glob-stream"."3.1.17"; - by-version."glob-stream"."3.1.17" = lib.makeOverridable self.buildNodePackage { - name = "glob-stream-3.1.17"; + self.by-version."glob-stream"."3.1.18"; + by-version."glob-stream"."3.1.18" = lib.makeOverridable self.buildNodePackage { + name = "glob-stream-3.1.18"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.17.tgz"; - name = "glob-stream-3.1.17.tgz"; - sha1 = "bc3093856149bf9b7454935abe523ec7ab26ec1e"; + url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; + name = "glob-stream-3.1.18.tgz"; + sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; }) ]; buildInputs = (self.nativeDeps."glob-stream" or []); deps = { - "glob-4.2.2" = self.by-version."glob"."4.2.2"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "ordered-read-streams-0.1.0" = self.by-version."ordered-read-streams"."0.1.0"; "glob2base-0.0.12" = self.by-version."glob2base"."0.0.12"; "unique-stream-1.0.0" = self.by-version."unique-stream"."1.0.0"; @@ -10874,6 +11119,27 @@ ]; passthru.names = [ "got" ]; }; + by-spec."got"."^1.0.1" = + self.by-version."got"."1.2.2"; + by-version."got"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "got-1.2.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz"; + name = "got-1.2.2.tgz"; + sha1 = "d9430ba32f6a30218243884418767340aafc0400"; + }) + ]; + buildInputs = + (self.nativeDeps."got" or []); + deps = { + "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "got" ]; + }; by-spec."graceful-fs"."1.2" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { @@ -10960,7 +11226,7 @@ self.by-version."graceful-fs"."3.0.5"; by-spec."graceful-fs"."~3.0.2" = self.by-version."graceful-fs"."3.0.5"; - by-spec."graceful-fs"."~3.0.4" = + by-spec."graceful-fs"."~3.0.5" = self.by-version."graceful-fs"."3.0.5"; by-spec."gridfs-stream"."*" = self.by-version."gridfs-stream"."0.5.3"; @@ -11052,7 +11318,7 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "lodash-0.9.2" = self.by-version."lodash"."0.9.2"; "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "js-yaml-2.0.5" = self.by-version."js-yaml"."2.0.5"; "exit-0.1.2" = self.by-version."exit"."0.1.2"; "getobject-0.1.0" = self.by-version."getobject"."0.1.0"; @@ -11109,7 +11375,7 @@ (self.nativeDeps."grunt-contrib-cssmin" or []); deps = { "chalk-0.4.0" = self.by-version."chalk"."0.4.0"; - "clean-css-2.2.19" = self.by-version."clean-css"."2.2.19"; + "clean-css-2.2.22" = self.by-version."clean-css"."2.2.22"; "maxmin-0.2.2" = self.by-version."maxmin"."0.2.2"; }; peerDependencies = [ @@ -11133,7 +11399,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = { - "jshint-2.5.10" = self.by-version."jshint"."2.5.10"; + "jshint-2.5.11" = self.by-version."jshint"."2.5.11"; "hooker-0.2.3" = self.by-version."hooker"."0.2.3"; }; peerDependencies = [ @@ -11210,7 +11476,7 @@ "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0"; - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; "uri-path-0.0.2" = self.by-version."uri-path"."0.0.2"; }; peerDependencies = [ @@ -11288,7 +11554,7 @@ "exit-0.1.2" = self.by-version."exit"."0.1.2"; "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1"; "getobject-0.1.0" = self.by-version."getobject"."0.1.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -11333,7 +11599,7 @@ (self.nativeDeps."guifi-earth" or []); deps = { "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "jade-1.8.1" = self.by-version."jade"."1.8.1"; + "jade-1.8.2" = self.by-version."jade"."1.8.2"; "q-2.0.2" = self.by-version."q"."2.0.2"; "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; "msgpack-0.2.4" = self.by-version."msgpack"."0.2.4"; @@ -11362,14 +11628,14 @@ "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "deprecated-0.0.1" = self.by-version."deprecated"."0.0.1"; "gulp-util-3.0.1" = self.by-version."gulp-util"."3.0.1"; - "interpret-0.3.8" = self.by-version."interpret"."0.3.8"; + "interpret-0.3.10" = self.by-version."interpret"."0.3.10"; "liftoff-0.13.6" = self.by-version."liftoff"."0.13.6"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "orchestrator-0.3.7" = self.by-version."orchestrator"."0.3.7"; "pretty-hrtime-0.2.2" = self.by-version."pretty-hrtime"."0.2.2"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "tildify-1.0.0" = self.by-version."tildify"."1.0.0"; - "v8flags-1.0.5" = self.by-version."v8flags"."1.0.5"; + "v8flags-1.0.6" = self.by-version."v8flags"."1.0.6"; "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13"; }; peerDependencies = [ @@ -11400,7 +11666,7 @@ "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "multipipe-0.1.2" = self.by-version."multipipe"."0.1.2"; "through2-0.6.3" = self.by-version."through2"."0.6.3"; - "vinyl-0.4.5" = self.by-version."vinyl"."0.4.5"; + "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6"; }; peerDependencies = [ ]; @@ -12045,15 +12311,15 @@ passthru.names = [ "http-browserify" ]; }; by-spec."http-errors"."~1.2.7" = - self.by-version."http-errors"."1.2.7"; - by-version."http-errors"."1.2.7" = lib.makeOverridable self.buildNodePackage { - name = "http-errors-1.2.7"; + self.by-version."http-errors"."1.2.8"; + by-version."http-errors"."1.2.8" = lib.makeOverridable self.buildNodePackage { + name = "http-errors-1.2.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.7.tgz"; - name = "http-errors-1.2.7.tgz"; - sha1 = "b881fa12c59b0079fd4ced456bf8dbc9610d3b78"; + url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz"; + name = "http-errors-1.2.8.tgz"; + sha1 = "8ee5fe0b51982221d796c0c4712d76f72097a4d0"; }) ]; buildInputs = @@ -12066,6 +12332,8 @@ ]; passthru.names = [ "http-errors" ]; }; + by-spec."http-errors"."~1.2.8" = + self.by-version."http-errors"."1.2.8"; by-spec."http-proxy"."1.0.2" = self.by-version."http-proxy"."1.0.2"; by-version."http-proxy"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -12220,27 +12488,28 @@ passthru.names = [ "i" ]; }; by-spec."i18next"."*" = - self.by-version."i18next"."1.7.4"; - by-version."i18next"."1.7.4" = lib.makeOverridable self.buildNodePackage { - name = "i18next-1.7.4"; + self.by-version."i18next"."1.7.8"; + by-version."i18next"."1.7.8" = lib.makeOverridable self.buildNodePackage { + name = "i18next-1.7.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/i18next/-/i18next-1.7.4.tgz"; - name = "i18next-1.7.4.tgz"; - sha1 = "b61629c9de95a5c076acb2f954f8a882ac0772af"; + url = "http://registry.npmjs.org/i18next/-/i18next-1.7.8.tgz"; + name = "i18next-1.7.8.tgz"; + sha1 = "d100ad29ec5906b61de766479786fe00ce68e5c3"; }) ]; buildInputs = (self.nativeDeps."i18next" or []); deps = { "cookies-0.5.0" = self.by-version."cookies"."0.5.0"; + "json5-0.2.0" = self.by-version."json5"."0.2.0"; }; peerDependencies = [ ]; passthru.names = [ "i18next" ]; }; - "i18next" = self.by-version."i18next"."1.7.4"; + "i18next" = self.by-version."i18next"."1.7.8"; by-spec."ibrik"."~2.0.0" = self.by-version."ibrik"."2.0.0"; by-version."ibrik"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -12258,9 +12527,9 @@ deps = { "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "istanbul-0.3.2" = self.by-version."istanbul"."0.3.2"; + "istanbul-0.3.5" = self.by-version."istanbul"."0.3.5"; "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; @@ -12543,51 +12812,26 @@ ]; passthru.names = [ "init-package-json" ]; }; - by-spec."init-package-json"."0.0.14" = - self.by-version."init-package-json"."0.0.14"; - by-version."init-package-json"."0.0.14" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-0.0.14"; + by-spec."init-package-json"."~1.1.3" = + self.by-version."init-package-json"."1.1.3"; + by-version."init-package-json"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "init-package-json-1.1.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.14.tgz"; - name = "init-package-json-0.0.14.tgz"; - sha1 = "bd5f7b2d73b54957388cca3ce61190340c8a05b7"; + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.3.tgz"; + name = "init-package-json-1.1.3.tgz"; + sha1 = "1d633c151a4909891afc8ee13cace8b336c0c9c2"; }) ]; buildInputs = (self.nativeDeps."init-package-json" or []); deps = { + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; "read-1.0.5" = self.by-version."read"."1.0.5"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-2.3.2" = self.by-version."semver"."2.3.2"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - }; - peerDependencies = [ - ]; - passthru.names = [ "init-package-json" ]; - }; - by-spec."init-package-json"."~1.1.2" = - self.by-version."init-package-json"."1.1.2"; - by-version."init-package-json"."1.1.2" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-1.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.2.tgz"; - name = "init-package-json-1.1.2.tgz"; - sha1 = "bc6c02d1da87253141600972f0d6bdcdd016990e"; - }) - ]; - buildInputs = - (self.nativeDeps."init-package-json" or []); - deps = { - "glob-4.2.2" = self.by-version."glob"."4.2.2"; - "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; - "read-1.0.5" = self.by-version."read"."1.0.5"; - "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -12608,7 +12852,7 @@ buildInputs = (self.nativeDeps."inline-source-map" or []); deps = { - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -12635,7 +12879,7 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.0" = self.by-version."readline2"."0.1.0"; - "rx-2.3.18" = self.by-version."rx"."2.3.18"; + "rx-2.3.22" = self.by-version."rx"."2.3.22"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; peerDependencies = [ @@ -12662,7 +12906,7 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.0" = self.by-version."readline2"."0.1.0"; - "rx-2.3.18" = self.by-version."rx"."2.3.18"; + "rx-2.3.22" = self.by-version."rx"."2.3.22"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; peerDependencies = [ @@ -12796,7 +13040,7 @@ "lodash.debounce-2.4.1" = self.by-version."lodash.debounce"."2.4.1"; "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; "os-name-1.0.1" = self.by-version."os-name"."1.0.1"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; }; peerDependencies = [ @@ -12804,15 +13048,15 @@ passthru.names = [ "insight" ]; }; by-spec."interpret"."^0.3.2" = - self.by-version."interpret"."0.3.8"; - by-version."interpret"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "interpret-0.3.8"; + self.by-version."interpret"."0.3.10"; + by-version."interpret"."0.3.10" = lib.makeOverridable self.buildNodePackage { + name = "interpret-0.3.10"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/interpret/-/interpret-0.3.8.tgz"; - name = "interpret-0.3.8.tgz"; - sha1 = "23c65e60ed18a3e21cddccf96e8a6658548cda8b"; + url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"; + name = "interpret-0.3.10.tgz"; + sha1 = "088c25de731c6c5b112a90f0071cfaf459e5a7bb"; }) ]; buildInputs = @@ -12864,15 +13108,15 @@ passthru.names = [ "ip" ]; }; by-spec."ip-regex"."^1.0.0" = - self.by-version."ip-regex"."1.0.1"; - by-version."ip-regex"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "ip-regex-1.0.1"; + self.by-version."ip-regex"."1.0.2"; + by-version."ip-regex"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "ip-regex-1.0.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.1.tgz"; - name = "ip-regex-1.0.1.tgz"; - sha1 = "3f1da464e47290591023a70617e45361b41123f7"; + url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.2.tgz"; + name = "ip-regex-1.0.2.tgz"; + sha1 = "1e7daad2c2d0c268729ecca91f8ec463ad58f56b"; }) ]; buildInputs = @@ -12924,7 +13168,7 @@ ]; passthru.names = [ "ipaddr.js" ]; }; - by-spec."ipaddr.js"."^0.1.5" = + by-spec."ipaddr.js".">= 0.1.5" = self.by-version."ipaddr.js"."0.1.6"; by-version."ipaddr.js"."0.1.6" = lib.makeOverridable self.buildNodePackage { name = "ipaddr.js-0.1.6"; @@ -12944,6 +13188,8 @@ ]; passthru.names = [ "ipaddr.js" ]; }; + by-spec."ipaddr.js"."^0.1.5" = + self.by-version."ipaddr.js"."0.1.6"; by-spec."ironhorse"."*" = self.by-version."ironhorse"."0.0.10"; by-version."ironhorse"."0.0.10" = lib.makeOverridable self.buildNodePackage { @@ -12965,14 +13211,14 @@ "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1"; "async-0.9.0" = self.by-version."async"."0.9.0"; "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1"; - "jade-1.8.1" = self.by-version."jade"."1.8.1"; + "jade-1.8.2" = self.by-version."jade"."1.8.2"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2"; - "js-yaml-3.2.3" = self.by-version."js-yaml"."3.2.3"; - "mongoose-3.8.19" = self.by-version."mongoose"."3.8.19"; + "js-yaml-3.2.4" = self.by-version."js-yaml"."3.2.4"; + "mongoose-3.8.21" = self.by-version."mongoose"."3.8.21"; "gridfs-stream-0.5.3" = self.by-version."gridfs-stream"."0.5.3"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; - "kue-0.8.9" = self.by-version."kue"."0.8.9"; + "kue-0.8.11" = self.by-version."kue"."0.8.11"; "redis-0.12.1" = self.by-version."redis"."0.12.1"; "hiredis-0.1.17" = self.by-version."hiredis"."0.1.17"; }; @@ -13036,12 +13282,32 @@ buildInputs = (self.nativeDeps."is-ip" or []); deps = { - "ip-regex-1.0.1" = self.by-version."ip-regex"."1.0.1"; + "ip-regex-1.0.2" = self.by-version."ip-regex"."1.0.2"; }; peerDependencies = [ ]; passthru.names = [ "is-ip" ]; }; + by-spec."is-npm"."^1.0.0" = + self.by-version."is-npm"."1.0.0"; + by-version."is-npm"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "is-npm-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; + name = "is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }) + ]; + buildInputs = + (self.nativeDeps."is-npm" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "is-npm" ]; + }; by-spec."is-promise"."~1" = self.by-version."is-promise"."1.0.1"; by-version."is-promise"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -13125,15 +13391,15 @@ by-spec."isarray"."~0.0.1" = self.by-version."isarray"."0.0.1"; by-spec."isstream"."0.1.x" = - self.by-version."isstream"."0.1.0"; - by-version."isstream"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "isstream-0.1.0"; + self.by-version."isstream"."0.1.1"; + by-version."isstream"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "isstream-0.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/isstream/-/isstream-0.1.0.tgz"; - name = "isstream-0.1.0.tgz"; - sha1 = "1fc062509b8c8902ee78d0a8d015ad3251472285"; + url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz"; + name = "isstream-0.1.1.tgz"; + sha1 = "48332c5999893996ba253c81c7bd6e7ae0905c4f"; }) ]; buildInputs = @@ -13145,15 +13411,15 @@ passthru.names = [ "isstream" ]; }; by-spec."istanbul"."*" = - self.by-version."istanbul"."0.3.2"; - by-version."istanbul"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.3.2"; + self.by-version."istanbul"."0.3.5"; + by-version."istanbul"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "istanbul-0.3.5"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.2.tgz"; - name = "istanbul-0.3.2.tgz"; - sha1 = "e1ce9a9ec80d51dcbbeca82149f3befdc21d6835"; + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz"; + name = "istanbul-0.3.5.tgz"; + sha1 = "ef9ca4c1d5e6a5deac2245842051b59763a2de37"; }) ]; buildInputs = @@ -13165,43 +13431,42 @@ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "async-0.9.0" = self.by-version."async"."0.9.0"; "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; - "js-yaml-3.2.3" = self.by-version."js-yaml"."3.2.3"; + "js-yaml-3.2.4" = self.by-version."js-yaml"."3.2.4"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = [ ]; passthru.names = [ "istanbul" ]; }; - "istanbul" = self.by-version."istanbul"."0.3.2"; + "istanbul" = self.by-version."istanbul"."0.3.5"; by-spec."istanbul"."~0.3.0" = - self.by-version."istanbul"."0.3.2"; + self.by-version."istanbul"."0.3.5"; by-spec."istanbul"."~0.3.2" = - self.by-version."istanbul"."0.3.2"; + self.by-version."istanbul"."0.3.5"; by-spec."jade"."*" = - self.by-version."jade"."1.8.1"; - by-version."jade"."1.8.1" = lib.makeOverridable self.buildNodePackage { - name = "jade-1.8.1"; + self.by-version."jade"."1.8.2"; + by-version."jade"."1.8.2" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.8.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-1.8.1.tgz"; - name = "jade-1.8.1.tgz"; - sha1 = "7f28dfd42832fda613e4a28fd0febb3f423c464f"; + url = "http://registry.npmjs.org/jade/-/jade-1.8.2.tgz"; + name = "jade-1.8.2.tgz"; + sha1 = "0db3630b2cb8145f6bf144d760b56e6b0bbb0aa0"; }) ]; buildInputs = (self.nativeDeps."jade" or []); deps = { "character-parser-1.2.1" = self.by-version."character-parser"."1.2.1"; - "commander-2.5.0" = self.by-version."commander"."2.5.0"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; "constantinople-3.0.1" = self.by-version."constantinople"."3.0.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "monocle-1.1.51" = self.by-version."monocle"."1.1.51"; "transformers-2.1.0" = self.by-version."transformers"."2.1.0"; "void-elements-1.0.0" = self.by-version."void-elements"."1.0.0"; "with-4.0.0" = self.by-version."with"."4.0.0"; @@ -13210,7 +13475,7 @@ ]; passthru.names = [ "jade" ]; }; - "jade" = self.by-version."jade"."1.8.1"; + "jade" = self.by-version."jade"."1.8.2"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { @@ -13283,7 +13548,7 @@ passthru.names = [ "jade" ]; }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."1.8.1"; + self.by-version."jade"."1.8.2"; by-spec."jade"."~0.35.0" = self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { @@ -13334,53 +13599,53 @@ }; "jayschema" = self.by-version."jayschema"."0.3.1"; by-spec."jfs"."*" = - self.by-version."jfs"."0.2.3"; - by-version."jfs"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "jfs-0.2.3"; + self.by-version."jfs"."0.2.4"; + by-version."jfs"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "jfs-0.2.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/jfs/-/jfs-0.2.3.tgz"; - name = "jfs-0.2.3.tgz"; - sha1 = "1b87551f83055e69b509fe8c3066d0c702b01574"; + url = "http://registry.npmjs.org/jfs/-/jfs-0.2.4.tgz"; + name = "jfs-0.2.4.tgz"; + sha1 = "62f95459de0930af30fb6c570ec68237bc2fdd76"; }) ]; buildInputs = (self.nativeDeps."jfs" or []); deps = { "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "async-0.9.0" = self.by-version."async"."0.9.0"; - "clone-0.1.18" = self.by-version."clone"."0.1.18"; + "clone-0.2.0" = self.by-version."clone"."0.2.0"; }; peerDependencies = [ ]; passthru.names = [ "jfs" ]; }; - "jfs" = self.by-version."jfs"."0.2.3"; + "jfs" = self.by-version."jfs"."0.2.4"; by-spec."js-yaml"."*" = - self.by-version."js-yaml"."3.2.3"; - by-version."js-yaml"."3.2.3" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-3.2.3"; + self.by-version."js-yaml"."3.2.4"; + by-version."js-yaml"."3.2.4" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-3.2.4"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.3.tgz"; - name = "js-yaml-3.2.3.tgz"; - sha1 = "a3af632d13df5bfa95f3b8f3c4b61efe212cd750"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.4.tgz"; + name = "js-yaml-3.2.4.tgz"; + sha1 = "f2cfb5f5e1d251ff438f41d63139750001021083"; }) ]; buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ ]; passthru.names = [ "js-yaml" ]; }; - "js-yaml" = self.by-version."js-yaml"."3.2.3"; + "js-yaml" = self.by-version."js-yaml"."3.2.4"; by-spec."js-yaml"."0.3.x" = self.by-version."js-yaml"."0.3.7"; by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage { @@ -13416,7 +13681,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13438,7 +13703,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13446,7 +13711,7 @@ passthru.names = [ "js-yaml" ]; }; by-spec."js-yaml"."3.x" = - self.by-version."js-yaml"."3.2.3"; + self.by-version."js-yaml"."3.2.4"; by-spec."js-yaml"."~2.0.5" = self.by-version."js-yaml"."2.0.5"; by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage { @@ -13462,7 +13727,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13484,7 +13749,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13514,15 +13779,15 @@ by-spec."jsesc"."~0.4.3" = self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = - self.by-version."jshint"."2.5.10"; - by-version."jshint"."2.5.10" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.5.10"; + self.by-version."jshint"."2.5.11"; + by-version."jshint"."2.5.11" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.5.11"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.5.10.tgz"; - name = "jshint-2.5.10.tgz"; - sha1 = "2fef47ee0901914e31832123d5d3f434c28060ef"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.5.11.tgz"; + name = "jshint-2.5.11.tgz"; + sha1 = "e2d95858bbb1aa78300108a2e81099fb095622e0"; }) ]; buildInputs = @@ -13541,9 +13806,9 @@ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.by-version."jshint"."2.5.10"; + "jshint" = self.by-version."jshint"."2.5.11"; by-spec."jshint"."~2.5.0" = - self.by-version."jshint"."2.5.10"; + self.by-version."jshint"."2.5.11"; by-spec."json-schema"."0.2.2" = self.by-version."json-schema"."0.2.2"; by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -13645,6 +13910,46 @@ ]; passthru.names = [ "json-stringify-safe" ]; }; + by-spec."json5"."^0.2.0" = + self.by-version."json5"."0.2.0"; + by-version."json5"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "json5-0.2.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/json5/-/json5-0.2.0.tgz"; + name = "json5-0.2.0.tgz"; + sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343"; + }) + ]; + buildInputs = + (self.nativeDeps."json5" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "json5" ]; + }; + by-spec."jsonfile"."^2.0.0" = + self.by-version."jsonfile"."2.0.0"; + by-version."jsonfile"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "jsonfile-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz"; + name = "jsonfile-2.0.0.tgz"; + sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b"; + }) + ]; + buildInputs = + (self.nativeDeps."jsonfile" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "jsonfile" ]; + }; by-spec."jsonfile"."~1.0.1" = self.by-version."jsonfile"."1.0.1"; by-version."jsonfile"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -13830,7 +14135,7 @@ deps = { "di-0.0.1" = self.by-version."di"."0.0.1"; "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17"; - "chokidar-0.11.1" = self.by-version."chokidar"."0.11.1"; + "chokidar-0.12.5" = self.by-version."chokidar"."0.12.5"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4"; @@ -13844,7 +14149,7 @@ "useragent-2.0.10" = self.by-version."useragent"."2.0.10"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "connect-2.26.6" = self.by-version."connect"."2.26.6"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -13862,15 +14167,15 @@ by-spec."karma"."~0.12.0" = self.by-version."karma"."0.12.28"; by-spec."karma-chrome-launcher"."*" = - self.by-version."karma-chrome-launcher"."0.1.5"; - by-version."karma-chrome-launcher"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "karma-chrome-launcher-0.1.5"; + self.by-version."karma-chrome-launcher"."0.1.7"; + by-version."karma-chrome-launcher"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "karma-chrome-launcher-0.1.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.5.tgz"; - name = "karma-chrome-launcher-0.1.5.tgz"; - sha1 = "70e95dca5c4d7a15884850daa3ab60d648dbfe8b"; + url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.7.tgz"; + name = "karma-chrome-launcher-0.1.7.tgz"; + sha1 = "c248cc01d5ae17dafdb16319d0badf637dfb6e59"; }) ]; buildInputs = @@ -13882,7 +14187,7 @@ ]; passthru.names = [ "karma-chrome-launcher" ]; }; - "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.5"; + "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.7"; by-spec."karma-coverage"."*" = self.by-version."karma-coverage"."0.2.7"; by-version."karma-coverage"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -13898,7 +14203,7 @@ buildInputs = (self.nativeDeps."karma-coverage" or []); deps = { - "istanbul-0.3.2" = self.by-version."istanbul"."0.3.2"; + "istanbul-0.3.5" = self.by-version."istanbul"."0.3.5"; "ibrik-2.0.0" = self.by-version."ibrik"."2.0.0"; "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11"; "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; @@ -13933,15 +14238,15 @@ }; "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2"; by-spec."karma-mocha"."*" = - self.by-version."karma-mocha"."0.1.9"; - by-version."karma-mocha"."0.1.9" = lib.makeOverridable self.buildNodePackage { - name = "karma-mocha-0.1.9"; + self.by-version."karma-mocha"."0.1.10"; + by-version."karma-mocha"."0.1.10" = lib.makeOverridable self.buildNodePackage { + name = "karma-mocha-0.1.10"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.9.tgz"; - name = "karma-mocha-0.1.9.tgz"; - sha1 = "d777a98d655e08330f7893e833c369f82bd10191"; + url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.10.tgz"; + name = "karma-mocha-0.1.10.tgz"; + sha1 = "29ed51d4b121af1373444ec555b20a905bf42b92"; }) ]; buildInputs = @@ -13954,7 +14259,7 @@ ]; passthru.names = [ "karma-mocha" ]; }; - "karma-mocha" = self.by-version."karma-mocha"."0.1.9"; + "karma-mocha" = self.by-version."karma-mocha"."0.1.10"; by-spec."karma-requirejs"."*" = self.by-version."karma-requirejs"."0.2.2"; by-version."karma-requirejs"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -14086,6 +14391,27 @@ ]; passthru.names = [ "kerberos" ]; }; + by-spec."kerberos"."0.0.7" = + self.by-version."kerberos"."0.0.7"; + by-version."kerberos"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "kerberos-0.0.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.7.tgz"; + name = "kerberos-0.0.7.tgz"; + sha1 = "48db5e268e59ebb1626fd3c76ff8ff7f267a9852"; + }) + ]; + buildInputs = + (self.nativeDeps."kerberos" or []); + deps = { + "nan-1.3.0" = self.by-version."nan"."1.3.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "kerberos" ]; + }; by-spec."kew"."0.4.0" = self.by-version."kew"."0.4.0"; by-version."kew"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -14235,15 +14561,15 @@ }; "knox" = self.by-version."knox"."0.9.1"; by-spec."kue"."*" = - self.by-version."kue"."0.8.9"; - by-version."kue"."0.8.9" = lib.makeOverridable self.buildNodePackage { - name = "kue-0.8.9"; + self.by-version."kue"."0.8.11"; + by-version."kue"."0.8.11" = lib.makeOverridable self.buildNodePackage { + name = "kue-0.8.11"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/kue/-/kue-0.8.9.tgz"; - name = "kue-0.8.9.tgz"; - sha1 = "6fb2c7d4014f26a64ebf76c092085fe9db16fdcb"; + url = "http://registry.npmjs.org/kue/-/kue-0.8.11.tgz"; + name = "kue-0.8.11.tgz"; + sha1 = "0e18c6f827b73deb68a6ee06b55c14d4797450b0"; }) ]; buildInputs = @@ -14262,7 +14588,7 @@ ]; passthru.names = [ "kue" ]; }; - "kue" = self.by-version."kue"."0.8.9"; + "kue" = self.by-version."kue"."0.8.11"; by-spec."labeled-stream-splicer"."^1.0.0" = self.by-version."labeled-stream-splicer"."1.0.2"; by-version."labeled-stream-splicer"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -14307,6 +14633,27 @@ ]; passthru.names = [ "latest-version" ]; }; + by-spec."latest-version"."^1.0.0" = + self.by-version."latest-version"."1.0.0"; + by-version."latest-version"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "latest-version-1.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/latest-version/-/latest-version-1.0.0.tgz"; + name = "latest-version-1.0.0.tgz"; + sha1 = "84f40e5c90745c7e4f7811624d6152c381d931d9"; + }) + ]; + buildInputs = + (self.nativeDeps."latest-version" or []); + deps = { + "package-json-1.0.1" = self.by-version."package-json"."1.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "latest-version" ]; + }; by-spec."lazy"."~1.0.11" = self.by-version."lazy"."1.0.11"; by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage { @@ -14409,9 +14756,9 @@ deps = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "promise-6.0.1" = self.by-version."promise"."6.0.1"; }; peerDependencies = [ @@ -14438,13 +14785,35 @@ "mime-1.2.11" = self.by-version."mime"."1.2.11"; "request-2.40.0" = self.by-version."request"."2.40.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "clean-css-2.2.19" = self.by-version."clean-css"."2.2.19"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "clean-css-2.2.22" = self.by-version."clean-css"."2.2.22"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; passthru.names = [ "less" ]; }; + by-spec."levn"."~0.2.5" = + self.by-version."levn"."0.2.5"; + by-version."levn"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "levn-0.2.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/levn/-/levn-0.2.5.tgz"; + name = "levn-0.2.5.tgz"; + sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054"; + }) + ]; + buildInputs = + (self.nativeDeps."levn" or []); + deps = { + "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1"; + "type-check-0.3.1" = self.by-version."type-check"."0.3.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "levn" ]; + }; by-spec."lexical-scope"."~0.0.14" = self.by-version."lexical-scope"."0.0.15"; by-version."lexical-scope"."0.0.15" = lib.makeOverridable self.buildNodePackage { @@ -15361,32 +15730,32 @@ passthru.names = [ "lsmod" ]; }; by-spec."ltx"."*" = - self.by-version."ltx"."0.7.2"; - by-version."ltx"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "ltx-0.7.2"; + self.by-version."ltx"."0.8.0"; + by-version."ltx"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "ltx-0.8.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ltx/-/ltx-0.7.2.tgz"; - name = "ltx-0.7.2.tgz"; - sha1 = "70a6aa8fa5fd426a422a41ba3d54a15ccdde680c"; + url = "http://registry.npmjs.org/ltx/-/ltx-0.8.0.tgz"; + name = "ltx-0.8.0.tgz"; + sha1 = "08aeb2f68c4c7d20ab35e9dcb7519fd80824c529"; }) ]; buildInputs = (self.nativeDeps."ltx" or []); deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; }; peerDependencies = [ ]; passthru.names = [ "ltx" ]; }; - "ltx" = self.by-version."ltx"."0.7.2"; + "ltx" = self.by-version."ltx"."0.8.0"; by-spec."ltx"."0.x" = - self.by-version."ltx"."0.7.2"; + self.by-version."ltx"."0.8.0"; by-spec."ltx".">= 0.2.0" = - self.by-version."ltx"."0.7.2"; + self.by-version."ltx"."0.8.0"; by-spec."ltx"."^0.5.2" = self.by-version."ltx"."0.5.2"; by-version."ltx"."0.5.2" = lib.makeOverridable self.buildNodePackage { @@ -15403,7 +15772,7 @@ (self.nativeDeps."ltx" or []); deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; }; peerDependencies = [ ]; @@ -15411,6 +15780,26 @@ }; by-spec."ltx"."^0.7.2" = self.by-version."ltx"."0.7.2"; + by-version."ltx"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "ltx-0.7.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ltx/-/ltx-0.7.2.tgz"; + name = "ltx-0.7.2.tgz"; + sha1 = "70a6aa8fa5fd426a422a41ba3d54a15ccdde680c"; + }) + ]; + buildInputs = + (self.nativeDeps."ltx" or []); + deps = { + "sax-0.6.1" = self.by-version."sax"."0.6.1"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "ltx" ]; + }; by-spec."ltx"."~0.3.2" = self.by-version."ltx"."0.3.4"; by-version."ltx"."0.3.4" = lib.makeOverridable self.buildNodePackage { @@ -15451,14 +15840,14 @@ (self.nativeDeps."ltx" or []); deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; }; peerDependencies = [ ]; passthru.names = [ "ltx" ]; }; by-spec."ltx"."~0.x" = - self.by-version."ltx"."0.7.2"; + self.by-version."ltx"."0.8.0"; by-spec."m8".">= 0.4.3" = self.by-version."m8"."0.4.4"; by-version."m8"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -15611,7 +16000,7 @@ "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "figures-1.3.5" = self.by-version."figures"."1.3.5"; "gzip-size-1.0.0" = self.by-version."gzip-size"."1.0.0"; - "pretty-bytes-1.0.1" = self.by-version."pretty-bytes"."1.0.1"; + "pretty-bytes-1.0.2" = self.by-version."pretty-bytes"."1.0.2"; }; peerDependencies = [ ]; @@ -15642,37 +16031,37 @@ passthru.names = [ "maxmin" ]; }; by-spec."mdns-js"."git+https://github.com/guerrerocarlos/node-mdns-js" = - self.by-version."mdns-js"."0.2.2"; - by-version."mdns-js"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "mdns-js-0.2.2"; + self.by-version."mdns-js"."0.2.4"; + by-version."mdns-js"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "mdns-js-0.2.4"; bin = false; src = [ (fetchgit { url = "https://github.com/guerrerocarlos/node-mdns-js"; - rev = "25b81ef88fa2f9ad8ebc875ac3e1d3f36a87ed61"; - sha256 = "1f6fee2a00345e9c82e0d49818f7137cf3288072bddfdc6225b738184804e103"; + rev = "36fc8ed207a6c7d571d1f98a186b8d3686c7f261"; + sha256 = "b14121656f33817843d09452ff3d562bbedda28cda2cba3e8ba436c9541f75ee"; }) ]; buildInputs = (self.nativeDeps."mdns-js" or []); deps = { "debug-0.8.1" = self.by-version."debug"."0.8.1"; - "mdns-js-packet-0.1.3" = self.by-version."mdns-js-packet"."0.1.3"; + "mdns-js-packet-0.1.8" = self.by-version."mdns-js-packet"."0.1.8"; }; peerDependencies = [ ]; passthru.names = [ "mdns-js" ]; }; by-spec."mdns-js-packet"."0.1.x" = - self.by-version."mdns-js-packet"."0.1.3"; - by-version."mdns-js-packet"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "mdns-js-packet-0.1.3"; + self.by-version."mdns-js-packet"."0.1.8"; + by-version."mdns-js-packet"."0.1.8" = lib.makeOverridable self.buildNodePackage { + name = "mdns-js-packet-0.1.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.3.tgz"; - name = "mdns-js-packet-0.1.3.tgz"; - sha1 = "a98ad52e1e74e96b00aab239af4354687a16db01"; + url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.8.tgz"; + name = "mdns-js-packet-0.1.8.tgz"; + sha1 = "e5a205c6e26e22a1df58e5f38057e80a6f84ee26"; }) ]; buildInputs = @@ -16117,15 +16506,15 @@ by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; by-spec."mime-db"."1.x" = - self.by-version."mime-db"."1.2.0"; - by-version."mime-db"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "mime-db-1.2.0"; + self.by-version."mime-db"."1.3.1"; + by-version."mime-db"."1.3.1" = lib.makeOverridable self.buildNodePackage { + name = "mime-db-1.3.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.2.0.tgz"; - name = "mime-db-1.2.0.tgz"; - sha1 = "76b92e7ecac673f5dab066a10b66faea1be2f01f"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.3.1.tgz"; + name = "mime-db-1.3.1.tgz"; + sha1 = "b1cd51ee8c4a674c49e03a96d67565fc768ce941"; }) ]; buildInputs = @@ -16136,8 +16525,8 @@ ]; passthru.names = [ "mime-db" ]; }; - by-spec."mime-db"."~1.2.0" = - self.by-version."mime-db"."1.2.0"; + by-spec."mime-db"."~1.3.0" = + self.by-version."mime-db"."1.3.1"; by-spec."mime-types"."~1.0.1" = self.by-version."mime-types"."1.0.2"; by-version."mime-types"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -16159,26 +16548,28 @@ passthru.names = [ "mime-types" ]; }; by-spec."mime-types"."~2.0.3" = - self.by-version."mime-types"."2.0.3"; - by-version."mime-types"."2.0.3" = lib.makeOverridable self.buildNodePackage { - name = "mime-types-2.0.3"; + self.by-version."mime-types"."2.0.4"; + by-version."mime-types"."2.0.4" = lib.makeOverridable self.buildNodePackage { + name = "mime-types-2.0.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.3.tgz"; - name = "mime-types-2.0.3.tgz"; - sha1 = "70b5cb5165b55dcb4972839f16d6077b0bb506f4"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.4.tgz"; + name = "mime-types-2.0.4.tgz"; + sha1 = "855a612979141d806ba5104294a28c731c6ea790"; }) ]; buildInputs = (self.nativeDeps."mime-types" or []); deps = { - "mime-db-1.2.0" = self.by-version."mime-db"."1.2.0"; + "mime-db-1.3.1" = self.by-version."mime-db"."1.3.1"; }; peerDependencies = [ ]; passthru.names = [ "mime-types" ]; }; + by-spec."mime-types"."~2.0.4" = + self.by-version."mime-types"."2.0.4"; by-spec."mimelib"."~0.2.15" = self.by-version."mimelib"."0.2.18"; by-version."mimelib"."0.2.18" = lib.makeOverridable self.buildNodePackage { @@ -16334,9 +16725,30 @@ by-spec."minimatch"."1.0.x" = self.by-version."minimatch"."1.0.0"; by-spec."minimatch".">=0.2.4" = - self.by-version."minimatch"."1.0.0"; + self.by-version."minimatch"."2.0.1"; + by-version."minimatch"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-2.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz"; + name = "minimatch-2.0.1.tgz"; + sha1 = "6c3760b45f66ed1cd5803143ee8d372488f02c37"; + }) + ]; + buildInputs = + (self.nativeDeps."minimatch" or []); + deps = { + "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "minimatch" ]; + }; by-spec."minimatch"."^1.0.0" = self.by-version."minimatch"."1.0.0"; + by-spec."minimatch"."^2.0.1" = + self.by-version."minimatch"."2.0.1"; by-spec."minimatch"."~0.2" = self.by-version."minimatch"."0.2.14"; by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { @@ -16359,18 +16771,20 @@ ]; passthru.names = [ "minimatch" ]; }; + by-spec."minimatch"."~0.2.0" = + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.11" = self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.12" = self.by-version."minimatch"."0.2.14"; - by-spec."minimatch"."~0.2.14" = - self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.9" = self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.3.0" = self.by-version."minimatch"."0.3.0"; by-spec."minimatch"."~1.0.0" = self.by-version."minimatch"."1.0.0"; + by-spec."minimatch"."~2.0.1" = + self.by-version."minimatch"."2.0.1"; by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -16391,26 +16805,6 @@ ]; passthru.names = [ "minimist" ]; }; - by-spec."minimist"."^0.1.0" = - self.by-version."minimist"."0.1.0"; - by-version."minimist"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "minimist-0.1.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; - name = "minimist-0.1.0.tgz"; - sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; - }; by-spec."minimist"."^1.1.0" = self.by-version."minimist"."1.1.0"; by-version."minimist"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -16498,15 +16892,15 @@ passthru.names = [ "ministyle" ]; }; by-spec."miniwrite"."~0.1.3" = - self.by-version."miniwrite"."0.1.3"; - by-version."miniwrite"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "miniwrite-0.1.3"; + self.by-version."miniwrite"."0.1.4"; + by-version."miniwrite"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "miniwrite-0.1.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.3.tgz"; - name = "miniwrite-0.1.3.tgz"; - sha1 = "9e893efb435f853454ca0321b86a44378e8c50c6"; + url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz"; + name = "miniwrite-0.1.4.tgz"; + sha1 = "72f02385c0ac37d542efe27dc6764b31908725ce"; }) ]; buildInputs = @@ -16723,15 +17117,15 @@ passthru.names = [ "mocha" ]; }; by-spec."mocha-phantomjs"."*" = - self.by-version."mocha-phantomjs"."3.5.1"; - by-version."mocha-phantomjs"."3.5.1" = lib.makeOverridable self.buildNodePackage { - name = "mocha-phantomjs-3.5.1"; + self.by-version."mocha-phantomjs"."3.5.2"; + by-version."mocha-phantomjs"."3.5.2" = lib.makeOverridable self.buildNodePackage { + name = "mocha-phantomjs-3.5.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.1.tgz"; - name = "mocha-phantomjs-3.5.1.tgz"; - sha1 = "e5460eff3e859b98be73a743f11cb5cae3c58d00"; + url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.2.tgz"; + name = "mocha-phantomjs-3.5.2.tgz"; + sha1 = "4d7474d373acc9f828c90d868035be527cdf367b"; }) ]; buildInputs = @@ -16745,7 +17139,7 @@ ]; passthru.names = [ "mocha-phantomjs" ]; }; - "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.1"; + "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.2"; by-spec."mocha-unfunk-reporter"."*" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -16763,7 +17157,7 @@ deps = { "jsesc-0.4.3" = self.by-version."jsesc"."0.4.3"; "unfunk-diff-0.0.2" = self.by-version."unfunk-diff"."0.0.2"; - "miniwrite-0.1.3" = self.by-version."miniwrite"."0.1.3"; + "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4"; "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4"; }; peerDependencies = [ @@ -16771,23 +17165,23 @@ passthru.names = [ "mocha-unfunk-reporter" ]; }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; - by-spec."module-deps"."^3.5.0" = - self.by-version."module-deps"."3.5.10"; - by-version."module-deps"."3.5.10" = lib.makeOverridable self.buildNodePackage { - name = "module-deps-3.5.10"; + by-spec."module-deps"."^3.6.3" = + self.by-version."module-deps"."3.6.3"; + by-version."module-deps"."3.6.3" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-3.6.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/module-deps/-/module-deps-3.5.10.tgz"; - name = "module-deps-3.5.10.tgz"; - sha1 = "2754737d4f9e52b60daa4abb242ade6c85ecde99"; + url = "http://registry.npmjs.org/module-deps/-/module-deps-3.6.3.tgz"; + name = "module-deps-3.6.3.tgz"; + sha1 = "4ffec778d74eb4c75d3102c1f414789fb6b6f277"; }) ]; buildInputs = (self.nativeDeps."module-deps" or []); deps = { "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; - "browser-resolve-1.4.1" = self.by-version."browser-resolve"."1.4.1"; + "browser-resolve-1.5.0" = self.by-version."browser-resolve"."1.5.0"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "detective-4.0.0" = self.by-version."detective"."4.0.0"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; @@ -16992,28 +17386,6 @@ ]; passthru.names = [ "mongodb" ]; }; - by-spec."mongodb"."1.3.x" = - self.by-version."mongodb"."1.3.23"; - by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.3.23"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.23.tgz"; - name = "mongodb-1.3.23.tgz"; - sha1 = "874a5212162b16188aeeaee5e06067766c8e9e86"; - }) - ]; - buildInputs = - (self.nativeDeps."mongodb" or []); - deps = { - "bson-0.2.5" = self.by-version."bson"."0.2.5"; - "kerberos-0.0.3" = self.by-version."kerberos"."0.0.3"; - }; - peerDependencies = [ - ]; - passthru.names = [ "mongodb" ]; - }; by-spec."mongodb"."1.4.12" = self.by-version."mongodb"."1.4.12"; by-version."mongodb"."1.4.12" = lib.makeOverridable self.buildNodePackage { @@ -17029,7 +17401,7 @@ buildInputs = (self.nativeDeps."mongodb" or []); deps = { - "bson-0.2.15" = self.by-version."bson"."0.2.15"; + "bson-0.2.16" = self.by-version."bson"."0.2.16"; "kerberos-0.0.4" = self.by-version."kerberos"."0.0.4"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; @@ -17037,6 +17409,29 @@ ]; passthru.names = [ "mongodb" ]; }; + by-spec."mongodb"."1.4.x" = + self.by-version."mongodb"."1.4.25"; + by-version."mongodb"."1.4.25" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.4.25"; + bin = false; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.25.tgz"; + name = "mongodb-1.4.25.tgz"; + sha1 = "58c09f9f2143db564ef2370fe9375a81f3daf96e"; + }) + ]; + buildInputs = + (self.nativeDeps."mongodb" or []); + deps = { + "bson-0.2.16" = self.by-version."bson"."0.2.16"; + "kerberos-0.0.7" = self.by-version."kerberos"."0.0.7"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + }; + peerDependencies = [ + ]; + passthru.names = [ "mongodb" ]; + }; by-spec."mongoose"."3.6.7" = self.by-version."mongoose"."3.6.7"; by-version."mongoose"."3.6.7" = lib.makeOverridable self.buildNodePackage { @@ -17094,15 +17489,15 @@ }; "mongoose" = self.by-version."mongoose"."3.6.20"; by-spec."mongoose"."3.8.x" = - self.by-version."mongoose"."3.8.19"; - by-version."mongoose"."3.8.19" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.8.19"; + self.by-version."mongoose"."3.8.21"; + by-version."mongoose"."3.8.21" = lib.makeOverridable self.buildNodePackage { + name = "mongoose-3.8.21"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.19.tgz"; - name = "mongoose-3.8.19.tgz"; - sha1 = "53b82129c895bbb1e91094cb34d4a03920b1dcb4"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.21.tgz"; + name = "mongoose-3.8.21.tgz"; + sha1 = "ba96d6e73b7b73a5c133ca886de316994df2a2f0"; }) ]; buildInputs = @@ -17274,6 +17669,27 @@ ]; passthru.names = [ "morgan" ]; }; + by-spec."mount-point"."^1.0.0" = + self.by-version."mount-point"."1.0.3"; + by-version."mount-point"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "mount-point-1.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mount-point/-/mount-point-1.0.3.tgz"; + name = "mount-point-1.0.3.tgz"; + sha1 = "43adac2467a9dc8abf4b784a0d7b7453ab58df4d"; + }) + ]; + buildInputs = + (self.nativeDeps."mount-point" or []); + deps = { + "node-df-0.1.1" = self.by-version."node-df"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "mount-point" ]; + }; by-spec."mout"."~0.9.0" = self.by-version."mout"."0.9.1"; by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage { @@ -17418,6 +17834,26 @@ ]; passthru.names = [ "ms" ]; }; + by-spec."ms"."0.7.0" = + self.by-version."ms"."0.7.0"; + by-version."ms"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "ms-0.7.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + name = "ms-0.7.0.tgz"; + sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; + }) + ]; + buildInputs = + (self.nativeDeps."ms" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ms" ]; + }; by-spec."msgpack".">= 0.0.1" = self.by-version."msgpack"."0.2.4"; by-version."msgpack"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -17567,21 +18003,23 @@ passthru.names = [ "mv" ]; }; by-spec."mz"."1" = - self.by-version."mz"."1.1.0"; - by-version."mz"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "mz-1.1.0"; + self.by-version."mz"."1.2.0"; + by-version."mz"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "mz-1.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mz/-/mz-1.1.0.tgz"; - name = "mz-1.1.0.tgz"; - sha1 = "fa63f08f20a1f6985cc1d9a33efa8db608cd6b9c"; + url = "http://registry.npmjs.org/mz/-/mz-1.2.0.tgz"; + name = "mz-1.2.0.tgz"; + sha1 = "efc279d54f32f54e6169cf0bed838c22fc417fe8"; }) ]; buildInputs = (self.nativeDeps."mz" or []); deps = { "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; + "thenify-2.0.0" = self.by-version."thenify"."2.0.0"; + "thenify-all-1.0.0" = self.by-version."thenify-all"."1.0.0"; }; peerDependencies = [ ]; @@ -17891,6 +18329,26 @@ ]; passthru.names = [ "ncp" ]; }; + by-spec."ncp"."^0.6.0" = + self.by-version."ncp"."0.6.0"; + by-version."ncp"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "ncp-0.6.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"; + name = "ncp-0.6.0.tgz"; + sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d"; + }) + ]; + buildInputs = + (self.nativeDeps."ncp" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ncp" ]; + }; by-spec."ncp"."~0.4.2" = self.by-version."ncp"."0.4.2"; by-spec."ncp"."~1.0.1" = @@ -17993,8 +18451,6 @@ ]; passthru.names = [ "negotiator" ]; }; - by-spec."negotiator"."~0.3.0" = - self.by-version."negotiator"."0.3.0"; by-spec."net-ping"."1.1.7" = self.by-version."net-ping"."1.1.7"; by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage { @@ -18142,11 +18598,11 @@ "diff-1.0.8" = self.by-version."diff"."1.0.8"; "dox-0.4.6" = self.by-version."dox"."0.4.6"; "jade-0.35.0" = self.by-version."jade"."0.35.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "request-2.27.0" = self.by-version."request"."2.27.0"; "semver-2.1.0" = self.by-version."semver"."2.1.0"; - "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4"; + "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; "temp-0.6.0" = self.by-version."temp"."0.6.0"; "wrench-1.5.8" = self.by-version."wrench"."1.5.8"; "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6"; @@ -18156,16 +18612,37 @@ ]; passthru.names = [ "node-appc" ]; }; - by-spec."node-expat"."*" = - self.by-version."node-expat"."2.3.3"; - by-version."node-expat"."2.3.3" = lib.makeOverridable self.buildNodePackage { - name = "node-expat-2.3.3"; + by-spec."node-df"."^0.1.1" = + self.by-version."node-df"."0.1.1"; + by-version."node-df"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-df-0.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.3.tgz"; - name = "node-expat-2.3.3.tgz"; - sha1 = "fd7bfe475c9dd30b634cc1279c7a68aea900ebfa"; + url = "http://registry.npmjs.org/node-df/-/node-df-0.1.1.tgz"; + name = "node-df-0.1.1.tgz"; + sha1 = "42ec5a15b7b491164b3de7edeef2e346a0e500ea"; + }) + ]; + buildInputs = + (self.nativeDeps."node-df" or []); + deps = { + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-df" ]; + }; + by-spec."node-expat"."*" = + self.by-version."node-expat"."2.3.4"; + by-version."node-expat"."2.3.4" = lib.makeOverridable self.buildNodePackage { + name = "node-expat-2.3.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.4.tgz"; + name = "node-expat-2.3.4.tgz"; + sha1 = "f2659ee57ca6226d0d0a3957eeae71c1b3f67f61"; }) ]; buildInputs = @@ -18179,9 +18656,9 @@ ]; passthru.names = [ "node-expat" ]; }; - "node-expat" = self.by-version."node-expat"."2.3.3"; + "node-expat" = self.by-version."node-expat"."2.3.4"; by-spec."node-expat".">=1.4.1" = - self.by-version."node-expat"."2.3.3"; + self.by-version."node-expat"."2.3.4"; by-spec."node-expat"."~2.1.4" = self.by-version."node-expat"."2.1.4"; by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage { @@ -18204,9 +18681,9 @@ passthru.names = [ "node-expat" ]; }; by-spec."node-expat"."~2.3.0" = - self.by-version."node-expat"."2.3.3"; + self.by-version."node-expat"."2.3.4"; by-spec."node-expat"."~2.3.1" = - self.by-version."node-expat"."2.3.3"; + self.by-version."node-expat"."2.3.4"; by-spec."node-gyp"."*" = self.by-version."node-gyp"."1.0.2"; by-version."node-gyp"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -18223,18 +18700,18 @@ (self.nativeDeps."node-gyp" or []); deps = { "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "tar-1.0.3" = self.by-version."tar"."1.0.3"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -18264,82 +18741,82 @@ "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "semver-2.1.0" = self.by-version."semver"."2.1.0"; "tar-0.1.20" = self.by-version."tar"."0.1.20"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; passthru.names = [ "node-gyp" ]; }; - by-spec."node-gyp"."~0.12.2" = - self.by-version."node-gyp"."0.12.2"; - by-version."node-gyp"."0.12.2" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.12.2"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.2.tgz"; - name = "node-gyp-0.12.2.tgz"; - sha1 = "bdca7e7025feb308ddd7fd3434300e47703ec57a"; - }) - ]; - buildInputs = - (self.nativeDeps."node-gyp" or []); - deps = { - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; - "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.49.0" = self.by-version."request"."2.49.0"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-2.2.1" = self.by-version."semver"."2.2.1"; - "tar-0.1.20" = self.by-version."tar"."0.1.20"; - "which-1.0.7" = self.by-version."which"."1.0.7"; - }; - peerDependencies = [ - ]; - passthru.names = [ "node-gyp" ]; - }; - by-spec."node-gyp"."~1.0.1" = + by-spec."node-gyp"."~1.0.2" = self.by-version."node-gyp"."1.0.2"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.7.4"; - by-version."node-inspector"."0.7.4" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.7.4"; + self.by-version."node-inspector"."0.8.1"; + by-version."node-inspector"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.8.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.4.tgz"; - name = "node-inspector-0.7.4.tgz"; - sha1 = "3d07234f0834e7f1e21a1669eceaa224a7be43f2"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.8.1.tgz"; + name = "node-inspector-0.8.1.tgz"; + sha1 = "2e7e88d47c4dc0761497f2fba520ca2310985950"; }) ]; buildInputs = (self.nativeDeps."node-inspector" or []); deps = { - "express-4.0.0" = self.by-version."express"."4.0.0"; - "async-0.8.0" = self.by-version."async"."0.8.0"; + "express-4.10.6" = self.by-version."express"."4.10.6"; + "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; + "async-0.9.0" = self.by-version."async"."0.9.0"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "rc-0.3.5" = self.by-version."rc"."0.3.5"; + "rc-0.5.4" = self.by-version."rc"."0.5.4"; "strong-data-uri-0.1.1" = self.by-version."strong-data-uri"."0.1.1"; - "debug-0.8.1" = self.by-version."debug"."0.8.1"; + "debug-1.0.4" = self.by-version."debug"."1.0.4"; "ws-0.4.32" = self.by-version."ws"."0.4.32"; - "opener-1.3.0" = self.by-version."opener"."1.3.0"; - "yargs-1.2.6" = self.by-version."yargs"."1.2.6"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "opener-1.4.0" = self.by-version."opener"."1.4.0"; + "yargs-1.3.3" = self.by-version."yargs"."1.3.3"; + "which-1.0.8" = self.by-version."which"."1.0.8"; + "v8-debug-0.3.1" = self.by-version."v8-debug"."0.3.1"; + "v8-profiler-5.2.1" = self.by-version."v8-profiler"."5.2.1"; + "semver-3.0.1" = self.by-version."semver"."3.0.1"; }; peerDependencies = [ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.7.4"; + "node-inspector" = self.by-version."node-inspector"."0.8.1"; + by-spec."node-pre-gyp"."0.5.x" = + self.by-version."node-pre-gyp"."0.5.31"; + by-version."node-pre-gyp"."0.5.31" = lib.makeOverridable self.buildNodePackage { + name = "node-pre-gyp-0.5.31"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.31.tgz"; + name = "node-pre-gyp-0.5.31.tgz"; + sha1 = "8c91516f0009e4691413c8c3f2d8a060deb607ba"; + }) + ]; + buildInputs = + (self.nativeDeps."node-pre-gyp" or []); + deps = { + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; + "request-2.51.0" = self.by-version."request"."2.51.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; + "tar-1.0.3" = self.by-version."tar"."1.0.3"; + "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "rc-0.5.4" = self.by-version."rc"."0.5.4"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-pre-gyp" ]; + }; by-spec."node-protobuf"."*" = self.by-version."node-protobuf"."1.2.2"; by-version."node-protobuf"."1.2.2" = lib.makeOverridable self.buildNodePackage { @@ -18512,15 +18989,15 @@ }; "node-uptime" = self.by-version."node-uptime"."3.2.0"; by-spec."node-uuid"."*" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-uuid-1.4.1"; - bin = false; + self.by-version."node-uuid"."1.4.2"; + by-version."node-uuid"."1.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-uuid-1.4.2"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"; + name = "node-uuid-1.4.2.tgz"; + sha1 = "907db3d11b7b6a2cf4f905fb7199f14ae7379ba0"; }) ]; buildInputs = @@ -18531,7 +19008,7 @@ ]; passthru.names = [ "node-uuid" ]; }; - "node-uuid" = self.by-version."node-uuid"."1.4.1"; + "node-uuid" = self.by-version."node-uuid"."1.4.2"; by-spec."node-uuid"."1.3.3" = self.by-version."node-uuid"."1.3.3"; by-version."node-uuid"."1.3.3" = lib.makeOverridable self.buildNodePackage { @@ -18574,12 +19051,32 @@ }; by-spec."node-uuid"."1.4.1" = self.by-version."node-uuid"."1.4.1"; + by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-uuid-1.4.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + name = "node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + }) + ]; + buildInputs = + (self.nativeDeps."node-uuid" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "node-uuid" ]; + }; by-spec."node-uuid"."^1.4.1" = - self.by-version."node-uuid"."1.4.1"; + self.by-version."node-uuid"."1.4.2"; by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.1"; + self.by-version."node-uuid"."1.4.2"; by-spec."node-uuid"."~1.4.1" = - self.by-version."node-uuid"."1.4.1"; + self.by-version."node-uuid"."1.4.2"; + by-spec."node-uuid"."~1.4.2" = + self.by-version."node-uuid"."1.4.2"; by-spec."node-wsfederation".">=0.1.1" = self.by-version."node-wsfederation"."0.1.1"; by-version."node-wsfederation"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -18616,17 +19113,17 @@ buildInputs = (self.nativeDeps."node-xmpp" or []); deps = { - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; - "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; + "faye-websocket-0.9.1" = self.by-version."faye-websocket"."0.9.1"; "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; "brfs-0.0.8" = self.by-version."brfs"."0.0.8"; "node-xmpp-component-1.0.0-alpha1" = self.by-version."node-xmpp-component"."1.0.0-alpha1"; - "node-xmpp-client-1.0.0-alpha18" = self.by-version."node-xmpp-client"."1.0.0-alpha18"; + "node-xmpp-client-1.0.0-alpha19" = self.by-version."node-xmpp-client"."1.0.0-alpha19"; "node-xmpp-server-1.0.0-alpha11" = self.by-version."node-xmpp-server"."1.0.0-alpha11"; - "node-xmpp-core-1.0.0-alpha11" = self.by-version."node-xmpp-core"."1.0.0-alpha11"; + "node-xmpp-core-1.0.0-alpha12" = self.by-version."node-xmpp-core"."1.0.0-alpha12"; }; peerDependencies = [ ]; @@ -18648,11 +19145,11 @@ buildInputs = (self.nativeDeps."node-xmpp" or []); deps = { - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; - "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; + "faye-websocket-0.9.1" = self.by-version."faye-websocket"."0.9.1"; "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; "brfs-0.0.8" = self.by-version."brfs"."0.0.8"; "node-xmpp-component-0.3.0" = self.by-version."node-xmpp-component"."0.3.0"; @@ -18692,15 +19189,15 @@ }; "node-xmpp-client" = self.by-version."node-xmpp-client"."1.0.0-alpha9"; by-spec."node-xmpp-client"."git+https://github.com/node-xmpp/node-xmpp-client.git" = - self.by-version."node-xmpp-client"."1.0.0-alpha18"; - by-version."node-xmpp-client"."1.0.0-alpha18" = lib.makeOverridable self.buildNodePackage { - name = "node-xmpp-client-1.0.0-alpha18"; + self.by-version."node-xmpp-client"."1.0.0-alpha19"; + by-version."node-xmpp-client"."1.0.0-alpha19" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-client-1.0.0-alpha19"; bin = false; src = [ (fetchgit { url = "https://github.com/node-xmpp/node-xmpp-client.git"; - rev = "7a7b32a65405e087a72e37f534dfb62aa0dc005a"; - sha256 = "5744e791465babfd1c2678304c3ef08a23371f9d1f9b45364d9dfd7e7a62e1c3"; + rev = "74bf98a62700bee8e32ba7723abd35320917b8d7"; + sha256 = "7dd69c6b8a4b8d7fef0109432c5b8add5560c9a108955b0adce7ee29507b5a26"; }) ]; buildInputs = @@ -18757,7 +19254,7 @@ buildInputs = (self.nativeDeps."node-xmpp-component" or []); deps = { - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; "node-xmpp-core-1.0.0-alpha1" = self.by-version."node-xmpp-core"."1.0.0-alpha1"; }; peerDependencies = [ @@ -18833,7 +19330,7 @@ "node-stringprep-0.6.2" = self.by-version."node-stringprep"."0.6.2"; "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1"; "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2"; - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; "debug-0.8.1" = self.by-version."debug"."0.8.1"; }; peerDependencies = [ @@ -18847,15 +19344,15 @@ by-spec."node-xmpp-core"."^1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; by-spec."node-xmpp-core"."git+https://github.com/node-xmpp/node-xmpp-core.git" = - self.by-version."node-xmpp-core"."1.0.0-alpha11"; - by-version."node-xmpp-core"."1.0.0-alpha11" = lib.makeOverridable self.buildNodePackage { - name = "node-xmpp-core-1.0.0-alpha11"; + self.by-version."node-xmpp-core"."1.0.0-alpha12"; + by-version."node-xmpp-core"."1.0.0-alpha12" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-core-1.0.0-alpha12"; bin = false; src = [ (self.patchSource fetchgit { url = "https://github.com/node-xmpp/node-xmpp-core.git"; - rev = "f10cef6ab105c1542f698c5648c47e685adc38ad"; - sha256 = "734a4681af2078d8f3daf1e8aeb2b4121003115a804e1666e416e87b48720ebc"; + rev = "ba6ec76654191dbb338a83dc5cd8b5d3c264ad7f"; + sha256 = "714ae11501ba59fffe06ed8c312672628363f55640c9c8d78c4654ad63976971"; }) ]; buildInputs = @@ -18911,13 +19408,13 @@ buildInputs = (self.nativeDeps."node-xmpp-joap" or []); deps = { - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; "node-xmpp-0.15.0" = self.by-version."node-xmpp"."0.15.0"; "node-stringprep-0.6.2" = self.by-version."node-stringprep"."0.6.2"; "ltx-0.6.0" = self.by-version."ltx"."0.6.0"; "async-0.9.0" = self.by-version."async"."0.9.0"; "toobusy-0.2.4" = self.by-version."toobusy"."0.2.4"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; }; peerDependencies = [ ]; @@ -18956,8 +19453,8 @@ src = [ (fetchgit { url = "https://github.com/node-xmpp/node-xmpp-server.git"; - rev = "535abf75c95c3e500ebb14a863b81bfa4da529db"; - sha256 = "5abac2a86079c6f4ba1371a6a6455f6ae022e19965151dc0c309c875f2629eb9"; + rev = "e61c1f97064e32dc9d5ac857a3915710ada88e84"; + sha256 = "6683bd693d37e0b435373a99f3f7f44e64be00d36eb736d30e66e9f8af874e2c"; }) ]; buildInputs = @@ -19060,29 +19557,29 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."1.2.1"; - by-version."nodemon"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-1.2.1"; + self.by-version."nodemon"."1.3.0-6"; + by-version."nodemon"."1.3.0-6" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-1.3.0-6"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-1.2.1.tgz"; - name = "nodemon-1.2.1.tgz"; - sha1 = "02a288045652e92350e7d752a8054472ed2c4824"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-1.3.0-6.tgz"; + name = "nodemon-1.3.0-6.tgz"; + sha1 = "8b2c8a4397da6138428cb6a6dcdb4288a89d98c8"; }) ]; buildInputs = (self.nativeDeps."nodemon" or []); deps = { - "update-notifier-0.1.10" = self.by-version."update-notifier"."0.1.10"; "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3"; + "update-notifier-0.1.10" = self.by-version."update-notifier"."0.1.10"; }; peerDependencies = [ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."1.2.1"; + "nodemon" = self.by-version."nodemon"."1.3.0-6"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -19214,8 +19711,6 @@ ]; passthru.names = [ "nopt" ]; }; - by-spec."nopt"."~2.1.2" = - self.by-version."nopt"."2.1.2"; by-spec."nopt"."~2.2.0" = self.by-version."nopt"."2.2.1"; by-spec."nopt"."~3.0.0" = @@ -19262,7 +19757,7 @@ deps = { "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -19273,15 +19768,15 @@ by-spec."normalize-package-data"."~1.0.3" = self.by-version."normalize-package-data"."1.0.3"; by-spec."npm"."*" = - self.by-version."npm"."2.1.11"; - by-version."npm"."2.1.11" = lib.makeOverridable self.buildNodePackage { - name = "npm-2.1.11"; + self.by-version."npm"."2.1.15"; + by-version."npm"."2.1.15" = lib.makeOverridable self.buildNodePackage { + name = "npm-2.1.15"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-2.1.11.tgz"; - name = "npm-2.1.11.tgz"; - sha1 = "1eed4c04e4c8c745bc721baba1b4fe42f2af140c"; + url = "http://registry.npmjs.org/npm/-/npm-2.1.15.tgz"; + name = "npm-2.1.15.tgz"; + sha1 = "7a4e3ce676ee8879a4e6935ae104877b5f99b8d5"; }) ]; buildInputs = @@ -19299,25 +19794,25 @@ "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; "cmd-shim-2.0.1" = self.by-version."cmd-shim"."2.0.1"; - "columnify-1.2.1" = self.by-version."columnify"."1.2.1"; + "columnify-1.3.2" = self.by-version."columnify"."1.3.2"; "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1"; "editor-0.1.0" = self.by-version."editor"."0.1.0"; - "fs-vacuum-1.2.2" = self.by-version."fs-vacuum"."1.2.2"; + "fs-vacuum-1.2.5" = self.by-version."fs-vacuum"."1.2.5"; "fs-write-stream-atomic-1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2"; "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1"; "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "ini-1.3.2" = self.by-version."ini"."1.3.2"; - "init-package-json-1.1.2" = self.by-version."init-package-json"."1.1.2"; + "init-package-json-1.1.3" = self.by-version."init-package-json"."1.1.3"; "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "node-gyp-1.0.2" = self.by-version."node-gyp"."1.0.2"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; @@ -19325,7 +19820,7 @@ "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; "npm-install-checks-1.0.4" = self.by-version."npm-install-checks"."1.0.4"; "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3"; - "npm-registry-client-4.0.4" = self.by-version."npm-registry-client"."4.0.4"; + "npm-registry-client-4.0.5" = self.by-version."npm-registry-client"."4.0.5"; "npm-user-validate-0.1.1" = self.by-version."npm-user-validate"."0.1.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; @@ -19337,17 +19832,17 @@ "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "realize-package-specifier-1.3.0" = self.by-version."realize-package-specifier"."1.3.0"; - "request-2.48.0" = self.by-version."request"."2.48.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "sha-1.3.0" = self.by-version."sha"."1.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0"; "tar-1.0.3" = self.by-version."tar"."1.0.3"; "text-table-0.2.0" = self.by-version."text-table"."0.2.0"; "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0"; }; @@ -19355,7 +19850,7 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."2.1.11"; + "npm" = self.by-version."npm"."2.1.15"; by-spec."npm"."1.3.4" = self.by-version."npm"."1.3.4"; by-version."npm"."1.3.4" = lib.makeOverridable self.buildNodePackage { @@ -19380,7 +19875,7 @@ "nopt-2.1.2" = self.by-version."nopt"."2.1.2"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "request-2.21.0" = self.by-version."request"."2.21.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "tar-0.1.20" = self.by-version."tar"."0.1.20"; "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; @@ -19417,73 +19912,8 @@ ]; passthru.names = [ "npm" ]; }; - by-spec."npm"."1.3.x" = - self.by-version."npm"."1.3.26"; - by-version."npm"."1.3.26" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.26"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.26.tgz"; - name = "npm-1.3.26.tgz"; - sha1 = "bc07bf7cb58710078141c885c2d492fd570f606d"; - }) - ]; - buildInputs = - (self.nativeDeps."npm" or []); - deps = { - "semver-2.2.1" = self.by-version."semver"."2.2.1"; - "ini-1.1.0" = self.by-version."ini"."1.1.0"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; - "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; - "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; - "nopt-2.1.2" = self.by-version."nopt"."2.1.2"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "request-2.30.0" = self.by-version."request"."2.30.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; - "tar-0.1.20" = self.by-version."tar"."0.1.20"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "read-1.0.5" = self.by-version."read"."1.0.5"; - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "node-gyp-0.12.2" = self.by-version."node-gyp"."0.12.2"; - "fstream-npm-0.1.8" = self.by-version."fstream-npm"."0.1.8"; - "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6"; - "archy-0.0.2" = self.by-version."archy"."0.0.2"; - "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "npmlog-0.0.6" = self.by-version."npmlog"."0.0.6"; - "ansi-0.2.1" = self.by-version."ansi"."0.2.1"; - "npm-registry-client-0.3.6" = self.by-version."npm-registry-client"."0.3.6"; - "read-package-json-1.1.9" = self.by-version."read-package-json"."1.1.9"; - "read-installed-0.2.5" = self.by-version."read-installed"."0.2.5"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "init-package-json-0.0.14" = self.by-version."init-package-json"."0.0.14"; - "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "lockfile-0.4.3" = self.by-version."lockfile"."0.4.3"; - "retry-0.6.1" = self.by-version."retry"."0.6.1"; - "once-1.3.1" = self.by-version."once"."1.3.1"; - "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16"; - "opener-1.3.0" = self.by-version."opener"."1.3.0"; - "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; - "cmd-shim-1.1.2" = self.by-version."cmd-shim"."1.1.2"; - "sha-1.2.4" = self.by-version."sha"."1.2.4"; - "editor-0.0.5" = self.by-version."editor"."0.0.5"; - "child-process-close-0.1.1" = self.by-version."child-process-close"."0.1.1"; - "npm-user-validate-0.0.3" = self.by-version."npm-user-validate"."0.0.3"; - "github-url-from-git-1.1.1" = self.by-version."github-url-from-git"."1.1.1"; - "github-url-from-username-repo-0.0.2" = self.by-version."github-url-from-username-repo"."0.0.2"; - "text-table-0.2.0" = self.by-version."text-table"."0.2.0"; - "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2"; - "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3"; - "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; - "columnify-0.1.2" = self.by-version."columnify"."0.1.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "npm" ]; - }; + by-spec."npm"."2.1.x" = + self.by-version."npm"."2.1.15"; by-spec."npm-cache-filename"."~1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; by-version."npm-cache-filename"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -19505,31 +19935,31 @@ passthru.names = [ "npm-cache-filename" ]; }; by-spec."npm-check-updates"."*" = - self.by-version."npm-check-updates"."1.2.0"; - by-version."npm-check-updates"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "npm-check-updates-1.2.0"; + self.by-version."npm-check-updates"."1.3.0"; + by-version."npm-check-updates"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "npm-check-updates-1.3.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-1.2.0.tgz"; - name = "npm-check-updates-1.2.0.tgz"; - sha1 = "9e055cdc4a6fad8043bb95adf23eb74f5718c3ec"; + url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-1.3.0.tgz"; + name = "npm-check-updates-1.3.0.tgz"; + sha1 = "5d42413cd754fc29d32029ad37eb975a2206f598"; }) ]; buildInputs = (self.nativeDeps."npm-check-updates" or []); deps = { - "npm-1.3.26" = self.by-version."npm"."1.3.26"; - "commander-2.0.0" = self.by-version."commander"."2.0.0"; - "async-0.2.10" = self.by-version."async"."0.2.10"; - "read-package-json-1.1.9" = self.by-version."read-package-json"."1.1.9"; - "semver-2.2.1" = self.by-version."semver"."2.2.1"; + "npm-2.1.15" = self.by-version."npm"."2.1.15"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; passthru.names = [ "npm-check-updates" ]; }; - "npm-check-updates" = self.by-version."npm-check-updates"."1.2.0"; + "npm-check-updates" = self.by-version."npm-check-updates"."1.3.0"; by-spec."npm-install-checks"."~1.0.2" = self.by-version."npm-install-checks"."1.0.4"; by-version."npm-install-checks"."1.0.4" = lib.makeOverridable self.buildNodePackage { @@ -19546,7 +19976,7 @@ (self.nativeDeps."npm-install-checks" or []); deps = { "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -19567,7 +19997,7 @@ buildInputs = (self.nativeDeps."npm-package-arg" or []); deps = { - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -19590,7 +20020,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = { - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "semver-2.0.11" = self.by-version."semver"."2.0.11"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; @@ -19620,7 +20050,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = { - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; @@ -19635,45 +20065,16 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.3.5" = - self.by-version."npm-registry-client"."0.3.6"; - by-version."npm-registry-client"."0.3.6" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-0.3.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.6.tgz"; - name = "npm-registry-client-0.3.6.tgz"; - sha1 = "c48a2a03643769acc49672860f7920ec6bffac6e"; - }) - ]; - buildInputs = - (self.nativeDeps."npm-registry-client" or []); - deps = { - "request-2.49.0" = self.by-version."request"."2.49.0"; - "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; - "semver-2.3.2" = self.by-version."semver"."2.3.2"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "retry-0.6.0" = self.by-version."retry"."0.6.0"; - "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "npm-registry-client" ]; - }; by-spec."npm-registry-client"."~4.0.4" = - self.by-version."npm-registry-client"."4.0.4"; - by-version."npm-registry-client"."4.0.4" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-4.0.4"; + self.by-version."npm-registry-client"."4.0.5"; + by-version."npm-registry-client"."4.0.5" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-4.0.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.4.tgz"; - name = "npm-registry-client-4.0.4.tgz"; - sha1 = "6935cde6460a3bf1cb6019d7523196e0fb96fb62"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.5.tgz"; + name = "npm-registry-client-4.0.5.tgz"; + sha1 = "27d37ca0c7bbd5df14f4ae35223a4d588dd4fea6"; }) ]; buildInputs = @@ -19685,10 +20086,10 @@ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; }; @@ -19696,6 +20097,8 @@ ]; passthru.names = [ "npm-registry-client" ]; }; + by-spec."npm-registry-client"."~4.0.5" = + self.by-version."npm-registry-client"."4.0.5"; by-spec."npm-user-validate"."0.0.3" = self.by-version."npm-user-validate"."0.0.3"; by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -19843,7 +20246,7 @@ "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = [ @@ -19872,7 +20275,7 @@ "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = [ @@ -19881,8 +20284,6 @@ }; by-spec."npmconf"."~0.1.1" = self.by-version."npmconf"."0.1.16"; - by-spec."npmconf"."~0.1.12" = - self.by-version."npmconf"."0.1.16"; by-spec."npmconf"."~0.1.2" = self.by-version."npmconf"."0.1.16"; by-spec."npmconf"."~2.1.1" = @@ -19931,41 +20332,20 @@ ]; passthru.names = [ "npmlog" ]; }; - by-spec."npmlog"."0.0.6" = - self.by-version."npmlog"."0.0.6"; - by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "npmlog-0.0.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz"; - name = "npmlog-0.0.6.tgz"; - sha1 = "685043fe71aa1665d6e3b2acef180640caf40873"; - }) - ]; - buildInputs = - (self.nativeDeps."npmlog" or []); - deps = { - "ansi-0.2.1" = self.by-version."ansi"."0.2.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "npmlog" ]; - }; by-spec."npmlog"."0.1" = self.by-version."npmlog"."0.1.1"; by-spec."npmlog"."~0.1.1" = self.by-version."npmlog"."0.1.1"; by-spec."nssocket"."~0.5.1" = - self.by-version."nssocket"."0.5.2"; - by-version."nssocket"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "nssocket-0.5.2"; + self.by-version."nssocket"."0.5.3"; + by-version."nssocket"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "nssocket-0.5.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.2.tgz"; - name = "nssocket-0.5.2.tgz"; - sha1 = "7ea1d0c3106620f722cdff4ddfd5aac5b2553536"; + url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz"; + name = "nssocket-0.5.3.tgz"; + sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d"; }) ]; buildInputs = @@ -19999,15 +20379,15 @@ passthru.names = [ "numeral" ]; }; by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" = - self.by-version."oauth"."0.9.11"; - by-version."oauth"."0.9.11" = lib.makeOverridable self.buildNodePackage { - name = "oauth-0.9.11"; + self.by-version."oauth"."0.9.12"; + by-version."oauth"."0.9.12" = lib.makeOverridable self.buildNodePackage { + name = "oauth-0.9.12"; bin = false; src = [ (fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; - name = "oauth-0.9.11.tgz"; - sha256 = "783dead39b8df22dfff8961fcfb3e65622375d4308c12c1fbce2ae2e4da20184"; + name = "oauth-0.9.12.tgz"; + sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7"; }) ]; buildInputs = @@ -20317,6 +20697,26 @@ self.by-version."once"."1.3.1"; by-spec."once"."~1.3.1" = self.by-version."once"."1.3.1"; + by-spec."onetime"."^1.0.0" = + self.by-version."onetime"."1.0.0"; + by-version."onetime"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "onetime-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz"; + name = "onetime-1.0.0.tgz"; + sha1 = "3a08a8e39d7816df52d34886374fb8ed8b651f62"; + }) + ]; + buildInputs = + (self.nativeDeps."onetime" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "onetime" ]; + }; by-spec."open"."0.0.2" = self.by-version."open"."0.0.2"; by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -20357,6 +20757,26 @@ ]; passthru.names = [ "open" ]; }; + by-spec."opener"."^1.3.0" = + self.by-version."opener"."1.4.0"; + by-version."opener"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "opener-1.4.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz"; + name = "opener-1.4.0.tgz"; + sha1 = "d11f86eeeb076883735c9d509f538fe82d10b941"; + }) + ]; + buildInputs = + (self.nativeDeps."opener" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "opener" ]; + }; by-spec."opener"."~1.3.0" = self.by-version."opener"."1.3.0"; by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -20379,24 +20799,6 @@ }; by-spec."opener"."~1.4.0" = self.by-version."opener"."1.4.0"; - by-version."opener"."1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "opener-1.4.0"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz"; - name = "opener-1.4.0.tgz"; - sha1 = "d11f86eeeb076883735c9d509f538fe82d10b941"; - }) - ]; - buildInputs = - (self.nativeDeps."opener" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "opener" ]; - }; by-spec."openid".">=0.2.0" = self.by-version."openid"."0.5.9"; by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage { @@ -20534,6 +20936,32 @@ self.by-version."optimist"."0.6.1"; by-spec."optimist"."~0.6.1" = self.by-version."optimist"."0.6.1"; + by-spec."optionator"."^0.4.0" = + self.by-version."optionator"."0.4.0"; + by-version."optionator"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "optionator-0.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/optionator/-/optionator-0.4.0.tgz"; + name = "optionator-0.4.0.tgz"; + sha1 = "e79c7926ff7d550f92c714dfc3da21d7877ebea6"; + }) + ]; + buildInputs = + (self.nativeDeps."optionator" or []); + deps = { + "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1"; + "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3"; + "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; + "type-check-0.3.1" = self.by-version."type-check"."0.3.1"; + "levn-0.2.5" = self.by-version."levn"."0.2.5"; + "fast-levenshtein-1.0.6" = self.by-version."fast-levenshtein"."1.0.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "optionator" ]; + }; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.6"; by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -20795,6 +21223,28 @@ ]; passthru.names = [ "package-json" ]; }; + by-spec."package-json"."^1.0.0" = + self.by-version."package-json"."1.0.1"; + by-version."package-json"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "package-json-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/package-json/-/package-json-1.0.1.tgz"; + name = "package-json-1.0.1.tgz"; + sha1 = "89cc831317c4d17922413d5318b23c904e5cf43e"; + }) + ]; + buildInputs = + (self.nativeDeps."package-json" or []); + deps = { + "got-1.2.2" = self.by-version."got"."1.2.2"; + "registry-url-2.0.0" = self.by-version."registry-url"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "package-json" ]; + }; by-spec."pako"."~0.2.0" = self.by-version."pako"."0.2.5"; by-version."pako"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -20877,6 +21327,29 @@ ]; passthru.names = [ "parents" ]; }; + by-spec."parse-asn1"."^1.2.0" = + self.by-version."parse-asn1"."1.2.0"; + by-version."parse-asn1"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "parse-asn1-1.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-1.2.0.tgz"; + name = "parse-asn1-1.2.0.tgz"; + sha1 = "d6a8926be45c4ff032842bd86b36b7b574a810ae"; + }) + ]; + buildInputs = + (self.nativeDeps."parse-asn1" or []); + deps = { + "asn1.js-0.6.5" = self.by-version."asn1.js"."0.6.5"; + "asn1.js-rfc3280-0.5.1" = self.by-version."asn1.js-rfc3280"."0.5.1"; + "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "parse-asn1" ]; + }; by-spec."parse-torrent"."^1.4.0" = self.by-version."parse-torrent"."1.7.0"; by-version."parse-torrent"."1.7.0" = lib.makeOverridable self.buildNodePackage { @@ -21094,7 +21567,7 @@ ]; passthru.names = [ "path-browserify" ]; }; - by-spec."path-is-inside"."~1.0.0" = + by-spec."path-is-inside"."^1.0.1" = self.by-version."path-is-inside"."1.0.1"; by-version."path-is-inside"."1.0.1" = lib.makeOverridable self.buildNodePackage { name = "path-is-inside-1.0.1"; @@ -21114,6 +21587,8 @@ ]; passthru.names = [ "path-is-inside" ]; }; + by-spec."path-is-inside"."~1.0.0" = + self.by-version."path-is-inside"."1.0.1"; by-spec."path-platform"."^0.0.1" = self.by-version."path-platform"."0.0.1"; by-version."path-platform"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -21134,26 +21609,6 @@ ]; passthru.names = [ "path-platform" ]; }; - by-spec."path-to-regexp"."0.1.2" = - self.by-version."path-to-regexp"."0.1.2"; - by-version."path-to-regexp"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "path-to-regexp-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.2.tgz"; - name = "path-to-regexp-0.1.2.tgz"; - sha1 = "9b2b151f9cc3018c9eea50ca95729e05781712b4"; - }) - ]; - buildInputs = - (self.nativeDeps."path-to-regexp" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "path-to-regexp" ]; - }; by-spec."path-to-regexp"."0.1.3" = self.by-version."path-to-regexp"."0.1.3"; by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -21288,7 +21743,7 @@ "pump-0.3.5" = self.by-version."pump"."0.3.5"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "rc-0.4.0" = self.by-version."rc"."0.4.0"; - "read-torrent-1.1.0" = self.by-version."read-torrent"."1.1.0"; + "read-torrent-1.2.0" = self.by-version."read-torrent"."1.2.0"; "torrent-stream-0.16.2" = self.by-version."torrent-stream"."0.16.2"; "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; @@ -21393,7 +21848,7 @@ "request-2.42.0" = self.by-version."request"."2.42.0"; "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -21618,6 +22073,26 @@ ]; passthru.names = [ "posix-getopt" ]; }; + by-spec."prelude-ls"."~1.1.0" = + self.by-version."prelude-ls"."1.1.1"; + by-version."prelude-ls"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "prelude-ls-1.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz"; + name = "prelude-ls-1.1.1.tgz"; + sha1 = "c0b86c1ffd151ad3cc75e7e3fe38d7a1bf33728a"; + }) + ]; + buildInputs = + (self.nativeDeps."prelude-ls" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "prelude-ls" ]; + }; by-spec."pretty-bytes"."^0.1.0" = self.by-version."pretty-bytes"."0.1.2"; by-version."pretty-bytes"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -21639,15 +22114,15 @@ passthru.names = [ "pretty-bytes" ]; }; by-spec."pretty-bytes"."^1.0.0" = - self.by-version."pretty-bytes"."1.0.1"; - by-version."pretty-bytes"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "pretty-bytes-1.0.1"; + self.by-version."pretty-bytes"."1.0.2"; + by-version."pretty-bytes"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "pretty-bytes-1.0.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.1.tgz"; - name = "pretty-bytes-1.0.1.tgz"; - sha1 = "afd0b459da61834ac36617b05f9daa0beb043e3e"; + url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.2.tgz"; + name = "pretty-bytes-1.0.2.tgz"; + sha1 = "b38f90c0b93d9942a4c4bec6cb5f367d51d80120"; }) ]; buildInputs = @@ -21955,6 +22430,28 @@ }; by-spec."ps-tree"."~0.0.3" = self.by-version."ps-tree"."0.0.3"; + by-spec."public-encrypt"."1.0.1" = + self.by-version."public-encrypt"."1.0.1"; + by-version."public-encrypt"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "public-encrypt-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-1.0.1.tgz"; + name = "public-encrypt-1.0.1.tgz"; + sha1 = "f4d881f0068cdd24017ef4baa4f49b9d8d055c46"; + }) + ]; + buildInputs = + (self.nativeDeps."public-encrypt" or []); + deps = { + "bn.js-0.16.0" = self.by-version."bn.js"."0.16.0"; + "parse-asn1-1.2.0" = self.by-version."parse-asn1"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "public-encrypt" ]; + }; by-spec."pump"."^0.3.1" = self.by-version."pump"."0.3.5"; by-version."pump"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -22606,7 +23103,7 @@ deps = { "cookie-0.1.0" = self.by-version."cookie"."0.1.0"; "lsmod-0.0.3" = self.by-version."lsmod"."0.0.3"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "stack-trace-0.0.7" = self.by-version."stack-trace"."0.0.7"; }; peerDependencies = [ @@ -22787,30 +23284,7 @@ ]; passthru.names = [ "rc" ]; }; - by-spec."rc"."~0.3.0" = - self.by-version."rc"."0.3.5"; - by-version."rc"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "rc-0.3.5"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-0.3.5.tgz"; - name = "rc-0.3.5.tgz"; - sha1 = "fce2220593be57aa1296685a7e37ed003dfcc728"; - }) - ]; - buildInputs = - (self.nativeDeps."rc" or []); - deps = { - "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; - "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; - "ini-1.1.0" = self.by-version."ini"."1.1.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "rc" ]; - }; - by-spec."rc"."~0.5.4" = + by-spec."rc"."^0.5.1" = self.by-version."rc"."0.5.4"; by-version."rc"."0.5.4" = lib.makeOverridable self.buildNodePackage { name = "rc-0.5.4"; @@ -22834,16 +23308,22 @@ ]; passthru.names = [ "rc" ]; }; + by-spec."rc"."~0.5.0" = + self.by-version."rc"."0.5.4"; + by-spec."rc"."~0.5.1" = + self.by-version."rc"."0.5.4"; + by-spec."rc"."~0.5.4" = + self.by-version."rc"."0.5.4"; by-spec."react"."*" = - self.by-version."react"."0.12.1"; - by-version."react"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "react-0.12.1"; + self.by-version."react"."0.12.2"; + by-version."react"."0.12.2" = lib.makeOverridable self.buildNodePackage { + name = "react-0.12.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/react/-/react-0.12.1.tgz"; - name = "react-0.12.1.tgz"; - sha1 = "b73836f4f1888ce79c9372208398a3fb5483bc35"; + url = "http://registry.npmjs.org/react/-/react-0.12.2.tgz"; + name = "react-0.12.2.tgz"; + sha1 = "1c4f0b08818146eeab4f0ab39257e0aa52027e00"; }) ]; buildInputs = @@ -22855,7 +23335,7 @@ ]; passthru.names = [ "react" ]; }; - "react" = self.by-version."react"."0.12.1"; + "react" = self.by-version."react"."0.12.2"; by-spec."read"."1" = self.by-version."read"."1.0.5"; by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { @@ -22925,7 +23405,7 @@ "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; "readdir-scoped-modules-1.0.1" = self.by-version."readdir-scoped-modules"."1.0.1"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; @@ -22951,7 +23431,7 @@ deps = { "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; @@ -22960,7 +23440,9 @@ ]; passthru.names = [ "read-package-json" ]; }; - by-spec."read-package-json"."1.1.x" = + by-spec."read-package-json"."1.2.x" = + self.by-version."read-package-json"."1.2.7"; + by-spec."read-package-json"."~1.1.0" = self.by-version."read-package-json"."1.1.9"; by-version."read-package-json"."1.1.9" = lib.makeOverridable self.buildNodePackage { name = "read-package-json-1.1.9"; @@ -22984,30 +23466,27 @@ ]; passthru.names = [ "read-package-json" ]; }; - by-spec."read-package-json"."~1.1.0" = - self.by-version."read-package-json"."1.1.9"; - by-spec."read-package-json"."~1.1.6" = - self.by-version."read-package-json"."1.1.9"; by-spec."read-package-json"."~1.2.7" = self.by-version."read-package-json"."1.2.7"; by-spec."read-torrent"."^1.1.0" = - self.by-version."read-torrent"."1.1.0"; - by-version."read-torrent"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "read-torrent-1.1.0"; + self.by-version."read-torrent"."1.2.0"; + by-version."read-torrent"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "read-torrent-1.2.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.1.0.tgz"; - name = "read-torrent-1.1.0.tgz"; - sha1 = "a34506d88b50682e01cb638576b4fccebfe706ed"; + url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.2.0.tgz"; + name = "read-torrent-1.2.0.tgz"; + sha1 = "2b5fa465ab1e3a9a2e478403b425910ae66c58a9"; }) ]; buildInputs = (self.nativeDeps."read-torrent" or []); deps = { - "request-2.16.6" = self.by-version."request"."2.16.6"; - "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0"; "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1"; + "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0"; + "request-2.16.6" = self.by-version."request"."2.16.6"; + "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; peerDependencies = [ ]; @@ -23060,30 +23539,6 @@ ]; passthru.names = [ "readable-stream" ]; }; - by-spec."readable-stream"."1.0" = - self.by-version."readable-stream"."1.0.33"; - by-version."readable-stream"."1.0.33" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.0.33"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; - name = "readable-stream-1.0.33.tgz"; - sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; - }) - ]; - buildInputs = - (self.nativeDeps."readable-stream" or []); - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "readable-stream" ]; - }; by-spec."readable-stream"."1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage { @@ -23112,6 +23567,28 @@ self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream".">=1.0.33-1 <1.1.0-0" = self.by-version."readable-stream"."1.0.33"; + by-version."readable-stream"."1.0.33" = lib.makeOverridable self.buildNodePackage { + name = "readable-stream-1.0.33"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; + name = "readable-stream-1.0.33.tgz"; + sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; + }) + ]; + buildInputs = + (self.nativeDeps."readable-stream" or []); + deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "readable-stream" ]; + }; by-spec."readable-stream".">=1.1.13-1 <1.2.0-0" = self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."^1.0.2" = @@ -23187,16 +23664,16 @@ ]; passthru.names = [ "readdir-scoped-modules" ]; }; - by-spec."readdirp"."^1.1.0" = - self.by-version."readdirp"."1.1.0"; - by-version."readdirp"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "readdirp-1.1.0"; + by-spec."readdirp"."^1.2.0" = + self.by-version."readdirp"."1.3.0"; + by-version."readdirp"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "readdirp-1.3.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/readdirp/-/readdirp-1.1.0.tgz"; - name = "readdirp-1.1.0.tgz"; - sha1 = "6506f9d5d8bb2edc19c855a60bb92feca5fae39c"; + url = "http://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz"; + name = "readdirp-1.3.0.tgz"; + sha1 = "eaf1a9b463be9a8190fc9ae163aa1ac934aa340b"; }) ]; buildInputs = @@ -23225,14 +23702,14 @@ buildInputs = (self.nativeDeps."readdirp" or []); deps = { - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; }; peerDependencies = [ ]; passthru.names = [ "readdirp" ]; }; - by-spec."readdirp"."~1.1.0" = - self.by-version."readdirp"."1.1.0"; + by-spec."readdirp"."~1.3.0" = + self.by-version."readdirp"."1.3.0"; by-spec."readline2"."~0.1.0" = self.by-version."readline2"."0.1.0"; by-version."readline2"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -23487,6 +23964,27 @@ ]; passthru.names = [ "registry-url" ]; }; + by-spec."registry-url"."^2.0.0" = + self.by-version."registry-url"."2.0.0"; + by-version."registry-url"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "registry-url-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/registry-url/-/registry-url-2.0.0.tgz"; + name = "registry-url-2.0.0.tgz"; + sha1 = "f42feb744865eef37a33d38edec4cff9ea92f643"; + }) + ]; + buildInputs = + (self.nativeDeps."registry-url" or []); + deps = { + "rc-0.5.4" = self.by-version."rc"."0.5.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "registry-url" ]; + }; by-spec."repeating"."^1.1.0" = self.by-version."repeating"."1.1.0"; by-version."repeating"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -23533,15 +24031,15 @@ passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.49.0"; - by-version."request"."2.49.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.49.0"; + self.by-version."request"."2.51.0"; + by-version."request"."2.51.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.51.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.49.0.tgz"; - name = "request-2.49.0.tgz"; - sha1 = "0d4f6348dc3348059b553e4db60fd2478de662a7"; + url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz"; + name = "request-2.51.0.tgz"; + sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e"; }) ]; buildInputs = @@ -23550,10 +24048,10 @@ "bl-0.9.3" = self.by-version."bl"."0.9.3"; "caseless-0.8.0" = self.by-version."caseless"."0.8.0"; "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23569,9 +24067,9 @@ passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."2.16.x" = self.by-version."request"."2.16.6"; by-version."request"."2.16.6" = lib.makeOverridable self.buildNodePackage { @@ -23590,7 +24088,7 @@ "form-data-0.0.10" = self.by-version."form-data"."0.0.10"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "hawk-0.10.2" = self.by-version."hawk"."0.10.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "cookie-jar-0.2.0" = self.by-version."cookie-jar"."0.2.0"; "aws-sign-0.2.0" = self.by-version."aws-sign"."0.2.0"; "oauth-sign-0.2.0" = self.by-version."oauth-sign"."0.2.0"; @@ -23622,7 +24120,7 @@ "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; @@ -23657,7 +24155,7 @@ "qs-1.2.2" = self.by-version."qs"."1.2.2"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; @@ -23692,7 +24190,7 @@ "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23727,18 +24225,20 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."2.x" = + self.by-version."request"."2.51.0"; by-spec."request".">= 2.9.153" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.36.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.40.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.47.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.48.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."~2" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."~2.16.2" = self.by-version."request"."2.16.6"; by-spec."request"."~2.21.0" = @@ -23765,7 +24265,7 @@ "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0"; "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "form-data-0.0.8" = self.by-version."form-data"."0.0.8"; }; @@ -23797,7 +24297,7 @@ "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0"; "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; }; @@ -23805,38 +24305,6 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request"."~2.30.0" = - self.by-version."request"."2.30.0"; - by-version."request"."2.30.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.30.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; - name = "request-2.30.0.tgz"; - sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = { - "qs-0.6.6" = self.by-version."qs"."0.6.6"; - "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "tough-cookie-0.9.15" = self.by-version."tough-cookie"."0.9.15"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; - "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; - "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; - "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; - "hawk-1.0.0" = self.by-version."hawk"."1.0.0"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; by-spec."request"."~2.40.0" = self.by-version."request"."2.40.0"; by-spec."request"."~2.42.0" = @@ -23862,7 +24330,7 @@ "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-1.2.2" = self.by-version."qs"."1.2.2"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23897,7 +24365,7 @@ "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23912,6 +24380,8 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."~2.51.0" = + self.by-version."request"."2.51.0"; by-spec."request-progress"."0.3.0" = self.by-version."request-progress"."0.3.0"; by-version."request-progress"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -24017,7 +24487,7 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."0.7.4" = + by-spec."resolve"."0.7.x" = self.by-version."resolve"."0.7.4"; by-version."resolve"."0.7.4" = lib.makeOverridable self.buildNodePackage { name = "resolve-0.7.4"; @@ -24037,8 +24507,26 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."0.7.x" = - self.by-version."resolve"."0.7.4"; + by-spec."resolve"."1.0.0" = + self.by-version."resolve"."1.0.0"; + by-version."resolve"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "resolve-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; + name = "resolve-1.0.0.tgz"; + sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; + }) + ]; + buildInputs = + (self.nativeDeps."resolve" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "resolve" ]; + }; by-spec."resolve"."~0.3.0" = self.by-version."resolve"."0.3.1"; by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -24071,24 +24559,6 @@ self.by-version."resolve"."0.7.4"; by-spec."resolve"."~1.0.0" = self.by-version."resolve"."1.0.0"; - by-version."resolve"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "resolve-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; - name = "resolve-1.0.0.tgz"; - sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; - }) - ]; - buildInputs = - (self.nativeDeps."resolve" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "resolve" ]; - }; by-spec."response-time"."1.0.0" = self.by-version."response-time"."1.0.0"; by-version."response-time"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -24204,7 +24674,7 @@ buildInputs = (self.nativeDeps."rethinkdb" or []); deps = { - "bluebird-2.3.11" = self.by-version."bluebird"."2.3.11"; + "bluebird-2.4.0" = self.by-version."bluebird"."2.4.0"; }; peerDependencies = [ ]; @@ -24438,6 +24908,26 @@ ]; passthru.names = [ "ruglify" ]; }; + by-spec."run-applescript"."^1.0.0" = + self.by-version."run-applescript"."1.0.1"; + by-version."run-applescript"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "run-applescript-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/run-applescript/-/run-applescript-1.0.1.tgz"; + name = "run-applescript-1.0.1.tgz"; + sha1 = "9f0be74a910dcea702caba65f747563706e86fe2"; + }) + ]; + buildInputs = + (self.nativeDeps."run-applescript" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "run-applescript" ]; + }; by-spec."run-parallel"."^1.0.0" = self.by-version."run-parallel"."1.0.0"; by-version."run-parallel"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -24458,6 +24948,26 @@ ]; passthru.names = [ "run-parallel" ]; }; + by-spec."run-series"."^1.0.2" = + self.by-version."run-series"."1.0.2"; + by-version."run-series"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "run-series-1.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/run-series/-/run-series-1.0.2.tgz"; + name = "run-series-1.0.2.tgz"; + sha1 = "63d0d361b9aa2509c85bd790810a8bd9d302bc8e"; + }) + ]; + buildInputs = + (self.nativeDeps."run-series" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "run-series" ]; + }; by-spec."rusha-browserify"."^0.7.3" = self.by-version."rusha-browserify"."0.7.3"; by-version."rusha-browserify"."0.7.3" = lib.makeOverridable self.buildNodePackage { @@ -24479,15 +24989,15 @@ passthru.names = [ "rusha-browserify" ]; }; by-spec."rx"."^2.2.27" = - self.by-version."rx"."2.3.18"; - by-version."rx"."2.3.18" = lib.makeOverridable self.buildNodePackage { - name = "rx-2.3.18"; + self.by-version."rx"."2.3.22"; + by-version."rx"."2.3.22" = lib.makeOverridable self.buildNodePackage { + name = "rx-2.3.22"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/rx/-/rx-2.3.18.tgz"; - name = "rx-2.3.18.tgz"; - sha1 = "4ae726e3d770db47f070b532f9840c717b2385ba"; + url = "http://registry.npmjs.org/rx/-/rx-2.3.22.tgz"; + name = "rx-2.3.22.tgz"; + sha1 = "031fba769eaba0b74dbad2f0e7aeaed9b1b8199d"; }) ]; buildInputs = @@ -24528,15 +25038,15 @@ }; "s3http" = self.by-version."s3http"."0.0.5"; by-spec."samsam"."~1.1" = - self.by-version."samsam"."1.1.1"; - by-version."samsam"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "samsam-1.1.1"; + self.by-version."samsam"."1.1.2"; + by-version."samsam"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "samsam-1.1.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/samsam/-/samsam-1.1.1.tgz"; - name = "samsam-1.1.1.tgz"; - sha1 = "48d64ee2a7aecaaeccebe2f0a68a49687d3a49b1"; + url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"; + name = "samsam-1.1.2.tgz"; + sha1 = "bec11fdc83a9fda063401210e40176c3024d1567"; }) ]; buildInputs = @@ -24740,15 +25250,15 @@ }; "selenium-webdriver" = self.by-version."selenium-webdriver"."2.44.0"; by-spec."semver"."*" = - self.by-version."semver"."4.1.0"; - by-version."semver"."4.1.0" = lib.makeOverridable self.buildNodePackage { - name = "semver-4.1.0"; + self.by-version."semver"."4.1.1"; + by-version."semver"."4.1.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-4.1.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-4.1.0.tgz"; - name = "semver-4.1.0.tgz"; - sha1 = "bc80a9ff68532814362cc3cfda3c7b75ed9c321c"; + url = "http://registry.npmjs.org/semver/-/semver-4.1.1.tgz"; + name = "semver-4.1.1.tgz"; + sha1 = "8d63e2e90df847e626d48ae068cd65786b0ed3d3"; }) ]; buildInputs = @@ -24759,7 +25269,7 @@ ]; passthru.names = [ "semver" ]; }; - "semver" = self.by-version."semver"."4.1.0"; + "semver" = self.by-version."semver"."4.1.1"; by-spec."semver"."1.1.0" = self.by-version."semver"."1.1.0"; by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -24821,9 +25331,9 @@ passthru.names = [ "semver" ]; }; by-spec."semver"."2 >=2.2.1 || 3.x || 4" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; by-spec."semver"."2 || 3 || 4" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; by-spec."semver"."2.0.11" = self.by-version."semver"."2.0.11"; by-version."semver"."2.0.11" = lib.makeOverridable self.buildNodePackage { @@ -24844,16 +25354,34 @@ ]; passthru.names = [ "semver" ]; }; - by-spec."semver"."2.2.x" = - self.by-version."semver"."2.2.1"; - by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.2.1"; + by-spec."semver"."2.x" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."2.x || 3.x || 4" = + self.by-version."semver"."4.1.1"; + by-spec."semver"."4" = + self.by-version."semver"."4.1.1"; + by-spec."semver"."4.1.x" = + self.by-version."semver"."4.1.1"; + by-spec."semver".">=2.0.10 <3.0.0" = + self.by-version."semver"."2.3.2"; + by-spec."semver".">=2.2.1 <3" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."^2.2.1" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."^2.3.0" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."^2.3.0 || 3.x || 4" = + self.by-version."semver"."4.1.1"; + by-spec."semver"."^3.0.1" = + self.by-version."semver"."3.0.1"; + by-version."semver"."3.0.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-3.0.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; - name = "semver-2.2.1.tgz"; - sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; + url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz"; + name = "semver-3.0.1.tgz"; + sha1 = "720ac012515a252f91fb0dd2e99a56a70d6cf078"; }) ]; buildInputs = @@ -24864,24 +25392,10 @@ ]; passthru.names = [ "semver" ]; }; - by-spec."semver"."2.x" = - self.by-version."semver"."2.3.2"; - by-spec."semver"."2.x || 3.x || 4" = - self.by-version."semver"."4.1.0"; - by-spec."semver"."4" = - self.by-version."semver"."4.1.0"; - by-spec."semver".">=2.0.10 <3.0.0" = - self.by-version."semver"."2.3.2"; - by-spec."semver".">=2.2.1 <3" = - self.by-version."semver"."2.3.2"; - by-spec."semver"."^2.2.1" = - self.by-version."semver"."2.3.2"; - by-spec."semver"."^2.3.0" = - self.by-version."semver"."2.3.2"; - by-spec."semver"."^2.3.0 || 3.x || 4" = - self.by-version."semver"."4.1.0"; + by-spec."semver"."^4.0.0" = + self.by-version."semver"."4.1.1"; by-spec."semver"."^4.1.0" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; by-spec."semver"."~1.1.4" = self.by-version."semver"."1.1.4"; by-spec."semver"."~2.0.5" = @@ -24912,10 +25426,30 @@ self.by-version."semver"."2.1.0"; by-spec."semver"."~2.2.1" = self.by-version."semver"."2.2.1"; + by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.2.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; + name = "semver-2.2.1.tgz"; + sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; + }) + ]; + buildInputs = + (self.nativeDeps."semver" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "semver" ]; + }; by-spec."semver"."~2.3.0" = self.by-version."semver"."2.3.2"; by-spec."semver"."~4.1.0" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; + by-spec."semver"."~4.1.1" = + self.by-version."semver"."4.1.1"; by-spec."semver-diff"."^0.1.0" = self.by-version."semver-diff"."0.1.0"; by-version."semver-diff"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -24937,6 +25471,27 @@ ]; passthru.names = [ "semver-diff" ]; }; + by-spec."semver-diff"."^2.0.0" = + self.by-version."semver-diff"."2.0.0"; + by-version."semver-diff"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "semver-diff-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/semver-diff/-/semver-diff-2.0.0.tgz"; + name = "semver-diff-2.0.0.tgz"; + sha1 = "d43024f91aa7843937dc1379002766809f7480d2"; + }) + ]; + buildInputs = + (self.nativeDeps."semver-diff" or []); + deps = { + "semver-4.1.1" = self.by-version."semver"."4.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "semver-diff" ]; + }; by-spec."send"."*" = self.by-version."send"."0.10.1"; by-version."send"."0.10.1" = lib.makeOverridable self.buildNodePackage { @@ -25041,30 +25596,6 @@ }; by-spec."send"."0.10.1" = self.by-version."send"."0.10.1"; - by-spec."send"."0.2.0" = - self.by-version."send"."0.2.0"; - by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "send-0.2.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz"; - name = "send-0.2.0.tgz"; - sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58"; - }) - ]; - buildInputs = - (self.nativeDeps."send" or []); - deps = { - "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "send" ]; - }; by-spec."send"."0.3.0" = self.by-version."send"."0.3.0"; by-version."send"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -25162,6 +25693,30 @@ ]; passthru.names = [ "sequencify" ]; }; + by-spec."serve-favicon"."^2.1.1" = + self.by-version."serve-favicon"."2.2.0"; + by-version."serve-favicon"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "serve-favicon-2.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz"; + name = "serve-favicon-2.2.0.tgz"; + sha1 = "a0c25ee8a652e1a638a67db46269cd52a8705858"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-favicon" or []); + deps = { + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "serve-favicon" ]; + }; by-spec."serve-favicon"."~2.1.5" = self.by-version."serve-favicon"."2.1.7"; by-version."serve-favicon"."2.1.7" = lib.makeOverridable self.buildNodePackage { @@ -25224,7 +25779,7 @@ buildInputs = (self.nativeDeps."serve-index" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "batch-0.5.1" = self.by-version."batch"."0.5.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; @@ -25233,53 +25788,32 @@ ]; passthru.names = [ "serve-index" ]; }; - by-spec."serve-index"."~1.5.1" = - self.by-version."serve-index"."1.5.1"; - by-version."serve-index"."1.5.1" = lib.makeOverridable self.buildNodePackage { - name = "serve-index-1.5.1"; + by-spec."serve-index"."~1.5.3" = + self.by-version."serve-index"."1.5.3"; + by-version."serve-index"."1.5.3" = lib.makeOverridable self.buildNodePackage { + name = "serve-index-1.5.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-index/-/serve-index-1.5.1.tgz"; - name = "serve-index-1.5.1.tgz"; - sha1 = "11e2cec8b7cdc801a8a766ebf36c1372c956e84a"; + url = "http://registry.npmjs.org/serve-index/-/serve-index-1.5.3.tgz"; + name = "serve-index-1.5.3.tgz"; + sha1 = "412cbc82bf6e2b97ba3247166cd1f425404e75e7"; }) ]; buildInputs = (self.nativeDeps."serve-index" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "batch-0.5.1" = self.by-version."batch"."0.5.1"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; - "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; }; peerDependencies = [ ]; passthru.names = [ "serve-index" ]; }; - by-spec."serve-static"."1.0.1" = - self.by-version."serve-static"."1.0.1"; - by-version."serve-static"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "serve-static-1.0.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.1.tgz"; - name = "serve-static-1.0.1.tgz"; - sha1 = "10dcbfd44b3e0291a131fc9ab4ab25a9f5a78a42"; - }) - ]; - buildInputs = - (self.nativeDeps."serve-static" or []); - deps = { - "send-0.1.4" = self.by-version."send"."0.1.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "serve-static" ]; - }; by-spec."serve-static"."1.1.0" = self.by-version."serve-static"."1.1.0"; by-version."serve-static"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -25370,6 +25904,26 @@ ]; passthru.names = [ "setimmediate" ]; }; + by-spec."setimmediate"."^1.0.2" = + self.by-version."setimmediate"."1.0.2"; + by-version."setimmediate"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "setimmediate-1.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"; + name = "setimmediate-1.0.2.tgz"; + sha1 = "d8221c4fdfeb2561556c5184fa05fb7ce0af73bd"; + }) + ]; + buildInputs = + (self.nativeDeps."setimmediate" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "setimmediate" ]; + }; by-spec."sha"."~1.0.1" = self.by-version."sha"."1.0.1"; by-version."sha"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -25391,28 +25945,6 @@ ]; passthru.names = [ "sha" ]; }; - by-spec."sha"."~1.2.1" = - self.by-version."sha"."1.2.4"; - by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage { - name = "sha-1.2.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz"; - name = "sha-1.2.4.tgz"; - sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d"; - }) - ]; - buildInputs = - (self.nativeDeps."sha" or []); - deps = { - "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; - "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - }; - peerDependencies = [ - ]; - passthru.names = [ "sha" ]; - }; by-spec."sha"."~1.3.0" = self.by-version."sha"."1.3.0"; by-version."sha"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -25566,80 +26098,80 @@ by-spec."shelljs"."0.3.x" = self.by-version."shelljs"."0.3.0"; by-spec."should"."*" = - self.by-version."should"."4.3.0"; - by-version."should"."4.3.0" = lib.makeOverridable self.buildNodePackage { - name = "should-4.3.0"; + self.by-version."should"."4.4.1"; + by-version."should"."4.4.1" = lib.makeOverridable self.buildNodePackage { + name = "should-4.4.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-4.3.0.tgz"; - name = "should-4.3.0.tgz"; - sha1 = "6fd50fadf9b54134a352f2fd74657b1e97231ad6"; + url = "http://registry.npmjs.org/should/-/should-4.4.1.tgz"; + name = "should-4.4.1.tgz"; + sha1 = "15063e66f23797046bd5e478bade00adb4b6b37b"; }) ]; buildInputs = (self.nativeDeps."should" or []); deps = { - "should-equal-0.1.0" = self.by-version."should-equal"."0.1.0"; - "should-format-0.0.2" = self.by-version."should-format"."0.0.2"; + "should-equal-0.2.3" = self.by-version."should-equal"."0.2.3"; + "should-format-0.0.5" = self.by-version."should-format"."0.0.5"; }; peerDependencies = [ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."4.3.0"; - by-spec."should-equal"."0.1.0" = - self.by-version."should-equal"."0.1.0"; - by-version."should-equal"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "should-equal-0.1.0"; + "should" = self.by-version."should"."4.4.1"; + by-spec."should-equal"."0.2.3" = + self.by-version."should-equal"."0.2.3"; + by-version."should-equal"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "should-equal-0.2.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should-equal/-/should-equal-0.1.0.tgz"; - name = "should-equal-0.1.0.tgz"; - sha1 = "6db4a398a0d5a1a5806350b1de8cb4e964071dab"; + url = "http://registry.npmjs.org/should-equal/-/should-equal-0.2.3.tgz"; + name = "should-equal-0.2.3.tgz"; + sha1 = "d14c3336ebeeb6ff3c13a5a646fa1f2c39957ed9"; }) ]; buildInputs = (self.nativeDeps."should-equal" or []); deps = { - "should-type-0.0.1" = self.by-version."should-type"."0.0.1"; + "should-type-0.0.3" = self.by-version."should-type"."0.0.3"; }; peerDependencies = [ ]; passthru.names = [ "should-equal" ]; }; - by-spec."should-format"."0.0.2" = - self.by-version."should-format"."0.0.2"; - by-version."should-format"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "should-format-0.0.2"; + by-spec."should-format"."0.0.5" = + self.by-version."should-format"."0.0.5"; + by-version."should-format"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "should-format-0.0.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should-format/-/should-format-0.0.2.tgz"; - name = "should-format-0.0.2.tgz"; - sha1 = "5c058691a1d6177f8b8fa8b8bba0b38cc05d346f"; + url = "http://registry.npmjs.org/should-format/-/should-format-0.0.5.tgz"; + name = "should-format-0.0.5.tgz"; + sha1 = "77f4f9546495632310aae14adfec82416e18d0d9"; }) ]; buildInputs = (self.nativeDeps."should-format" or []); deps = { - "should-type-0.0.1" = self.by-version."should-type"."0.0.1"; + "should-type-0.0.3" = self.by-version."should-type"."0.0.3"; }; peerDependencies = [ ]; passthru.names = [ "should-format" ]; }; - by-spec."should-type"."0.0.1" = - self.by-version."should-type"."0.0.1"; - by-version."should-type"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "should-type-0.0.1"; + by-spec."should-type"."0.0.3" = + self.by-version."should-type"."0.0.3"; + by-version."should-type"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "should-type-0.0.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should-type/-/should-type-0.0.1.tgz"; - name = "should-type-0.0.1.tgz"; - sha1 = "ec62a4eae75cabfab3734cd9925da49773cb9be8"; + url = "http://registry.npmjs.org/should-type/-/should-type-0.0.3.tgz"; + name = "should-type-0.0.3.tgz"; + sha1 = "de19d7ea791ce02a191cffcc168bf3691c9e7680"; }) ]; buildInputs = @@ -25737,15 +26269,15 @@ passthru.names = [ "simplesmtp" ]; }; by-spec."sinon"."*" = - self.by-version."sinon"."1.12.1"; - by-version."sinon"."1.12.1" = lib.makeOverridable self.buildNodePackage { - name = "sinon-1.12.1"; + self.by-version."sinon"."1.12.2"; + by-version."sinon"."1.12.2" = lib.makeOverridable self.buildNodePackage { + name = "sinon-1.12.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sinon/-/sinon-1.12.1.tgz"; - name = "sinon-1.12.1.tgz"; - sha1 = "c51a7d083e9992854bb99519faf5c25c9a04009a"; + url = "http://registry.npmjs.org/sinon/-/sinon-1.12.2.tgz"; + name = "sinon-1.12.2.tgz"; + sha1 = "dd893d1f93bfa652ae7c2a08c6eaa42898452c94"; }) ]; buildInputs = @@ -25759,7 +26291,7 @@ ]; passthru.names = [ "sinon" ]; }; - "sinon" = self.by-version."sinon"."1.12.1"; + "sinon" = self.by-version."sinon"."1.12.2"; by-spec."slasp"."*" = self.by-version."slasp"."0.0.4"; by-version."slasp"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -25869,35 +26401,33 @@ self.by-version."slide"."1.1.6"; by-spec."slide"."~1.1.4" = self.by-version."slide"."1.1.6"; - by-spec."slide"."~1.1.5" = - self.by-version."slide"."1.1.6"; by-spec."slide"."~1.1.6" = self.by-version."slide"."1.1.6"; by-spec."sloc"."*" = - self.by-version."sloc"."0.1.7"; - by-version."sloc"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "sloc-0.1.7"; + self.by-version."sloc"."0.1.9"; + by-version."sloc"."0.1.9" = lib.makeOverridable self.buildNodePackage { + name = "sloc-0.1.9"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/sloc/-/sloc-0.1.7.tgz"; - name = "sloc-0.1.7.tgz"; - sha1 = "57dee8c946d54cea5188b70cd6549a22e0615679"; + url = "http://registry.npmjs.org/sloc/-/sloc-0.1.9.tgz"; + name = "sloc-0.1.9.tgz"; + sha1 = "af12b4f713d079c65056435fe67ff11580770873"; }) ]; buildInputs = (self.nativeDeps."sloc" or []); deps = { - "commander-2.3.0" = self.by-version."commander"."2.3.0"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; "async-0.9.0" = self.by-version."async"."0.9.0"; "cli-table-0.3.1" = self.by-version."cli-table"."0.3.1"; - "readdirp-1.1.0" = self.by-version."readdirp"."1.1.0"; + "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0"; }; peerDependencies = [ ]; passthru.names = [ "sloc" ]; }; - "sloc" = self.by-version."sloc"."0.1.7"; + "sloc" = self.by-version."sloc"."0.1.9"; by-spec."smartdc"."*" = self.by-version."smartdc"."7.3.0"; by-version."smartdc"."7.3.0" = lib.makeOverridable self.buildNodePackage { @@ -26112,7 +26642,7 @@ (self.nativeDeps."sockjs" or []); deps = { "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; }; peerDependencies = [ ]; @@ -26140,15 +26670,15 @@ passthru.names = [ "sorted-object" ]; }; by-spec."source-map"."*" = - self.by-version."source-map"."0.1.40"; - by-version."source-map"."0.1.40" = lib.makeOverridable self.buildNodePackage { - name = "source-map-0.1.40"; + self.by-version."source-map"."0.1.41"; + by-version."source-map"."0.1.41" = lib.makeOverridable self.buildNodePackage { + name = "source-map-0.1.41"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.40.tgz"; - name = "source-map-0.1.40.tgz"; - sha1 = "7e0ee49ec0452aa9ac2b93ad5ae54ef33e82b37f"; + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.41.tgz"; + name = "source-map-0.1.41.tgz"; + sha1 = "d6cc9c8a9bb5d995dc69b38457bd4b1747327f5a"; }) ]; buildInputs = @@ -26160,7 +26690,7 @@ ]; passthru.names = [ "source-map" ]; }; - "source-map" = self.by-version."source-map"."0.1.40"; + "source-map" = self.by-version."source-map"."0.1.41"; by-spec."source-map"."0.1.31" = self.by-version."source-map"."0.1.31"; by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage { @@ -26204,21 +26734,21 @@ passthru.names = [ "source-map" ]; }; by-spec."source-map"."0.1.x" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map".">= 0.1.2" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."^0.1.x" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.30" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.31" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.33" = - self.by-version."source-map"."0.1.40"; - by-spec."source-map"."~0.1.37" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; + by-spec."source-map"."~0.1.40" = + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.7" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."spdy"."1.7.1" = self.by-version."spdy"."1.7.1"; by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage { @@ -26260,15 +26790,15 @@ passthru.names = [ "speedometer" ]; }; by-spec."sprintf"."~0.1.2" = - self.by-version."sprintf"."0.1.4"; - by-version."sprintf"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "sprintf-0.1.4"; + self.by-version."sprintf"."0.1.5"; + by-version."sprintf"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "sprintf-0.1.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.4.tgz"; - name = "sprintf-0.1.4.tgz"; - sha1 = "6f870a8f4aae1c7fe53eee02b6ca31aa2d78863b"; + url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; + name = "sprintf-0.1.5.tgz"; + sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; }) ]; buildInputs = @@ -26280,9 +26810,9 @@ passthru.names = [ "sprintf" ]; }; by-spec."sprintf"."~0.1.3" = - self.by-version."sprintf"."0.1.4"; + self.by-version."sprintf"."0.1.5"; by-spec."sprintf"."~0.1.4" = - self.by-version."sprintf"."0.1.4"; + self.by-version."sprintf"."0.1.5"; by-spec."ssh-agent"."0.2.1" = self.by-version."ssh-agent"."0.2.1"; by-version."ssh-agent"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -26709,16 +27239,37 @@ ]; passthru.names = [ "string-length" ]; }; - by-spec."string2compact"."^1.1.1" = - self.by-version."string2compact"."1.2.0"; - by-version."string2compact"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "string2compact-1.2.0"; + by-spec."string-length"."^1.0.0" = + self.by-version."string-length"."1.0.0"; + by-version."string-length"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "string-length-1.0.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.0.tgz"; - name = "string2compact-1.2.0.tgz"; - sha1 = "ecf1fcd84c9f8fc0562f818b06422f60f588b01e"; + url = "http://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz"; + name = "string-length-1.0.0.tgz"; + sha1 = "5f0564b174feb299595a763da71513266370d3a9"; + }) + ]; + buildInputs = + (self.nativeDeps."string-length" or []); + deps = { + "strip-ansi-2.0.0" = self.by-version."strip-ansi"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "string-length" ]; + }; + by-spec."string2compact"."^1.1.1" = + self.by-version."string2compact"."1.2.1"; + by-version."string2compact"."1.2.1" = lib.makeOverridable self.buildNodePackage { + name = "string2compact-1.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.1.tgz"; + name = "string2compact-1.2.1.tgz"; + sha1 = "a560cd737415e380f2518b83c38bb97093e981af"; }) ]; buildInputs = @@ -26855,22 +27406,22 @@ ]; passthru.names = [ "strip-ansi" ]; }; - by-spec."strip-ansi"."^1.0.0" = - self.by-version."strip-ansi"."1.0.0"; - by-version."strip-ansi"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "strip-ansi-1.0.0"; + by-spec."strip-ansi"."^2.0.0" = + self.by-version."strip-ansi"."2.0.0"; + by-version."strip-ansi"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "strip-ansi-2.0.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz"; - name = "strip-ansi-1.0.0.tgz"; - sha1 = "6c021321d6ece161a3c608fbab268c7328901c73"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.0.tgz"; + name = "strip-ansi-2.0.0.tgz"; + sha1 = "fa8d69432e97674746f55f51d076ae78b18df13f"; }) ]; buildInputs = (self.nativeDeps."strip-ansi" or []); deps = { - "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; + "ansi-regex-1.1.0" = self.by-version."ansi-regex"."1.1.0"; }; peerDependencies = [ ]; @@ -26999,7 +27550,7 @@ "debug-2.1.0" = self.by-version."debug"."2.1.0"; "sax-0.5.8" = self.by-version."sax"."0.5.8"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -27421,8 +27972,8 @@ self.by-version."tar"."1.0.3"; by-spec."tar"."~0.1.17" = self.by-version."tar"."0.1.20"; - by-spec."tar"."~0.1.19" = - self.by-version."tar"."0.1.20"; + by-spec."tar"."~1.0.1" = + self.by-version."tar"."1.0.3"; by-spec."tar"."~1.0.3" = self.by-version."tar"."1.0.3"; by-spec."tar-fs"."0.5.2" = @@ -27448,6 +27999,35 @@ ]; passthru.names = [ "tar-fs" ]; }; + by-spec."tar-pack"."~2.0.0" = + self.by-version."tar-pack"."2.0.0"; + by-version."tar-pack"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "tar-pack-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz"; + name = "tar-pack-2.0.0.tgz"; + sha1 = "c2c401c02dd366138645e917b3a6baa256a9dcab"; + }) + ]; + buildInputs = + (self.nativeDeps."tar-pack" or []); + deps = { + "uid-number-0.0.3" = self.by-version."uid-number"."0.0.3"; + "once-1.1.1" = self.by-version."once"."1.1.1"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "tar-0.1.20" = self.by-version."tar"."0.1.20"; + "fstream-ignore-0.0.7" = self.by-version."fstream-ignore"."0.0.7"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tar-pack" ]; + }; by-spec."tar-stream"."^0.4.6" = self.by-version."tar-stream"."0.4.7"; by-version."tar-stream"."0.4.7" = lib.makeOverridable self.buildNodePackage { @@ -27564,6 +28144,48 @@ ]; passthru.names = [ "text-table" ]; }; + by-spec."thenify"."2" = + self.by-version."thenify"."2.0.0"; + by-version."thenify"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "thenify-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/thenify/-/thenify-2.0.0.tgz"; + name = "thenify-2.0.0.tgz"; + sha1 = "a1c6a07b4274787c412289d4f8679b545205f186"; + }) + ]; + buildInputs = + (self.nativeDeps."thenify" or []); + deps = { + "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "thenify" ]; + }; + by-spec."thenify-all"."1" = + self.by-version."thenify-all"."1.0.0"; + by-version."thenify-all"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "thenify-all-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/thenify-all/-/thenify-all-1.0.0.tgz"; + name = "thenify-all-1.0.0.tgz"; + sha1 = "3663df4aed595ff671467c0683cd74350b87e1cf"; + }) + ]; + buildInputs = + (self.nativeDeps."thenify-all" or []); + deps = { + "thenify-2.0.0" = self.by-version."thenify"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "thenify-all" ]; + }; by-spec."thirty-two"."~0.0.1" = self.by-version."thirty-two"."0.0.2"; by-version."thirty-two"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -27954,7 +28576,7 @@ "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "request-2.27.0" = self.by-version."request"."2.27.0"; "semver-2.2.1" = self.by-version."semver"."2.2.1"; - "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4"; + "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; "temp-0.6.0" = self.by-version."temp"."0.6.0"; "winston-0.6.2" = self.by-version."winston"."0.6.2"; "wrench-1.5.8" = self.by-version."wrench"."1.5.8"; @@ -28071,9 +28693,9 @@ deps = { "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0"; "bittorrent-dht-2.6.4" = self.by-version."bittorrent-dht"."2.6.4"; - "bittorrent-tracker-2.9.1" = self.by-version."bittorrent-tracker"."2.9.1"; + "bittorrent-tracker-2.10.0" = self.by-version."bittorrent-tracker"."2.10.0"; "bncode-0.5.3" = self.by-version."bncode"."0.5.3"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "ip-0.3.2" = self.by-version."ip"."0.3.2"; @@ -28107,9 +28729,9 @@ deps = { "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0"; "bittorrent-dht-1.5.0" = self.by-version."bittorrent-dht"."1.5.0"; - "bittorrent-tracker-2.9.1" = self.by-version."bittorrent-tracker"."2.9.1"; + "bittorrent-tracker-2.10.0" = self.by-version."bittorrent-tracker"."2.10.0"; "bncode-0.5.3" = self.by-version."bncode"."0.5.3"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "ip-0.3.2" = self.by-version."ip"."0.3.2"; @@ -28169,27 +28791,6 @@ }; by-spec."tough-cookie"."^0.12.1" = self.by-version."tough-cookie"."0.12.1"; - by-spec."tough-cookie"."~0.9.15" = - self.by-version."tough-cookie"."0.9.15"; - by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage { - name = "tough-cookie-0.9.15"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; - name = "tough-cookie-0.9.15.tgz"; - sha1 = "75617ac347e3659052b0350131885829677399f6"; - }) - ]; - buildInputs = - (self.nativeDeps."tough-cookie" or []); - deps = { - "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tough-cookie" ]; - }; by-spec."traceur"."0.0.55" = self.by-version."traceur"."0.0.55"; by-version."traceur"."0.0.55" = lib.makeOverridable self.buildNodePackage { @@ -28205,8 +28806,8 @@ buildInputs = (self.nativeDeps."traceur" or []); deps = { - "commander-2.5.0" = self.by-version."commander"."2.5.0"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; peerDependencies = [ @@ -28236,6 +28837,32 @@ ]; passthru.names = [ "transformers" ]; }; + by-spec."trash"."*" = + self.by-version."trash"."1.2.0"; + by-version."trash"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "trash-1.2.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/trash/-/trash-1.2.0.tgz"; + name = "trash-1.2.0.tgz"; + sha1 = "125a91e6a5c1608a1bc3d9f74b6310554c376619"; + }) + ]; + buildInputs = + (self.nativeDeps."trash" or []); + deps = { + "escape-string-applescript-1.0.0" = self.by-version."escape-string-applescript"."1.0.0"; + "meow-1.0.0" = self.by-version."meow"."1.0.0"; + "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1"; + "update-notifier-0.2.2" = self.by-version."update-notifier"."0.2.2"; + "xdg-trash-1.0.5" = self.by-version."xdg-trash"."1.0.5"; + }; + peerDependencies = [ + ]; + passthru.names = [ "trash" ]; + }; + "trash" = self.by-version."trash"."1.2.0"; by-spec."traverse".">=0.3.0 <0.4" = self.by-version."traverse"."0.3.9"; by-version."traverse"."0.3.9" = lib.makeOverridable self.buildNodePackage { @@ -28356,6 +28983,27 @@ ]; passthru.names = [ "tunnel-agent" ]; }; + by-spec."type-check"."~0.3.1" = + self.by-version."type-check"."0.3.1"; + by-version."type-check"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "type-check-0.3.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz"; + name = "type-check-0.3.1.tgz"; + sha1 = "9233923c4da174d0ac5480ecfd6ef84c349eb58d"; + }) + ]; + buildInputs = + (self.nativeDeps."type-check" or []); + deps = { + "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "type-check" ]; + }; by-spec."type-detect"."0.1.1" = self.by-version."type-detect"."0.1.1"; by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -28376,53 +29024,34 @@ ]; passthru.names = [ "type-detect" ]; }; - by-spec."type-is"."1.0.0" = - self.by-version."type-is"."1.0.0"; - by-version."type-is"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "type-is-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.0.0.tgz"; - name = "type-is-1.0.0.tgz"; - sha1 = "4ff424e97349a1ee1910b4bfc488595ecdc443fc"; - }) - ]; - buildInputs = - (self.nativeDeps."type-is" or []); - deps = { - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - }; - peerDependencies = [ - ]; - passthru.names = [ "type-is" ]; - }; by-spec."type-is"."~1.5.1" = - self.by-version."type-is"."1.5.3"; - by-version."type-is"."1.5.3" = lib.makeOverridable self.buildNodePackage { - name = "type-is-1.5.3"; + self.by-version."type-is"."1.5.4"; + by-version."type-is"."1.5.4" = lib.makeOverridable self.buildNodePackage { + name = "type-is-1.5.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.3.tgz"; - name = "type-is-1.5.3.tgz"; - sha1 = "b7fb92d0abc628393f10dd260932cca65fe9ff68"; + url = "http://registry.npmjs.org/type-is/-/type-is-1.5.4.tgz"; + name = "type-is-1.5.4.tgz"; + sha1 = "f2afe8635dcf2d159096202be6e120423fa19837"; }) ]; buildInputs = (self.nativeDeps."type-is" or []); deps = { "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; }; peerDependencies = [ ]; passthru.names = [ "type-is" ]; }; by-spec."type-is"."~1.5.2" = - self.by-version."type-is"."1.5.3"; + self.by-version."type-is"."1.5.4"; by-spec."type-is"."~1.5.3" = - self.by-version."type-is"."1.5.3"; + self.by-version."type-is"."1.5.4"; + by-spec."type-is"."~1.5.4" = + self.by-version."type-is"."1.5.4"; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { @@ -28485,15 +29114,15 @@ }; "typescript" = self.by-version."typescript"."1.3.0"; by-spec."uglify-js"."*" = - self.by-version."uglify-js"."2.4.15"; - by-version."uglify-js"."2.4.15" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.15"; + self.by-version."uglify-js"."2.4.16"; + by-version."uglify-js"."2.4.16" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.16"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz"; - name = "uglify-js-2.4.15.tgz"; - sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz"; + name = "uglify-js-2.4.16.tgz"; + sha1 = "84143487eb480efd7d0789c7ecfbd48a695839f9"; }) ]; buildInputs = @@ -28508,7 +29137,7 @@ ]; passthru.names = [ "uglify-js" ]; }; - "uglify-js" = self.by-version."uglify-js"."2.4.15"; + "uglify-js" = self.by-version."uglify-js"."2.4.16"; by-spec."uglify-js"."1.2.5" = self.by-version."uglify-js"."1.2.5"; by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage { @@ -28545,7 +29174,7 @@ (self.nativeDeps."uglify-js" or []); deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2"; }; @@ -28555,8 +29184,30 @@ }; by-spec."uglify-js"."2.4.15" = self.by-version."uglify-js"."2.4.15"; + by-version."uglify-js"."2.4.15" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.15"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz"; + name = "uglify-js-2.4.15.tgz"; + sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; + }) + ]; + buildInputs = + (self.nativeDeps."uglify-js" or []); + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "source-map-0.1.34" = self.by-version."source-map"."0.1.34"; + "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "uglify-js" ]; + }; by-spec."uglify-js"."^2.4.0" = - self.by-version."uglify-js"."2.4.15"; + self.by-version."uglify-js"."2.4.16"; by-spec."uglify-js"."~2.2" = self.by-version."uglify-js"."2.2.5"; by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage { @@ -28572,7 +29223,7 @@ buildInputs = (self.nativeDeps."uglify-js" or []); deps = { - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; }; peerDependencies = [ @@ -28597,7 +29248,7 @@ (self.nativeDeps."uglify-js" or []); deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; }; peerDependencies = [ @@ -28607,7 +29258,7 @@ by-spec."uglify-js"."~2.3.6" = self.by-version."uglify-js"."2.3.6"; by-spec."uglify-js"."~2.4.0" = - self.by-version."uglify-js"."2.4.15"; + self.by-version."uglify-js"."2.4.16"; by-spec."uglify-to-browserify"."~1.0.0" = self.by-version."uglify-to-browserify"."1.0.2"; by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -28648,6 +29299,26 @@ ]; passthru.names = [ "uid-number" ]; }; + by-spec."uid-number"."0.0.3" = + self.by-version."uid-number"."0.0.3"; + by-version."uid-number"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "uid-number-0.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; + name = "uid-number-0.0.3.tgz"; + sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc"; + }) + ]; + buildInputs = + (self.nativeDeps."uid-number" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "uid-number" ]; + }; by-spec."uid-number"."0.0.5" = self.by-version."uid-number"."0.0.5"; by-version."uid-number"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -28685,7 +29356,7 @@ buildInputs = (self.nativeDeps."uid-safe" or []); deps = { - "mz-1.1.0" = self.by-version."mz"."1.1.0"; + "mz-1.2.0" = self.by-version."mz"."1.2.0"; "base64-url-1.0.0" = self.by-version."base64-url"."1.0.0"; }; peerDependencies = [ @@ -28734,7 +29405,7 @@ "rfile-1.0.0" = self.by-version."rfile"."1.0.0"; "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0"; "through-2.3.6" = self.by-version."through"."2.3.6"; - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; peerDependencies = [ ]; @@ -28758,7 +29429,7 @@ "rfile-1.0.0" = self.by-version."rfile"."1.0.0"; "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0"; "through-2.3.6" = self.by-version."through"."2.3.6"; - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; peerDependencies = [ ]; @@ -28835,6 +29506,8 @@ self.by-version."underscore"."1.7.0"; by-spec."underscore".">=1.5.0" = self.by-version."underscore"."1.7.0"; + by-spec."underscore"."^1.6.0" = + self.by-version."underscore"."1.7.0"; by-spec."underscore"."~1.4.3" = self.by-version."underscore"."1.4.4"; by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { @@ -28877,6 +29550,8 @@ ]; passthru.names = [ "underscore" ]; }; + by-spec."underscore"."~1.7.0" = + self.by-version."underscore"."1.7.0"; by-spec."underscore.string"."~2.2.1" = self.by-version."underscore.string"."2.2.1"; by-version."underscore.string"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -28919,6 +29594,26 @@ }; by-spec."underscore.string"."~2.3.3" = self.by-version."underscore.string"."2.3.3"; + by-spec."underscore.string"."~2.4.0" = + self.by-version."underscore.string"."2.4.0"; + by-version."underscore.string"."2.4.0" = lib.makeOverridable self.buildNodePackage { + name = "underscore.string-2.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; + name = "underscore.string-2.4.0.tgz"; + sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore.string" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "underscore.string" ]; + }; by-spec."unfunk-diff"."~0.0.1" = self.by-version."unfunk-diff"."0.0.2"; by-version."unfunk-diff"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -28957,7 +29652,7 @@ buildInputs = (self.nativeDeps."ungit" or []); deps = { - "express-4.10.4" = self.by-version."express"."4.10.4"; + "express-4.10.6" = self.by-version."express"."4.10.6"; "superagent-0.21.0" = self.by-version."superagent"."0.21.0"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; @@ -28969,7 +29664,7 @@ "winston-0.8.3" = self.by-version."winston"."0.8.3"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-local-1.0.0" = self.by-version."passport-local"."1.0.0"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "forever-monitor-1.1.0" = self.by-version."forever-monitor"."1.1.0"; "open-0.0.5" = self.by-version."open"."0.0.5"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; @@ -28983,12 +29678,12 @@ "deep-extend-0.3.2" = self.by-version."deep-extend"."0.3.2"; "raven-0.7.2" = self.by-version."raven"."0.7.2"; "knockout-3.2.0" = self.by-version."knockout"."3.2.0"; - "npm-registry-client-4.0.4" = self.by-version."npm-registry-client"."4.0.4"; + "npm-registry-client-4.0.5" = self.by-version."npm-registry-client"."4.0.5"; "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "body-parser-1.9.3" = self.by-version."body-parser"."1.9.3"; "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; - "express-session-1.9.2" = self.by-version."express-session"."1.9.2"; + "express-session-1.9.3" = self.by-version."express-session"."1.9.3"; "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; }; peerDependencies = [ @@ -29061,6 +29756,34 @@ ]; passthru.names = [ "update-notifier" ]; }; + by-spec."update-notifier"."^0.2.0" = + self.by-version."update-notifier"."0.2.2"; + by-version."update-notifier"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "update-notifier-0.2.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz"; + name = "update-notifier-0.2.2.tgz"; + sha1 = "e69b3a784b4e686a2acd98f5e66944591996e187"; + }) + ]; + buildInputs = + (self.nativeDeps."update-notifier" or []); + deps = { + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; + "is-npm-1.0.0" = self.by-version."is-npm"."1.0.0"; + "latest-version-1.0.0" = self.by-version."latest-version"."1.0.0"; + "semver-diff-2.0.0" = self.by-version."semver-diff"."2.0.0"; + "string-length-1.0.0" = self.by-version."string-length"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "update-notifier" ]; + }; + by-spec."update-notifier"."^0.2.1" = + self.by-version."update-notifier"."0.2.2"; by-spec."update-notifier"."~0.1.8" = self.by-version."update-notifier"."0.1.10"; by-version."update-notifier"."0.1.10" = lib.makeOverridable self.buildNodePackage { @@ -29078,7 +29801,7 @@ deps = { "chalk-0.4.0" = self.by-version."chalk"."0.4.0"; "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; peerDependencies = [ @@ -29351,6 +30074,26 @@ ]; passthru.names = [ "utils-merge" ]; }; + by-spec."uuid"."^2.0.1" = + self.by-version."uuid"."2.0.1"; + by-version."uuid"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "uuid-2.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; + name = "uuid-2.0.1.tgz"; + sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; + }) + ]; + buildInputs = + (self.nativeDeps."uuid" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "uuid" ]; + }; by-spec."uuid"."~1.4.1" = self.by-version."uuid"."1.4.2"; by-version."uuid"."1.4.2" = lib.makeOverridable self.buildNodePackage { @@ -29373,34 +30116,60 @@ }; by-spec."uuid"."~2.0.1" = self.by-version."uuid"."2.0.1"; - by-version."uuid"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "uuid-2.0.1"; + by-spec."v8-debug"."~0.3.0" = + self.by-version."v8-debug"."0.3.1"; + by-version."v8-debug"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "v8-debug-0.3.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; - name = "uuid-2.0.1.tgz"; - sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; + url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.3.1.tgz"; + name = "v8-debug-0.3.1.tgz"; + sha1 = "a2a552db05515246e480a97184a9eaa0cfc20e6b"; }) ]; buildInputs = - (self.nativeDeps."uuid" or []); + (self.nativeDeps."v8-debug" or []); deps = { + "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31"; + "nan-1.2.0" = self.by-version."nan"."1.2.0"; }; peerDependencies = [ ]; - passthru.names = [ "uuid" ]; + passthru.names = [ "v8-debug" ]; }; - by-spec."v8flags"."^1.0.1" = - self.by-version."v8flags"."1.0.5"; - by-version."v8flags"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "v8flags-1.0.5"; + by-spec."v8-profiler"."~5.2.0" = + self.by-version."v8-profiler"."5.2.1"; + by-version."v8-profiler"."5.2.1" = lib.makeOverridable self.buildNodePackage { + name = "v8-profiler-5.2.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/v8flags/-/v8flags-1.0.5.tgz"; - name = "v8flags-1.0.5.tgz"; - sha1 = "d352362031d3286bcd906da45fe27a3b760e38e5"; + url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.1.tgz"; + name = "v8-profiler-5.2.1.tgz"; + sha1 = "674acc65ebac9c914d578180c8713791386c23e7"; + }) + ]; + buildInputs = + (self.nativeDeps."v8-profiler" or []); + deps = { + "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31"; + "nan-1.2.0" = self.by-version."nan"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "v8-profiler" ]; + }; + by-spec."v8flags"."^1.0.1" = + self.by-version."v8flags"."1.0.6"; + by-version."v8flags"."1.0.6" = lib.makeOverridable self.buildNodePackage { + name = "v8flags-1.0.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/v8flags/-/v8flags-1.0.6.tgz"; + name = "v8flags-1.0.6.tgz"; + sha1 = "dc6b3d3347fabd196fad52b996059168918241b1"; }) ]; buildInputs = @@ -29661,21 +30430,21 @@ passthru.names = [ "vinyl" ]; }; by-spec."vinyl"."^0.4.0" = - self.by-version."vinyl"."0.4.5"; - by-version."vinyl"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "vinyl-0.4.5"; + self.by-version."vinyl"."0.4.6"; + by-version."vinyl"."0.4.6" = lib.makeOverridable self.buildNodePackage { + name = "vinyl-0.4.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.5.tgz"; - name = "vinyl-0.4.5.tgz"; - sha1 = "b1015e63bbd350d5f90e6c26b3a2e628294da8e0"; + url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; + name = "vinyl-0.4.6.tgz"; + sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; }) ]; buildInputs = (self.nativeDeps."vinyl" or []); deps = { - "clone-0.1.18" = self.by-version."clone"."0.1.18"; + "clone-0.2.0" = self.by-version."clone"."0.2.0"; "clone-stats-0.0.1" = self.by-version."clone-stats"."0.0.1"; }; peerDependencies = [ @@ -29698,13 +30467,13 @@ (self.nativeDeps."vinyl-fs" or []); deps = { "defaults-1.0.0" = self.by-version."defaults"."1.0.0"; - "glob-stream-3.1.17" = self.by-version."glob-stream"."3.1.17"; + "glob-stream-3.1.18" = self.by-version."glob-stream"."3.1.18"; "glob-watcher-0.0.6" = self.by-version."glob-watcher"."0.0.6"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "strip-bom-1.0.0" = self.by-version."strip-bom"."1.0.0"; "through2-0.6.3" = self.by-version."through2"."0.6.3"; - "vinyl-0.4.5" = self.by-version."vinyl"."0.4.5"; + "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6"; }; peerDependencies = [ ]; @@ -29754,23 +30523,23 @@ passthru.names = [ "void-elements" ]; }; by-spec."vows".">=0.5.13" = - self.by-version."vows"."0.8.1"; - by-version."vows"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "vows-0.8.1"; + self.by-version."vows"."0.9.0-rc1"; + by-version."vows"."0.9.0-rc1" = lib.makeOverridable self.buildNodePackage { + name = "vows-0.9.0-rc1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/vows/-/vows-0.8.1.tgz"; - name = "vows-0.8.1.tgz"; - sha1 = "e09e988ce594ca05a08d72abcca34e88db559131"; + url = "http://registry.npmjs.org/vows/-/vows-0.9.0-rc1.tgz"; + name = "vows-0.9.0-rc1.tgz"; + sha1 = "601cb87d69556bf9c7ce8cad36cbc2c98781921f"; }) ]; buildInputs = (self.nativeDeps."vows" or []); deps = { "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "diff-1.0.8" = self.by-version."diff"."1.0.8"; - "glob-4.0.6" = self.by-version."glob"."4.0.6"; + "diff-1.2.0" = self.by-version."diff"."1.2.0"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; }; peerDependencies = [ ]; @@ -29957,27 +30726,50 @@ }; "webdrvr" = self.by-version."webdrvr"."2.43.0-0"; by-spec."websocket-driver".">=0.3.6" = - self.by-version."websocket-driver"."0.4.0"; - by-version."websocket-driver"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "websocket-driver-0.4.0"; + self.by-version."websocket-driver"."0.5.1"; + by-version."websocket-driver"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "websocket-driver-0.5.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.4.0.tgz"; - name = "websocket-driver-0.4.0.tgz"; - sha1 = "71fa992e5d41c2cc5e290420687d0601efd06b7a"; + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.1.tgz"; + name = "websocket-driver-0.5.1.tgz"; + sha1 = "dd954c0a42a9962a31296f84cc465ca4b74c2611"; }) ]; buildInputs = (self.nativeDeps."websocket-driver" or []); deps = { + "websocket-extensions-0.1.0" = self.by-version."websocket-extensions"."0.1.0"; }; peerDependencies = [ ]; passthru.names = [ "websocket-driver" ]; }; by-spec."websocket-driver".">=0.4.0" = - self.by-version."websocket-driver"."0.4.0"; + self.by-version."websocket-driver"."0.5.1"; + by-spec."websocket-driver".">=0.5.1" = + self.by-version."websocket-driver"."0.5.1"; + by-spec."websocket-extensions".">=0.1.0" = + self.by-version."websocket-extensions"."0.1.0"; + by-version."websocket-extensions"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "websocket-extensions-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.0.tgz"; + name = "websocket-extensions-0.1.0.tgz"; + sha1 = "43567457158085e83ce7050f17ac6d988936320a"; + }) + ]; + buildInputs = + (self.nativeDeps."websocket-extensions" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "websocket-extensions" ]; + }; by-spec."when"."~3.4.6" = self.by-version."when"."3.4.6"; by-version."when"."3.4.6" = lib.makeOverridable self.buildNodePackage { @@ -29999,15 +30791,15 @@ passthru.names = [ "when" ]; }; by-spec."which"."1" = - self.by-version."which"."1.0.7"; - by-version."which"."1.0.7" = lib.makeOverridable self.buildNodePackage { - name = "which-1.0.7"; + self.by-version."which"."1.0.8"; + by-version."which"."1.0.8" = lib.makeOverridable self.buildNodePackage { + name = "which-1.0.8"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/which/-/which-1.0.7.tgz"; - name = "which-1.0.7.tgz"; - sha1 = "853133f40e5bd2783e51a06774959455cc8ee865"; + url = "http://registry.npmjs.org/which/-/which-1.0.8.tgz"; + name = "which-1.0.8.tgz"; + sha1 = "c2ff319534ac4a1fa45df2221b56c36279903ded"; }) ]; buildInputs = @@ -30019,11 +30811,13 @@ passthru.names = [ "which" ]; }; by-spec."which"."1.0.x" = - self.by-version."which"."1.0.7"; + self.by-version."which"."1.0.8"; + by-spec."which"."^1.0.5" = + self.by-version."which"."1.0.8"; by-spec."which"."~1.0.5" = - self.by-version."which"."1.0.7"; - by-spec."which"."~1.0.7" = - self.by-version."which"."1.0.7"; + self.by-version."which"."1.0.8"; + by-spec."which"."~1.0.8" = + self.by-version."which"."1.0.8"; by-spec."windows-no-runnable"."~0.0.6" = self.by-version."windows-no-runnable"."0.0.6"; by-version."windows-no-runnable"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -30085,7 +30879,7 @@ "colors-0.6.2" = self.by-version."colors"."0.6.2"; "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "isstream-0.1.0" = self.by-version."isstream"."0.1.0"; + "isstream-0.1.1" = self.by-version."isstream"."0.1.1"; "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; @@ -30428,6 +31222,95 @@ ]; passthru.names = [ "xcode" ]; }; + by-spec."xdg-basedir"."^1.0.0" = + self.by-version."xdg-basedir"."1.0.0"; + by-version."xdg-basedir"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "xdg-basedir-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.0.tgz"; + name = "xdg-basedir-1.0.0.tgz"; + sha1 = "95ea42a738d98a9470fd5a21d08556dbd61dc74a"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-basedir" or []); + deps = { + "user-home-1.1.0" = self.by-version."user-home"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-basedir" ]; + }; + by-spec."xdg-empty-trash"."^1.0.0" = + self.by-version."xdg-empty-trash"."1.0.0"; + by-version."xdg-empty-trash"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "xdg-empty-trash-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-empty-trash/-/xdg-empty-trash-1.0.0.tgz"; + name = "xdg-empty-trash-1.0.0.tgz"; + sha1 = "007ec95403863f705ec09335b8c9166858021959"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-empty-trash" or []); + deps = { + "each-async-1.1.0" = self.by-version."each-async"."1.1.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-empty-trash" ]; + }; + by-spec."xdg-trash"."^1.0.0" = + self.by-version."xdg-trash"."1.0.5"; + by-version."xdg-trash"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "xdg-trash-1.0.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.0.5.tgz"; + name = "xdg-trash-1.0.5.tgz"; + sha1 = "5473316b2a1ec2e9329fbeb4d767ffe939cc1c82"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-trash" or []); + deps = { + "each-async-1.1.0" = self.by-version."each-async"."1.1.0"; + "fs-extra-0.12.0" = self.by-version."fs-extra"."0.12.0"; + "uuid-2.0.1" = self.by-version."uuid"."2.0.1"; + "xdg-trashdir-1.0.3" = self.by-version."xdg-trashdir"."1.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-trash" ]; + }; + by-spec."xdg-trashdir"."^1.0.0" = + self.by-version."xdg-trashdir"."1.0.3"; + by-version."xdg-trashdir"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "xdg-trashdir-1.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-trashdir/-/xdg-trashdir-1.0.3.tgz"; + name = "xdg-trashdir-1.0.3.tgz"; + sha1 = "8df4be55629617be0c5ece0b76ab6cac658d52c7"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-trashdir" or []); + deps = { + "mount-point-1.0.3" = self.by-version."mount-point"."1.0.3"; + "xdg-basedir-1.0.0" = self.by-version."xdg-basedir"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-trashdir" ]; + }; by-spec."xml2js"."0.2.4" = self.by-version."xml2js"."0.2.4"; by-version."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -30707,22 +31590,21 @@ }; by-spec."xtend"."~3.0.0" = self.by-version."xtend"."3.0.0"; - by-spec."yargs"."~1.2.1" = - self.by-version."yargs"."1.2.6"; - by-version."yargs"."1.2.6" = lib.makeOverridable self.buildNodePackage { - name = "yargs-1.2.6"; + by-spec."yargs"."^1.2.1" = + self.by-version."yargs"."1.3.3"; + by-version."yargs"."1.3.3" = lib.makeOverridable self.buildNodePackage { + name = "yargs-1.3.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz"; - name = "yargs-1.2.6.tgz"; - sha1 = "9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b"; + url = "http://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; + name = "yargs-1.3.3.tgz"; + sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; }) ]; buildInputs = (self.nativeDeps."yargs" or []); deps = { - "minimist-0.1.0" = self.by-version."minimist"."0.1.0"; }; peerDependencies = [ ]; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 5f6761bde05..f63c614424f 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -146,4 +146,6 @@ , "sloc" , "peerflix" , "peerflix-server" +, "trash" +, "empty-trash" ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 224ee74c7c6..c81af3d8770 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -144,6 +144,7 @@ let pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { pythonDBus = self.dbus; + pythonPackages = self; }; pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { @@ -2378,12 +2379,12 @@ let dropbox = buildPythonPackage rec { - name = "dropbox-2.0.0"; - doCheck = !isPy3k; # failures with hash randomization + name = "dropbox-2.2.0"; + doCheck = false; # python 2.7.9 does verify ssl certificates src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dropbox/${name}.zip"; - sha256 = "1bi2z1lql6ryylfflmizhqn98ab55777vn7n5krhqz40pdcjilkx"; + sha256 = "069jrwb67brqh0sics8fgqdf2mv5y5jl9k5729x8vf80pq2c9p36"; }; propagatedBuildInputs = with self; [ urllib3 mock setuptools ]; @@ -2911,7 +2912,7 @@ let md5 = "9c4c5a59b878aed78e96a6ae58c6c185"; }; - propagatedBuildInputs = [ pkgs.pyqt4 pkgs.sip pkgs.pkgconfig pkgs.popplerQt4 ]; + propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.popplerQt4 ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext" + " --include-dirs=${pkgs.popplerQt4}/include/poppler/"; @@ -6404,6 +6405,9 @@ let # https://github.com/paramiko/paramiko/issues/449 doCheck = !(isPyPy || isPy33); checkPhase = '' + # test_util needs to resolve an hostname, thus failing when the fw blocks it + sed '/UtilTest/d' -i test.py + ${python}/bin/${python.executable} test.py --no-sftp --no-big-file ''; @@ -8829,15 +8833,14 @@ let sha256 = "13aqm0dwy17ghimy7m2mxjwlyc1k7zk5icxzrs1sa896056f1dyy"; }; - preInstall = '' + patchPhase = '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . - sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c + substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xlibs.libX11}/lib/libX11.so.6" gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -shared \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ -o x_ignore_nofocus.so \ - x_ignore_nofocus.o \ - ${if stdenv.isDarwin then "-lx11" else ""} + x_ignore_nofocus.o cp -v x_ignore_nofocus.so py/selenium/webdriver/firefox/${if pkgs.stdenv.is64bit then "amd64" else "x86"}/ ''; }; @@ -12082,12 +12085,12 @@ let }; }; - pythonefl_1_11 = buildPythonPackage rec { + pythonefl_1_12 = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "1d4hj39alg6j7ah1bc8wvlka9d13i8iy3fxxraik2f60w6811i48"; + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; + sha256 = "0rxv5nrqg5c2l93ns2k6gjil1y7qq6amfh5slkarm3kv8fzk17xv"; }; preConfigure = '' export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE"