diff options
159 files changed, 4758 insertions, 2967 deletions
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index da7706726b4c..b127ba2faaee 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -628,6 +628,9 @@ with import <nixpkgs> {}; In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`. +Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv` +should be used with `ignoreCollisions = true`. + ### Development mode Development or editable mode is supported. To develop Python packages diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md index 657e1642d2df..ef6ebc392b33 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.md @@ -17,8 +17,8 @@ into the `environment.systemPackages` or bring them into scope with `nix-shell -p rustStable.rustc -p rustStable.cargo`. There are also `rustBeta` and `rustNightly` package sets available. -These are not updated very regulary. For daily builds see -[Using the Rust nightlies overlay](#using-the-rust-nightlies-overlay) +These are not updated very regulary. For daily builds use either rustup from +nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay). ## Packaging Rust applications diff --git a/lib/attrsets.nix b/lib/attrsets.nix index f9e6b7495fc5..c686e1d20eb8 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -2,7 +2,7 @@ let inherit (builtins) head tail length; - inherit (import ./trivial.nix) or; + inherit (import ./trivial.nix) and or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; inherit (import ./lists.nix) concatMap concatLists all deepSeqList; @@ -417,18 +417,15 @@ rec { /* Returns true if the pattern is contained in the set. False otherwise. - FIXME(zimbatm): this example doesn't work !!! - Example: - sys = mkSystem { } - matchAttrs { cpu = { bits = 64; }; } sys + matchAttrs { cpu = {}; } { cpu = { bits = 64; }; } => true */ - matchAttrs = pattern: attrs: - fold or false (attrValues (zipAttrsWithNames (attrNames pattern) (n: values: + matchAttrs = pattern: attrs: assert isAttrs pattern; + fold and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values: let pat = head values; val = head (tail values); in if length values == 1 then false - else if isAttrs pat then isAttrs val && matchAttrs head values + else if isAttrs pat then isAttrs val && matchAttrs pat val else pat == val ) [pattern attrs])); diff --git a/lib/default.nix b/lib/default.nix index 632b12510e82..e692637abf19 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -27,8 +27,7 @@ let # constants licenses = import ./licenses.nix; - platforms = import ./platforms.nix; - systems = import ./systems.nix; + systems = import ./systems; # misc debug = import ./debug.nix; @@ -47,13 +46,15 @@ in attrsets lists strings stringsWithDeps customisation maintainers meta sources modules options types - licenses platforms systems + licenses systems debug generators misc sandbox fetchers filesystem; + + # back-compat aliases + platforms = systems.doubles; } # !!! don't include everything at top-level; perhaps only the most # commonly used functions. // trivial // lists // strings // stringsWithDeps // attrsets // sources // options // types // meta // debug // misc // modules - // systems // customisation diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 450d880663cb..9f24d1836256 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -238,6 +238,7 @@ jgillich = "Jakob Gillich <jakob@gillich.me>"; jhhuh = "Ji-Haeng Huh <jhhuh.note@gmail.com>"; jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>"; + jlesquembre = "José Luis Lafuente <jl@lafuente.me>"; joachifm = "Joachim Fasting <joachifm@fastmail.fm>"; joamaki = "Jussi Maki <joamaki@gmail.com>"; joelmo = "Joel Moberg <joel.moberg@gmail.com>"; @@ -461,6 +462,7 @@ ryantm = "Ryan Mulligan <ryan@ryantm.com>"; rycee = "Robert Helgesson <robert@rycee.net>"; ryneeverett = "Ryne Everett <ryneeverett@gmail.com>"; + rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>"; s1lvester = "Markus Silvester <s1lvester@bockhacker.me>"; samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; diff --git a/lib/platforms.nix b/lib/platforms.nix deleted file mode 100644 index 6b56e1734ad6..000000000000 --- a/lib/platforms.nix +++ /dev/null @@ -1,24 +0,0 @@ -let lists = import ./lists.nix; in - -rec { - all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; - allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; - none = []; - - arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; - i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; - mips = [ "mips64el-linux" ]; - x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"]; - - cygwin = ["i686-cygwin" "x86_64-cygwin"]; - darwin = ["x86_64-darwin"]; - freebsd = ["i686-freebsd" "x86_64-freebsd"]; - gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ - illumos = ["x86_64-solaris"]; - linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux"]; - netbsd = ["i686-netbsd" "x86_64-netbsd"]; - openbsd = ["i686-openbsd" "x86_64-openbsd"]; - unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; - - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"]; -} diff --git a/lib/systems.nix b/lib/systems.nix deleted file mode 100644 index 92d8bdf892b4..000000000000 --- a/lib/systems.nix +++ /dev/null @@ -1,126 +0,0 @@ -# Define the list of system with their properties. Only systems tested for -# Nixpkgs are listed below - -with import ./lists.nix; -with import ./types.nix; -with import ./attrsets.nix; - -let - lib = import ./default.nix; - setTypes = type: - mapAttrs (name: value: - setType type ({inherit name;} // value) - ); -in - -rec { - - isSignificantByte = isType "significant-byte"; - significantBytes = setTypes "significant-byte" { - bigEndian = {}; - littleEndian = {}; - }; - - - isCpuType = x: isType "cpu-type" x - && elem x.bits [8 16 32 64 128] - && (8 < x.bits -> isSignificantByte x.significantByte); - - cpuTypes = with significantBytes; - setTypes "cpu-type" { - arm = { bits = 32; significantByte = littleEndian; }; - armv5tel = { bits = 32; significantByte = littleEndian; }; - armv7l = { bits = 32; significantByte = littleEndian; }; - i686 = { bits = 32; significantByte = littleEndian; }; - powerpc = { bits = 32; significantByte = bigEndian; }; - x86_64 = { bits = 64; significantByte = littleEndian; }; - }; - - - isExecFormat = isType "exec-format"; - execFormats = setTypes "exec-format" { - aout = {}; # a.out - elf = {}; - macho = {}; - pe = {}; - unknow = {}; - }; - - - isKernel = isType "kernel"; - kernels = with execFormats; - setTypes "kernel" { - cygwin = { execFormat = pe; }; - darwin = { execFormat = macho; }; - freebsd = { execFormat = elf; }; - linux = { execFormat = elf; }; - netbsd = { execFormat = elf; }; - none = { execFormat = unknow; }; - openbsd = { execFormat = elf; }; - win32 = { execFormat = pe; }; - }; - - - isArchitecture = isType "architecture"; - architectures = setTypes "architecture" { - apple = {}; - pc = {}; - unknow = {}; - }; - - - isSystem = x: isType "system" x - && isCpuType x.cpu - && isArchitecture x.arch - && isKernel x.kernel; - - mkSystem = { - cpu ? cpuTypes.i686, - arch ? architectures.pc, - kernel ? kernels.linux, - name ? "${cpu.name}-${arch.name}-${kernel.name}" - }: setType "system" { - inherit name cpu arch kernel; - }; - - - is64Bit = matchAttrs { cpu = { bits = 64; }; }; - isDarwin = matchAttrs { kernel = kernels.darwin; }; - isi686 = matchAttrs { cpu = cpuTypes.i686; }; - isLinux = matchAttrs { kernel = kernels.linux; }; - - - # This should revert the job done by config.guess from the gcc compiler. - mkSystemFromString = s: let - l = lib.splitString "-" s; - - getCpu = name: - attrByPath [name] (throw "Unknow cpuType `${name}'.") - cpuTypes; - getArch = name: - attrByPath [name] (throw "Unknow architecture `${name}'.") - architectures; - getKernel = name: - attrByPath [name] (throw "Unknow kernel `${name}'.") - kernels; - - system = - if builtins.length l == 2 then - mkSystem rec { - name = s; - cpu = getCpu (head l); - arch = - if isDarwin system - then architectures.apple - else architectures.pc; - kernel = getKernel (head (tail l)); - } - else - mkSystem { - name = s; - cpu = getCpu (head l); - arch = getArch (head (tail l)); - kernel = getKernel (head (tail (tail l))); - }; - in assert isSystem system; system; -} diff --git a/lib/systems/default.nix b/lib/systems/default.nix new file mode 100644 index 000000000000..d956969a18f9 --- /dev/null +++ b/lib/systems/default.nix @@ -0,0 +1,23 @@ +rec { + doubles = import ./doubles.nix; + parse = import ./parse.nix; + platforms = import ./platforms.nix; + + # Elaborate a `localSystem` or `crossSystem` so that it contains everything + # necessary. + # + # `parsed` is inferred from args, both because there are two options with one + # clearly prefered, and to prevent cycles. A simpler fixed point where the RHS + # always just used `final.*` would fail on both counts. + elaborate = args: let + final = { + # Prefer to parse `config` as it is strictly more informative. + parsed = parse.mkSystemFromString (if args ? config then args.config else args.system); + # Either of these can be losslessly-extracted from `parsed` iff parsing succeeds. + system = parse.doubleFromSystem final.parsed; + config = parse.tripleFromSystem final.parsed; + # Just a guess, based on `system` + platform = platforms.selectBySystem final.system; + } // args; + in final; +} diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix new file mode 100644 index 000000000000..2622ddf4be1f --- /dev/null +++ b/lib/systems/doubles.nix @@ -0,0 +1,44 @@ +let lists = import ../lists.nix; in +let parse = import ./parse.nix; in +let inherit (import ../attrsets.nix) matchAttrs; in + +let + all = [ + "aarch64-linux" + "armv5tel-linux" "armv6l-linux" "armv7l-linux" + + "mips64el-linux" + + "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd" + + "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux" + "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris" + ]; + + allParsed = map parse.mkSystemFromString all; + + filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed); + +in rec { + inherit all; + + allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; + none = []; + + arm = filterDoubles (matchAttrs { cpu = { family = "arm"; bits = 32; }; }); + i686 = filterDoubles parse.isi686; + mips = filterDoubles (matchAttrs { cpu = { family = "mips"; }; }); + x86_64 = filterDoubles parse.isx86_64; + + cygwin = filterDoubles (matchAttrs { kernel = parse.kernels.cygwin; }); + darwin = filterDoubles parse.isDarwin; + freebsd = filterDoubles (matchAttrs { kernel = parse.kernels.freebsd; }); + gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); # Should be better + illumos = filterDoubles (matchAttrs { kernel = parse.kernels.solaris; }); + linux = filterDoubles parse.isLinux; + netbsd = filterDoubles (matchAttrs { kernel = parse.kernels.netbsd; }); + openbsd = filterDoubles (matchAttrs { kernel = parse.kernels.openbsd; }); + unix = filterDoubles parse.isUnix; + + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"]; +} diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix new file mode 100644 index 000000000000..f6315b8ad2a9 --- /dev/null +++ b/lib/systems/parse.nix @@ -0,0 +1,173 @@ +# Define the list of system with their properties. Only systems tested for +# Nixpkgs are listed below + +with import ../lists.nix; +with import ../types.nix; +with import ../attrsets.nix; + +let + lib = import ../default.nix; + setTypesAssert = type: pred: + mapAttrs (name: value: + #assert pred value; + setType type ({ inherit name; } // value)); + setTypes = type: setTypesAssert type (_: true); + +in + +rec { + + isSignificantByte = isType "significant-byte"; + significantBytes = setTypes "significant-byte" { + bigEndian = {}; + littleEndian = {}; + }; + + + isCpuType = isType "cpu-type"; + cpuTypes = with significantBytes; setTypesAssert "cpu-type" + (x: elem x.bits [8 16 32 64 128] + && (if 8 < x.bits + then isSignificantByte x.significantByte + else !(x ? significantByte))) + { + arm = { bits = 32; significantByte = littleEndian; family = "arm"; }; + armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; }; + armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; + armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; }; + armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; }; + aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; }; + i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; + x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; + mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; }; + powerpc = { bits = 32; significantByte = bigEndian; family = "powerpc"; }; + }; + + isVendor = isType "vendor"; + vendors = setTypes "vendor" { + apple = {}; + pc = {}; + unknown = {}; + }; + + isExecFormat = isType "exec-format"; + execFormats = setTypes "exec-format" { + aout = {}; # a.out + elf = {}; + macho = {}; + pe = {}; + unknown = {}; + }; + + isKernelFamily = isType "kernel-family"; + kernelFamilies = setTypes "kernel-family" { + bsd = {}; + unix = {}; + windows-nt = {}; + dos = {}; + }; + + isKernel = x: isType "kernel" x; + kernels = with execFormats; with kernelFamilies; setTypesAssert "kernel" + (x: isExecFormat x.execFormat && all isKernelFamily (attrValues x.families)) + { + cygwin = { execFormat = pe; families = { inherit /*unix*/ windows-nt; }; }; + darwin = { execFormat = macho; families = { inherit unix; }; }; + freebsd = { execFormat = elf; families = { inherit unix bsd; }; }; + linux = { execFormat = elf; families = { inherit unix; }; }; + netbsd = { execFormat = elf; families = { inherit unix bsd; }; }; + none = { execFormat = unknown; families = { inherit unix; }; }; + openbsd = { execFormat = elf; families = { inherit unix bsd; }; }; + solaris = { execFormat = elf; families = { inherit unix; }; }; + win32 = { execFormat = pe; families = { inherit dos; }; }; + }; + + + isAbi = isType "abi"; + abis = setTypes "abi" { + gnu = {}; + msvc = {}; + eabi = {}; + androideabi = {}; + unknown = {}; + }; + + isSystem = isType "system"; + mkSystem = { cpu, vendor, kernel, abi }: + assert isCpuType cpu && isVendor vendor && isKernel kernel && isAbi abi; + setType "system" { + inherit cpu vendor kernel abi; + }; + + is64Bit = matchAttrs { cpu = { bits = 64; }; }; + is32Bit = matchAttrs { cpu = { bits = 32; }; }; + isi686 = matchAttrs { cpu = cpuTypes.i686; }; + isx86_64 = matchAttrs { cpu = cpuTypes.x86_64; }; + + isDarwin = matchAttrs { kernel = kernels.darwin; }; + isLinux = matchAttrs { kernel = kernels.linux; }; + isUnix = matchAttrs { kernel = { families = { inherit (kernelFamilies) unix; }; }; }; + isWindows = s: matchAttrs { kernel = { families = { inherit (kernelFamilies) windows-nt; }; }; } s + || matchAttrs { kernel = { families = { inherit (kernelFamilies) dos; }; }; } s; + + + mkSkeletonFromList = l: { + "2" = { cpu = elemAt l 0; kernel = elemAt l 1; }; + "4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; }; + "3" = # Awkwards hacks, beware! + if elemAt l 1 == "apple" + then { cpu = elemAt l 0; vendor = "apple"; kernel = elemAt l 2; } + else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu") + then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; } + else throw "Target specification with 3 components is ambiguous"; + }.${toString (length l)} + or (throw "system string has invalid number of hyphen-separated components"); + + # This should revert the job done by config.guess from the gcc compiler. + mkSystemFromSkeleton = { cpu + , # Optional, but fallback too complex for here. + # Inferred below instead. + vendor ? assert false; null + , kernel + , # Also inferred below + abi ? assert false; null + } @ args: let + getCpu = name: + attrByPath [name] (throw "Unknown CPU type: ${name}") + cpuTypes; + getVendor = name: + attrByPath [name] (throw "Unknown vendor: ${name}") + vendors; + getKernel = name: + attrByPath [name] (throw "Unknown kernel: ${name}") + kernels; + getAbi = name: + attrByPath [name] (throw "Unknown ABI: ${name}") + abis; + + system = rec { + cpu = getCpu args.cpu; + vendor = + /**/ if args ? vendor then getVendor args.vendor + else if isDarwin system then vendors.apple + else if isWindows system then vendors.pc + else vendors.unknown; + kernel = getKernel args.kernel; + abi = + /**/ if args ? abi then getAbi args.abi + else if isLinux system then abis.gnu + else if isWindows system then abis.gnu + else abis.unknown; + }; + + in mkSystem system; + + mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s)); + + doubleFromSystem = { cpu, vendor, kernel, abi, ... }: "${cpu.name}-${kernel.name}"; + + tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let + optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}"; + in "${cpu.name}-${vendor.name}-${kernel.name}${optAbi}"; + +} diff --git a/pkgs/top-level/platforms.nix b/lib/systems/platforms.nix index 665950766f7e..4322c8e2ff68 100644 --- a/pkgs/top-level/platforms.nix +++ b/lib/systems/platforms.nix @@ -474,7 +474,7 @@ rec { }; }; - selectPlatformBySystem = system: { + selectBySystem = system: { "i686-linux" = pc32; "x86_64-linux" = pc64; "armv5tel-linux" = sheevaplug; diff --git a/lib/tests/release.nix b/lib/tests/release.nix index f9f57424f7d0..dfa4ca2676d1 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -1,31 +1,40 @@ -{ nixpkgs }: +{ nixpkgs ? { outPath = (import ../.).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +, # The platforms for which we build Nixpkgs. + supportedSystems ? [ builtins.currentSystem ] +, # Strip most of attributes when evaluating to spare memory usage + scrubJobs ? true +}: -with import ../.. { }; +with import ../../pkgs/top-level/release-lib.nix { inherit supportedSystems scrubJobs; }; with lib; -stdenv.mkDerivation { - name = "nixpkgs-lib-tests"; - buildInputs = [ nix ]; - NIX_PATH="nixpkgs=${nixpkgs}"; +{ + systems = import ./systems.nix { inherit lib assertTrue; }; - buildCommand = '' - datadir="${nix}/share" - export TEST_ROOT=$(pwd)/test-tmp - export NIX_BUILD_HOOK= - export NIX_CONF_DIR=$TEST_ROOT/etc - export NIX_DB_DIR=$TEST_ROOT/db - export NIX_LOCALSTATE_DIR=$TEST_ROOT/var - export NIX_LOG_DIR=$TEST_ROOT/var/log/nix - export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests - export NIX_STATE_DIR=$TEST_ROOT/var/nix - export NIX_STORE_DIR=$TEST_ROOT/store - export PAGER=cat - cacheDir=$TEST_ROOT/binary-cache - nix-store --init + moduleSystem = pkgs.stdenv.mkDerivation { + name = "nixpkgs-lib-tests"; + buildInputs = [ pkgs.nix ]; + NIX_PATH="nixpkgs=${nixpkgs}"; - cd ${nixpkgs}/lib/tests - ./modules.sh + buildCommand = '' + datadir="${pkgs.nix}/share" + export TEST_ROOT=$(pwd)/test-tmp + export NIX_BUILD_HOOK= + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_DB_DIR=$TEST_ROOT/db + export NIX_LOCALSTATE_DIR=$TEST_ROOT/var + export NIX_LOG_DIR=$TEST_ROOT/var/log/nix + export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_STORE_DIR=$TEST_ROOT/store + export PAGER=cat + cacheDir=$TEST_ROOT/binary-cache + nix-store --init - touch $out - ''; + cd ${nixpkgs}/lib/tests + ./modules.sh + + touch $out + ''; + }; } diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix new file mode 100644 index 000000000000..5eacc0defafb --- /dev/null +++ b/lib/tests/systems.nix @@ -0,0 +1,31 @@ +# We assert that the new algorithmic way of generating these lists matches the +# way they were hard-coded before. +# +# One might think "if we exhaustively test, what's the point of procedurally +# calculating the lists anyway?". The answer is one can mindlessly update these +# tests as new platforms become supported, and then just give the diff a quick +# sanity check before committing :). +{ lib, assertTrue }: + +with lib.systems.doubles; + +let mseteq = x: y: lib.sort lib.lessThan x == lib.sort lib.lessThan y; in + +{ + all = assertTrue (mseteq all (linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos)); + + arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]); + i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" ]); + mips = assertTrue (mseteq mips [ "mips64el-linux" ]); + x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" ]); + + cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]); + darwin = assertTrue (mseteq darwin [ "x86_64-darwin" ]); + freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]); + gnu = assertTrue (mseteq gnu (linux /* ++ hurd ++ kfreebsd ++ ... */)); + illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]); + linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]); + netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]); + openbsd = assertTrue (mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]); + unix = assertTrue (mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos)); +} diff --git a/lib/trivial.nix b/lib/trivial.nix index 62906339e605..735aa55e0dce 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -122,6 +122,9 @@ rec { # Flip the order of the arguments of a binary function. flip = f: a: b: f b a; + # Apply function if argument is non-null + mapNullable = f: a: if isNull a then a else f a; + # Pull in some builtins not included elsewhere. inherit (builtins) pathExists readFile isBool isFunction diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 57bc249360e7..e2ae2ee9fdf8 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -87,38 +87,6 @@ if ! test -e "$mountPoint"; then exit 1 fi - -# Mount some stuff in the target root directory. -mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home -mkdir -m 01777 -p $mountPoint/tmp -mkdir -m 0755 -p $mountPoint/tmp/root -mkdir -m 0755 -p $mountPoint/var -mkdir -m 0700 -p $mountPoint/root -mount --rbind /dev $mountPoint/dev -mount --rbind /proc $mountPoint/proc -mount --rbind /sys $mountPoint/sys -mount --rbind / $mountPoint/tmp/root -mount -t tmpfs -o "mode=0755" none $mountPoint/run -rm -rf $mountPoint/var/run -ln -s /run $mountPoint/var/run -for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done -for f in /etc/passwd /etc/group; do touch $mountPoint/$f; [ -f "$f" ] && mount --rbind -o ro $f $mountPoint/$f; done - -cp -Lf "@cacert@" "$mountPoint/tmp/ca-cert.crt" -export SSL_CERT_FILE=/tmp/ca-cert.crt -# For Nix 1.7 -export CURL_CA_BUNDLE=/tmp/ca-cert.crt - -if [ -n "$runChroot" ]; then - if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then - echo "$0: installation not finished; cannot chroot into installation directory" - exit 1 - fi - ln -s /nix/var/nix/profiles/system $mountPoint/run/current-system - exec chroot $mountPoint "${chrootCommand[@]}" -fi - - # Get the path of the NixOS configuration file. if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix @@ -130,121 +98,60 @@ if [ ! -e "$mountPoint/$NIXOS_CONFIG" ] && [ -z "$closure" ]; then fi -# Create the necessary Nix directories on the target device, if they -# don't already exist. -mkdir -m 0755 -p \ - $mountPoint/nix/var/nix/gcroots \ - $mountPoint/nix/var/nix/temproots \ - $mountPoint/nix/var/nix/userpool \ - $mountPoint/nix/var/nix/profiles \ - $mountPoint/nix/var/nix/db \ - $mountPoint/nix/var/log/nix/drvs - -mkdir -m 1775 -p $mountPoint/nix/store -chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store - - -# There is no daemon in the chroot. -unset NIX_REMOTE - - -# We don't have locale-archive in the chroot, so clear $LANG. -export LANG= -export LC_ALL= -export LC_TIME= - - # Builds will use users that are members of this group extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup") - # Inherit binary caches from the host +# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not... binary_caches="$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')" extraBuildFlags+=(--option "binary-caches" "$binary_caches") +nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")" +export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG" +unset NIXOS_CONFIG -# Copy Nix to the Nix store on the target device, unless it's already there. -if ! NIX_DB_DIR=$mountPoint/nix/var/nix/db nix-store --check-validity @nix@ 2> /dev/null; then - echo "copying Nix to $mountPoint...." - for i in $(@perl@/bin/perl @pathsFromGraph@ @nixClosure@); do - echo " $i" - chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit - @rsync@/bin/rsync -a $i $mountPoint/nix/store/ - done - - # Register the paths in the Nix closure as valid. This is necessary - # to prevent them from being deleted the first time we install - # something. (I.e., Nix will see that, e.g., the glibc path is not - # valid, delete it to get it out of the way, but as a result nothing - # will work anymore.) - chroot $mountPoint @nix@/bin/nix-store --register-validity < @nixClosure@ -fi - - -# Create the required /bin/sh symlink; otherwise lots of things -# (notably the system() function) won't work. -mkdir -m 0755 -p $mountPoint/bin -# !!! assuming that @shell@ is in the closure -ln -sf @shell@ $mountPoint/bin/sh +# TODO: do I need to set NIX_SUBSTITUTERS here or is the --option binary-caches above enough? -# Build hooks likely won't function correctly in the minimal chroot; just disable them. -unset NIX_BUILD_HOOK +# A place to drop temporary closures +trap "rm -rf $tmpdir" EXIT +tmpdir="$(mktemp -d)" -# Make the build below copy paths from the CD if possible. Note that -# /tmp/root in the chroot is the root of the CD. -export NIX_OTHER_STORES=/tmp/root/nix:$NIX_OTHER_STORES - -p=@nix@/libexec/nix/substituters -export NIX_SUBSTITUTERS=$p/copy-from-other-stores.pl:$p/download-from-binary-cache.pl +# Build a closure (on the host; we then copy it into the guest) +function closure() { + nix-build "${extraBuildFlags[@]}" --no-out-link -E "with import <nixpkgs> {}; runCommand \"closure\" { exportReferencesGraph = [ \"x\" (buildEnv { name = \"env\"; paths = [ ($1) stdenv ]; }) ]; } \"cp x \$out\"" +} +system_closure="$tmpdir/system.closure" if [ -z "$closure" ]; then - # Get the absolute path to the NixOS/Nixpkgs sources. - nixpkgs="$(readlink -f $(nix-instantiate --find-file nixpkgs))" - - nixEnvAction="-f <nixpkgs/nixos> --set -A system" + expr="(import <nixpkgs/nixos> {}).system" + system_root="$(nix-build -E "$expr")" + system_closure="$(closure "$expr")" else - nixpkgs="" - nixEnvAction="--set $closure" + system_root=$closure + # Create a temporary file ending in .closure (so nixos-prepare-root knows to --import it) to transport the store closure + # to the filesytem we're preparing. Also delete it on exit! + nix-store --export $(nix-store -qR $closure) > $system_closure fi -# Build the specified Nix expression in the target store and install -# it into the system configuration profile. -echo "building the system configuration..." -NIX_PATH="nixpkgs=/tmp/root/$nixpkgs:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \ - chroot $mountPoint @nix@/bin/nix-env \ - "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system $nixEnvAction +channel_root="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" +channel_closure="$tmpdir/channel.closure" +nix-store --export $channel_root > $channel_closure +# Populate the target root directory with the basics +@prepare_root@/bin/nixos-prepare-root $mountPoint $channel_root $system_root @nixClosure@ $system_closure $channel_closure -# Copy the NixOS/Nixpkgs sources to the target as the initial contents -# of the NixOS channel. -mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles -mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user -mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root -srcs=$(nix-env "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "") -if [ -z "$noChannelCopy" ] && [ -n "$srcs" ]; then - echo "copying NixOS/Nixpkgs sources..." - chroot $mountPoint @nix@/bin/nix-env \ - "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet -fi -mkdir -m 0700 -p $mountPoint/root/.nix-defexpr -ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels - - -# Get rid of the /etc bind mounts. -for f in /etc/passwd /etc/group; do [ -f "$f" ] && umount $mountPoint/$f; done +# nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead +chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store +mount --rbind /dev $mountPoint/dev +mount --rbind /proc $mountPoint/proc +mount --rbind /sys $mountPoint/sys # Grub needs an mtab. ln -sfn /proc/mounts $mountPoint/etc/mtab - -# Mark the target as a NixOS installation, otherwise -# switch-to-configuration will chicken out. -touch $mountPoint/etc/NIXOS - - # Switch to the new system configuration. This will install Grub with # a menu default pointing at the kernel/initrd/etc of the new # configuration. diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh new file mode 100644 index 000000000000..c374330f8464 --- /dev/null +++ b/nixos/modules/installer/tools/nixos-prepare-root.sh @@ -0,0 +1,105 @@ +#! @shell@ + +# This script's goal is to perform all "static" setup of a filesystem structure from pre-built store paths. Everything +# in here should run in a non-root context and inside a Nix builder. It's designed primarily to be called from image- +# building scripts and from nixos-install, but because it makes very few assumptions about the context in which it runs, +# it could be useful in other contexts as well. +# +# Current behavior: +# - set up basic filesystem structure +# - make Nix store etc. +# - copy Nix, system, channel, and misceallaneous closures to target Nix store +# - register validity of all paths in the target store +# - set up channel and system profiles + +# Ensure a consistent umask. +umask 0022 + +set -e + +mountPoint="$1" +channel="$2" +system="$3" +shift 3 +closures="$@" + +PATH="@coreutils@/bin:@nix@/bin:@perl@/bin:@utillinux@/bin:@rsync@/bin" + +if ! test -e "$mountPoint"; then + echo "mount point $mountPoint doesn't exist" + exit 1 +fi + +# Create a few of the standard directories in the target root directory. +mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home +mkdir -m 01777 -p $mountPoint/tmp +mkdir -m 0755 -p $mountPoint/tmp/root +mkdir -m 0755 -p $mountPoint/var +mkdir -m 0700 -p $mountPoint/root + +ln -s /run $mountPoint/var/run + +# Create the necessary Nix directories on the target device +mkdir -m 0755 -p \ + $mountPoint/nix/var/nix/gcroots \ + $mountPoint/nix/var/nix/temproots \ + $mountPoint/nix/var/nix/userpool \ + $mountPoint/nix/var/nix/profiles \ + $mountPoint/nix/var/nix/db \ + $mountPoint/nix/var/log/nix/drvs + +mkdir -m 1775 -p $mountPoint/nix/store + +# All Nix operations below should operate on our target store, not /nix/store. +# N.B: this relies on Nix 1.12 or higher +export NIX_REMOTE=local?root=$mountPoint + +# Copy our closures to the Nix store on the target mount point, unless they're already there. +for i in $closures; do + # We support closures both in the format produced by `nix-store --export` and by `exportReferencesGraph`, + # mostly because there doesn't seem to be a single format that can be produced outside of a nix build and + # inside one. See https://github.com/NixOS/nix/issues/1242 for more discussion. + if [[ "$i" =~ \.closure$ ]]; then + echo "importing serialized closure $i to $mountPoint..." + nix-store --import < $i + else + # There has to be a better way to do this, right? + echo "copying closure $i to $mountPoint..." + for j in $(perl @pathsFromGraph@ $i); do + echo " $j... " + rsync -a $j $mountPoint/nix/store/ + done + + nix-store --register-validity < $i + fi +done + +# Create the required /bin/sh symlink; otherwise lots of things +# (notably the system() function) won't work. +if [ ! -x $mountPoint/@shell@ ]; then + echo "Error: @shell@ wasn't included in the closure" >&2 + exit 1 +fi +mkdir -m 0755 -p $mountPoint/bin +ln -sf @shell@ $mountPoint/bin/sh + +echo "setting the system closure to '$system'..." +nix-env "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/system --set "$system" + +ln -sfn /nix/var/nix/profiles/system $mountPoint/run/current-system + +# Copy the NixOS/Nixpkgs sources to the target as the initial contents of the NixOS channel. +mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles +mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user +mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root + +if [ -z "$noChannelCopy" ] && [ -n "$channel" ]; then + echo "copying channel..." + nix-env --option build-use-substitutes false "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channel" --quiet +fi +mkdir -m 0700 -p $mountPoint/root/.nix-defexpr +ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels + +# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out. +touch $mountPoint/etc/NIXOS + diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index a35f6ad8ae54..a3bae78c0ffc 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -4,7 +4,6 @@ { config, pkgs, modulesPath, ... }: let - cfg = config.installer; makeProg = args: pkgs.substituteAll (args // { @@ -17,6 +16,14 @@ let src = ./nixos-build-vms/nixos-build-vms.sh; }; + nixos-prepare-root = makeProg { + name = "nixos-prepare-root"; + src = ./nixos-prepare-root.sh; + + nix = pkgs.nixUnstable; + inherit (pkgs) perl pathsFromGraph rsync utillinux coreutils; + }; + nixos-install = makeProg { name = "nixos-install"; src = ./nixos-install.sh; @@ -26,6 +33,7 @@ let cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; root_uid = config.ids.uids.root; nixbld_gid = config.ids.gids.nixbld; + prepare_root = nixos-prepare-root; nixClosure = pkgs.runCommand "closure" { exportReferencesGraph = ["refs" config.nix.package.out]; } @@ -69,6 +77,7 @@ in environment.systemPackages = [ nixos-build-vms + nixos-prepare-root nixos-install nixos-rebuild nixos-generate-config @@ -77,7 +86,7 @@ in ]; system.build = { - inherit nixos-install nixos-generate-config nixos-option nixos-rebuild; + inherit nixos-install nixos-prepare-root nixos-generate-config nixos-option nixos-rebuild; }; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f7608a57d714..52de4b23370b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -89,6 +89,7 @@ ./programs/nano.nix ./programs/oblogout.nix ./programs/screen.nix + ./programs/slock.nix ./programs/shadow.nix ./programs/shell.nix ./programs/spacefm.nix @@ -659,6 +660,7 @@ ./tasks/scsi-link-power-management.nix ./tasks/swraid.nix ./tasks/trackpoint.nix + ./tasks/powertop.nix ./testing/service-runner.nix ./virtualisation/container-config.nix ./virtualisation/containers.nix diff --git a/nixos/modules/programs/slock.nix b/nixos/modules/programs/slock.nix new file mode 100644 index 000000000000..0e1281e62cd7 --- /dev/null +++ b/nixos/modules/programs/slock.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.slock; + +in +{ + options = { + programs.slock = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to install slock screen locker with setuid wrapper. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.slock ]; + security.wrappers.slock.source = "${pkgs.slock.out}/bin/slock"; + }; +} diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index bf7b44c698cb..f58306ab63ed 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -45,7 +45,7 @@ let cniConfig = pkgs.buildEnv { name = "kubernetes-cni-config"; paths = imap (i: entry: - pkgs.writeTextDir "${10+i}-${entry.type}.conf" (builtins.toJSON entry) + pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry) ) cfg.kubelet.cni.config; }; @@ -597,7 +597,7 @@ in { (mkIf cfg.kubelet.enable { systemd.services.kubelet = { description = "Kubernetes Kubelet Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "network.target" "docker.service" "kube-apiserver.service" ]; path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables ]; preStart = '' @@ -606,6 +606,7 @@ in { ${concatMapStringsSep "\n" (p: "ln -fs ${p.plugins}/* /opt/cni/bin") cfg.kubelet.cni.packages} ''; serviceConfig = { + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kubelet \ --pod-manifest-path=${manifests} \ --kubeconfig=${kubeconfig} \ @@ -655,9 +656,10 @@ in { (mkIf cfg.apiserver.enable { systemd.services.kube-apiserver = { description = "Kubernetes Kubelet Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "network.target" "docker.service" ]; serviceConfig = { + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kube-apiserver \ --etcd-servers=${concatStringsSep "," cfg.etcd.servers} \ ${optionalString (cfg.etcd.caFile != null) @@ -713,9 +715,10 @@ in { (mkIf cfg.scheduler.enable { systemd.services.kube-scheduler = { description = "Kubernetes Scheduler Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; serviceConfig = { + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kube-scheduler \ --address=${cfg.scheduler.address} \ --port=${toString cfg.scheduler.port} \ @@ -735,11 +738,12 @@ in { (mkIf cfg.controllerManager.enable { systemd.services.kube-controller-manager = { description = "Kubernetes Controller Manager Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; serviceConfig = { RestartSec = "30s"; Restart = "on-failure"; + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kube-controller-manager \ --address=${cfg.controllerManager.address} \ --port=${toString cfg.controllerManager.port} \ @@ -767,10 +771,11 @@ in { (mkIf cfg.proxy.enable { systemd.services.kube-proxy = { description = "Kubernetes Proxy Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; path = [pkgs.iptables]; serviceConfig = { + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kube-proxy \ --kubeconfig=${kubeconfig} \ --bind-address=${cfg.proxy.address} \ @@ -786,9 +791,10 @@ in { (mkIf cfg.dns.enable { systemd.services.kube-dns = { description = "Kubernetes Dns Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; serviceConfig = { + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kube-dns \ --kubecfg-file=${kubeconfig} \ --dns-port=${toString cfg.dns.port} \ @@ -836,6 +842,11 @@ in { cfg.proxy.enable || cfg.dns.enable ) { + systemd.targets.kubernetes = { + description = "Kubernetes"; + wantedBy = [ "multi-user.target" ]; + }; + systemd.tmpfiles.rules = [ "d /opt/cni/bin 0755 root root -" "d /var/run/kubernetes 0755 kubernetes kubernetes -" diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index f1fcb4369346..4a8cd86b0b11 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -6,9 +6,7 @@ let bluez-bluetooth = pkgs.bluez; cfg = config.hardware.bluetooth; -in - -{ +in { ###### interface @@ -32,6 +30,8 @@ in ''; description = '' Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf). + + NOTE: We already include [Policy], so any configuration under the Policy group should come first. ''; }; }; @@ -45,7 +45,12 @@ in environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ]; environment.etc = singleton { - source = pkgs.writeText "main.conf" cfg.extraConfig; + source = pkgs.writeText "main.conf" '' + [Policy] + AutoEnable=${lib.boolToString cfg.powerOnBoot} + + ${cfg.extraConfig} + ''; target = "bluetooth/main.conf"; }; @@ -53,29 +58,11 @@ in services.dbus.packages = [ bluez-bluetooth ]; systemd.packages = [ bluez-bluetooth ]; - services.udev.extraRules = optionalString cfg.powerOnBoot '' - ACTION=="add", KERNEL=="hci[0-9]*", ENV{SYSTEMD_WANTS}="bluetooth-power@%k.service" - ''; - systemd.services = { bluetooth = { wantedBy = [ "bluetooth.target" ]; aliases = [ "dbus-org.bluez.service" ]; }; - - "bluetooth-power@" = mkIf cfg.powerOnBoot { - description = "Power up bluetooth controller"; - after = [ - "bluetooth.service" - "suspend.target" - "sys-subsystem-bluetooth-devices-%i.device" - ]; - wantedBy = [ "suspend.target" ]; - - serviceConfig.Type = "oneshot"; - serviceConfig.ExecStart = "${pkgs.bluez.out}/bin/hciconfig %i up"; - }; - }; systemd.user.services = { diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 1de02d76ba0a..7c91462883f1 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -119,7 +119,7 @@ in { extraConf = mkOption { description = '' Etcd extra configuration. See - <link xlink:href='https://github.com/coreos/etcd/blob/master/Documentation/configuration.md#environment-variables' /> + <link xlink:href='https://github.com/coreos/etcd/blob/master/Documentation/op-guide/configuration.md#configuration-flags' /> ''; type = types.attrsOf types.str; default = {}; diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index f6bf2dee9865..9c0bea8d3bff 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -93,7 +93,9 @@ in # why this is done. test -d "${cfg.dataDir}/.skeleton" || mkdir "${cfg.dataDir}/.skeleton" for db in "com.plexapp.plugins.library.db"; do - cp "${cfg.package}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db" + if [ ! -e "${cfg.dataDir}/.skeleton/$db" ]; then + cp "${cfg.package}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db" + fi chmod u+w "${cfg.dataDir}/.skeleton/$db" chown ${cfg.user}:${cfg.group} "${cfg.dataDir}/.skeleton/$db" done @@ -136,6 +138,7 @@ in Group = cfg.group; PermissionsStartOnly = "true"; ExecStart = "/bin/sh -c ${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server"; + KillSignal = "SIGQUIT"; Restart = "on-failure"; }; environment = { diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index c5352e5887da..98931e65bb56 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.graphite; - writeTextOrNull = f: t: if t == null then null else pkgs.writeTextDir f t; + writeTextOrNull = f: t: mapNullable (pkgs.writeTextDir f) t; dataDir = cfg.dataDir; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 32af41cc62fc..b9435c02b1de 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -141,7 +141,7 @@ let }; }); default = null; - apply = x: if x == null then null else _filter x; + apply = x: mapNullable _filter x; description = '' Optional http login credentials for metrics scraping. ''; diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 7eeceb7407c6..cdba14be21f0 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -71,8 +71,7 @@ let # anything ever again ("couldn't resolve ..., giving up on # it"), so we silently lose time synchronisation. This also # applies to openntpd. - ${config.systemd.package}/bin/systemctl try-restart ntpd.service - ${config.systemd.package}/bin/systemctl try-restart openntpd.service + ${config.systemd.package}/bin/systemctl try-reload-or-restart ntpd.service openntpd.service || true fi ${cfg.runHook} diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 4e2c0e01ca03..543fd9399147 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -32,8 +32,14 @@ let '' #! ${pkgs.bash}/bin/bash - # Handle being called by SDDM. - if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi + # SDDM splits "Exec" line in .desktop file by whitespace and pass script path as $1 + if [[ "$0" = "$1" ]]; then + # remove superfluous $1 again + shift + # join arguments again and evaluate them in a shell context + # to interpret shell quoting + eval exec "$0" "$@" + fi ${optionalString cfg.displayManager.logToJournal '' if [ -z "$_DID_SYSTEMD_CAT" ]; then diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 2d6bf2d58a9e..c02956bf8c87 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -383,7 +383,7 @@ in default = false; type = types.bool; description = '' - Whether to invoke <literal>grub-install</literal> with + <para>Whether to invoke <literal>grub-install</literal> with <literal>--removable</literal>.</para> <para>Unless you turn this on, GRUB will install itself somewhere in @@ -412,7 +412,7 @@ in the NVRAM state of the computer (like a USB "removable" drive)</para></listitem> <listitem><para>You simply dislike the idea of depending on NVRAM state to make your drive bootable</para></listitem> - </itemizedlist> + </itemizedlist></para> ''; }; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 720891d518a7..f6f104ce7a68 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -120,7 +120,7 @@ let optionalString (cfg.defaultGatewayWindowSize != null) "window ${toString cfg.defaultGatewayWindowSize}"} ${ optionalString (cfg.defaultGateway.interface != null) - "dev ${cfg.defaultGateway.interface}"} || true + "dev ${cfg.defaultGateway.interface}"} proto static || true ''} ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") '' # FIXME: get rid of "|| true" (necessary to make it idempotent). @@ -130,7 +130,7 @@ let optionalString (cfg.defaultGatewayWindowSize != null) "window ${toString cfg.defaultGatewayWindowSize}"} ${ optionalString (cfg.defaultGateway6.interface != null) - "dev ${cfg.defaultGateway6.interface}"} || true + "dev ${cfg.defaultGateway6.interface}"} proto static || true ''} ''; }; diff --git a/nixos/modules/tasks/powertop.nix b/nixos/modules/tasks/powertop.nix new file mode 100644 index 000000000000..6f57f5f5c25e --- /dev/null +++ b/nixos/modules/tasks/powertop.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.powerManagment.powertop; +in { + ###### interface + + options.powerManagment.powertop.enable = mkEnableOption "powertop auto tuning on startup"; + + ###### implementation + + config = mkIf (cfg.enable) { + systemd.services = { + powertop = { + wantedBy = [ "multi-user.target" ]; + description = "Powertop tunings"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = "yes"; + ExecStart = "${pkgs.powertop}/bin/powertop --auto-tune"; + }; + }; + }; + }; +} diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 35dd00fe630f..3ab3c1bac48a 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -34,6 +34,12 @@ let boot.loader.systemd-boot.enable = true; ''} + users.extraUsers.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + }; + hardware.enableAllFirmware = lib.mkForce false; ${replaceChars ["\n"] ["\n "] extraConfig} @@ -96,7 +102,7 @@ let $machine->shutdown; # Now see if we can boot the installation. - $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "boot-after-install" }); # For example to enter LUKS passphrase. ${preBootCommands} @@ -118,11 +124,17 @@ let $machine->waitForUnit("swap.target"); $machine->succeed("cat /proc/swaps | grep -q /dev"); + # Check that the store is in good shape + $machine->succeed("nix-store --verify --check-contents >&2"); + # Check whether the channel works. $machine->succeed("nix-env -iA nixos.procps >&2"); $machine->succeed("type -tP ps | tee /dev/stderr") =~ /.nix-profile/ or die "nix-env failed"; + # Check that the daemon works, and that non-root users can run builds (this will build a new profile generation through the daemon) + $machine->succeed("su alice -l -c 'nix-env -iA nixos.procps' >&2"); + # We need to a writable nix-store on next boot. $machine->copyFileFromHost( "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }", @@ -139,7 +151,7 @@ let $machine->shutdown; # Check whether a writable store build works - $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "rebuild-switch" }); ${preBootCommands} $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( @@ -150,7 +162,7 @@ let # And just to be sure, check that the machine still boots after # "nixos-rebuild switch". - $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", "boot-after-rebuild-switch" }); ${preBootCommands} $machine->waitForUnit("network.target"); $machine->shutdown; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 2f8a6fcdad65..a729d5cd4efc 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libcdio, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3 -, lame, flac, eject, mkcue +, lame, flac, eject, mkcue, glyr , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , makeWrapper }: @@ -52,7 +52,7 @@ in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' wrapProgram "$out/bin/abcde" --prefix PATH ":" \ - ${stdenv.lib.makeBinPath [ "$out" which libcdio cddiscid wget vorbis-tools id3v2 eyeD3 lame flac ]} + ${stdenv.lib.makeBinPath [ "$out" which libcdio cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \ "${wget}/bin" diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 1d1d0d6a6f01..765f0e9e5a79 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,7 +8,7 @@ let # Please update the stable branch! # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ - version = "1.0.52.717.g2f08534a-47"; + version = "1.0.53.758.gde3fc4b2-33"; deps = [ alsaLib @@ -51,23 +51,24 @@ in stdenv.mkDerivation { name = "spotify-${version}"; - src = - fetchurl { - url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "1xqd4pjb69zmbac5fq3pckgr4khlkzfkx8b029qzjc2hi52zfnj7"; - }; + src = fetchurl { + url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; + sha256 = "1sh6bv23yx0fcbmf60c2yyi6411ij85k4jalpjlck2w26nfj1b3g"; + }; buildInputs = [ dpkg makeWrapper ]; + doConfigure = false; + doBuild = false; + dontStrip = true; + dontPatchELF = true; + unpackPhase = '' runHook preUnpack dpkg-deb -x $src . runHook postUnpack ''; - configurePhase = "runHook preConfigure; runHook postConfigure"; - buildPhase = "runHook preBuild; runHook postBuild"; - installPhase = '' runHook preInstall @@ -110,13 +111,11 @@ stdenv.mkDerivation { runHook postInstall ''; - dontStrip = true; - dontPatchELF = true; - - meta = { + meta = with stdenv.lib; { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx sheenobu mudri ]; + license = licenses.unfree; + maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 69288880cb2a..a0fcfe811024 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 -, mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: +, mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { version = "20161230"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yni9c17kl2pi9lqxip07b6g6lyfii1pch5czp183113gk54fwj5"; }; - buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; + buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ]; diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index bba66366e6b7..23cb16c0733f 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,28 +1,24 @@ { stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf , cups, libgcrypt_1_5, systemd, makeWrapper, dbus }: +with stdenv.lib; + let - bracketsEnv = buildEnv { - name = "env-brackets"; - paths = [ - gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 - dbus.lib systemd.lib - ]; - }; + bracketsLibs = makeLibraryPath [ + gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd + ]; in stdenv.mkDerivation rec { name = "brackets-${version}"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb"; - sha256 = "0b2k0vv1qwmsg1wckp71yrb86zp8zisskmzzvx9ir19bma9jzr42"; + sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp"; name = "${name}.deb"; }; phases = [ "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper ]; - installPhase = '' mkdir -p $out ar p $src data.tar.xz | tar -C $out -xJ @@ -33,27 +29,26 @@ stdenv.mkDerivation rec { ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 + substituteInPlace $out/opt/brackets/brackets.desktop \ + --replace "Exec=/opt/brackets/brackets" "Exec=brackets" + mkdir -p $out/share/applications + ln -s $out/opt/brackets/brackets.desktop $out/share/applications/ + ''; + + postFixup = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \ + --set-rpath "${bracketsLibs}:$out/opt/brackets/lib" \ $out/opt/brackets/Brackets patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${bracketsLibs}" \ $out/opt/brackets/Brackets-node - patchelf \ - --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \ + patchelf --set-rpath "${bracketsLibs}" \ $out/opt/brackets/lib/libcef.so - - wrapProgram $out/opt/brackets/brackets \ - --prefix LD_LIBRARY_PATH : "${bracketsEnv}/lib:${bracketsEnv}/lib64" - - substituteInPlace $out/opt/brackets/brackets.desktop \ - --replace "Exec=/opt/brackets/brackets" "Exec=brackets" - mkdir -p $out/share/applications - ln -s $out/opt/brackets/brackets.desktop $out/share/applications/ ''; - meta = with stdenv.lib; { + meta = { description = "An open source code editor for the web, written in JavaScript, HTML and CSS"; homepage = http://brackets.io/; license = licenses.mit; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 7e9c5e48ad02..26b4d3833f31 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -233,12 +233,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.1"; + version = "2017.1.1"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0pfsf7ykwixvljcmrv4gldaaflf13brch70cd6xpax0m89vm22vm"; + sha256 = "1222xkw7n424ihqxyjk352nnx9ka6as7ajwafgb2f27hfiz8d3li"; }; wmClass = "jetbrains-idea-ce"; }; @@ -269,12 +269,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.1"; + version = "2017.1.1"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1858jhmyyb7nhx08yxbn5bfgx9m32r8yqwjxjw17rf8gnfvs8225"; + sha256 = "18z9kv2nk8fgpns8r4ra39hs4d2v3knnwv9a996wrrbsfc9if8lp"; }; wmClass = "jetbrains-idea"; }; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix new file mode 100644 index 000000000000..ae4f1e6ad525 --- /dev/null +++ b/pkgs/applications/editors/jucipp/default.nix @@ -0,0 +1,73 @@ +{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx, + boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, + libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, + coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, binutils, ctags }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "juicipp-${version}"; + version = "1.2.3"; + + meta = { + homepage = https://github.com/cppit/jucipp; + description = "A lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ xnwdd ]; + }; + + src = fetchgit { + url = "https://github.com/cppit/jucipp.git"; + rev = "refs/tags/v${version}"; + deepClone = true; + sha256 = "0xp6ijnrggskjrvscp204bmdpz48l5a8nxr9abp17wni6akb5wiq"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ + dbus_libs + openssl + libxml2 + gnome3.gtksourceview + at_spi2_core + pcre + epoxy + boost + libXdmcp + cmake + aspell + libgit2 + libxkbcommon + gnome3.gtkmm3 + libpthreadstubs + gnome3.gtksourceviewmm + llvmPackages.clang.cc + llvmPackages.lldb + gnome3.dconf + ]; + + + lintIncludes = let + p = "arguments.emplace_back(\"-I"; + e = "\");"; + v = stdenv.lib.getVersion llvmPackages.clang; + in + p+llvmPackages.libcxx+"/include/c++/v1"+e + +p+llvmPackages.clang-unwrapped+"/lib/clang/"+v+"/include/"+e + +p+glibc.dev+"/include"+e; + + preConfigure = '' + sed -i 's|liblldb LIBLLDB_LIBRARIES|liblldb LIBNOTHING|g' CMakeLists.txt + sed -i 's|> arguments;|> arguments; ${lintIncludes}|g' src/source_clang.cc + ''; + cmakeFlags = "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so"; + postInstall = '' + mv $out/bin/juci $out/bin/.juci + makeWrapper "$out/bin/.juci" "$out/bin/juci" \ + --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake binutils llvmPackages.clang ]}" \ + --set NO_AT_BRIDGE 1 \ + --set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell" + ''; + +} diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 68f5e14891fa..74a83c1278af 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem +{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify }: diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index b6734d09d0e7..3d710296219c 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile }: let - version = "1.11.1"; + version = "1.11.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "14wdblh7q3m5qdsm34dpg5p7qk6llrbqk60md8wd0fb4chpvrq94"; - "x86_64-linux" = "0rmzvaiar3y062mbrggiwjbwxs7izcih5333rn208ax4jxmbk4pc"; - "x86_64-darwin" = "1f3zdwsz0l6r7c2k25a7j5m0dl78219jzg4axcmbfa2qcs2hw0x6"; + "i686-linux" = "0cd3iwd5aizixfxc6ayrpvx6k1zk8nsfhd8i3rgz4p4zzfnx6ri5"; + "x86_64-linux" = "1y3qgm7p1vchh02mqgn8d8pxxnifxfs6hbv01q8zjw3gb7m4anw3"; + "x86_64-darwin" = "1v8x466080rpm0rfiv1mr2adbpia6j5v9pbsspwm0ndc7ly0h71k"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 00c0da7a78e3..f11791016923 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -29,6 +29,7 @@ , libgphoto2 , libkipi , liblqr1 +, libqtav , libusb1 , marble , mysql @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { libgphoto2 libkipi liblqr1 + libqtav libusb1 marble.unwrapped mysql @@ -99,6 +101,7 @@ stdenv.mkDerivation rec { "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" + "-DENABLE_MEDIAPLAYER=1" ]; fixupPhase = '' diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index bee1f71a061c..fdcd7636c02e 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,7 +2,7 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, automake114x, cmake +, libvisio, libcdr, libexif, automake114x, potrace, cmake }: let @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper intltool gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif automake114x cmake + libvisio libcdr libexif automake114x potrace cmake ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 39f3a12b90aa..8d34a126daaf 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.82.0"; + version = "2.83.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "073iarhjsapqf1g8ji1w835biixybqq869flq58vkz37wjmray8k"; + sha256 = "1ar6hkcl50lhgwccss759201cqgnwasqmhw9japgnz04fj66w5ln"; }; patches = [ @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; + enableParallelBuilding = true; + nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix index f6dd06e6c896..7aa19ffb3017 100644 --- a/pkgs/applications/misc/dbvisualizer/default.nix +++ b/pkgs/applications/misc/dbvisualizer/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, jre, coreutils, makeWrapper }: stdenv.mkDerivation { - name = "dbvisualizer-9.5"; + name = "dbvisualizer-9.5.7"; src = fetchurl { - url = https://www.dbvis.com/product_download/dbvis-9.5/media/dbvis_unix_9_5.tar.gz; - sha256 = "1bdc03039b50807206fd72ecf8ba0b940f5bb0386f483e10b7c0b2fa75cac021"; + url = https://www.dbvis.com/product_download/dbvis-9.5.7/media/dbvis_unix_9_5_7.tar.gz; + sha256 = "1xv4fw7cji2ffvv7z8vjl5lap512pj60s2ynihirrqld7pmklnyr"; }; buildInputs = [ makeWrapper ]; - + installPhase = '' mkdir -p $out/bin cp -a . $out - ln -sf $out/dbvis $out/bin + ln -sf $out/dbvis $out/bin wrapProgram $out/bin/dbvis --set INSTALL4J_JAVA_HOME ${jre} ''; - + meta = { description = "The universal database tool"; homepage = https://www.dbvis.com/; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index edc8bbc3f77e..5b977d13796a 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,27 +1,31 @@ -{ stdenv, fetchFromGitHub, qmakeHook }: +{ stdenv, fetchFromGitHub, qmakeHook, qtbase, qttools, makeQtWrapper }: stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "2.17"; + version = "4.3"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1422kgj972ydasqqm0k02qf3v2py7if2ibri7yjg8awqilacy6by"; + sha256 = "15f686frxlrmdvh5cc837kx62g0ihqj4vb87i8433g7l5vqkv3lf"; }; - nativeBuildInputs = [ qmakeHook ]; - - patchPhase = '' - sed -i '/lang\/gpxsee_cs.qm/d' gpxsee.qrc + nativeBuildInputs = [ qmakeHook qttools makeQtWrapper ]; + + preConfigure = '' + substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee + lrelease lang/*.ts ''; preFixup = '' - mkdir -p $out/bin - cp GPXSee $out/bin + install -Dm755 GPXSee $out/bin/GPXSee + wrapQtProgram $out/bin/GPXSee + + mkdir -p $out/share/gpxsee + cp pkg/maps.txt $out/share/gpxsee ''; - + meta = with stdenv.lib; { homepage = http://tumic.wz.cz/gpxsee; description = "GPX viewer and analyzer"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 895299f75b64..57b844de97b8 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.20"; + version = "0.20.2"; goPackagePath = "github.com/spf13/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "spf13"; repo = "hugo"; rev = "v${version}"; - sha256 = "1dzvwldhf73ycmazq9xnridj7p3m3q6qv47rvk3vgj0xj6c107ij"; + sha256 = "1dvd9kiqp87cbf027kvyqb282pxs8qm16r1dk74l5drranfvkszy"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 176784ea7a42..2800a3ed5d21 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz"; - sha256bin64 = "1xj1fl0k0ck4pxl4q0cdhi55sqfmwbb1vcjj70idlz166ll8lpxh"; - version = "58.0.3029.19"; + sha256 = "1q9iqmq5amzfw03jiw18g1w285b6x2qckn8gc60r5m3xx1hbivv2"; + sha256bin64 = "1ddhhcydcwwc2pkwm4c8rlr60968zy5vda410g4bwx0v5q7p22q9"; + version = "58.0.3029.68"; }; dev = { - sha256 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz"; - sha256bin64 = "1wx5r3vmmki419llki0ls6y4z6r93zm66v2h4vnxswjb77svl578"; - version = "58.0.3029.19"; + sha256 = "0zvnj9n2p057fxx7n4d1qc0nw34qhlsvrx20fwigq96blamckvd8"; + sha256bin64 = "1s1r3h7x49bp64lzzphm4jcg7g68l0x7mr3airj3hqii58dvndm0"; + version = "59.0.3067.0"; }; stable = { - sha256 = "1r495ffcwxsd4pxn5akfr7k9iiv1dj0zq6w9i6xxii8knf8a40va"; - sha256bin64 = "04ig9q8j4xbgq749qprfddlgpm6g28jjvwwnqmvinymnrh4vc7cn"; - version = "57.0.2987.110"; + sha256 = "1xwchazqqx0cs9rd15r80kw6p918zp9libx34qlcj8p5lxq1f0bh"; + sha256bin64 = "0ggn5rljch36sx0i37qzp6ldcy3ibdj0z9217lqzjq3r7ixsfqja"; + version = "57.0.2987.133"; }; } diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index abc314f85699..32d3a8e1540f 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildEnv, fetchurl, patchelf, bash +{ stdenv, fetchurl, patchelf, bash # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gdk_pixbuf, gcc +, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -47,13 +47,14 @@ let glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb alsaLib libXdamage libXtst libXrandr expat cups - dbus_libs gtk2 gdk_pixbuf gcc + dbus_libs gdk_pixbuf gcc systemd libexif liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap - ] ++ optional pulseSupport libpulseaudio; + ] ++ optional pulseSupport libpulseaudio + ++ (if (versionAtLeast version "59.0.0.0") then [gtk3] else [gtk2]); suffix = if channel != "stable" then "-" + channel else ""; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ab010653c644..ed07225dd8df 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -10,16 +10,16 @@ }: let - version = "1.6"; - build = "689.34-1"; + version = "1.8"; + build = "770.56-1"; fullVersion = "stable_${version}.${build}"; info = if stdenv.is64bit then { arch = "amd64"; - sha256 = "0wn98nzlhppmm3g797kiqr9bxxff8l7l110f1w1fnfl93d325hrm"; + sha256 = "1f9cwr41rl0mqwg3xn2nfb5xnr0h0vc4wiz8367bd67zf4an61d2"; } else { arch = "i386"; - sha256 = "0agybibfwk5n1gxi8g4rbvvmlq5963df5arz4fyi4a1hcayllaz0"; + sha256 = "1240w3gqn5rbvkb0v1g66syrc92r1vzk82fkmvy92qsnx0d5z7nn "; }; in stdenv.mkDerivation rec { @@ -47,7 +47,8 @@ in stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.is64bit) - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs) + + ":$out/opt/vivaldi/lib"; buildPhase = '' echo "Patching Vivaldi binaries" diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 3347af83585f..6a8fe2834912 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler +{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler , ruby, libxslt, libxml2, sqlite, openssl, docker , dataDir ? "/var/lib/panamax-api" }@args: diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index e6b5b8ca067b..93d2ec93aca8 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "23.4.18"; + version = "23.4.19"; sha256 = { - "x86_64-linux" = "0hil9dnhmq4d4yq277w48ql3nw8yfzjqgafb0waw6zbc6a18l7bz"; - "i686-linux" = "15hcmqyfyx8z7qx3val5r7b9plckh50iy0mxxh2z1wbh96l03l3a"; + "x86_64-linux" = "09vjic4yi6g6rbliz4b56swqdpjgw0m7gs2n40xhvbqfd35prafs"; + "i686-linux" = "0i2x2s7p1lq315z8198wjlfqr5lqj3mxdcqxz44skrbkmqfd9hab"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix new file mode 100644 index 000000000000..f39fac2605a4 --- /dev/null +++ b/pkgs/applications/networking/gdrive/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gdrive-${version}"; + version = "2.1.0"; + rev = "${version}"; + + goPackagePath = "github.com/prasmussen/gdrive"; + + src = fetchFromGitHub { + owner = "prasmussen"; + repo = "gdrive"; + sha256 = "0ywm4gdmrqzb1a99vg66a641r74p7lglavcpgkm6cc2gdwzjjfg7"; + inherit rev; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/prasmussen/gdrive; + description = "A command line utility for interacting with Google Drive"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.rzetterberg ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix new file mode 100644 index 000000000000..781a4a18b9cc --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchgit, qtbase, qtquickcontrols, cmake, makeQtWrapper }: + +stdenv.mkDerivation rec { + name = "quaternion-git-${version}"; + version = "2017-04-15"; + + # quaternion and tensor share the same libqmatrixclient library as a git submodule + # + # As all 3 projects are in very early stages, we simply load the submodule. + # + # At some point in the future, we should separate out libqmatrixclient into its own + # derivation. + + src = fetchgit { + url = "https://github.com/Fxrh/Quaternion.git"; + rev = "c35475a6755cdb75e2a6c8ca5b943685d07d9707"; + sha256 = "0cm5j4vdnp5cljfnv5jqf89ccymspaqc6j9bb4c1x891vr42np0m"; + fetchSubmodules = true; + }; + + enableParallelBuilding = true; + + buildInputs = [ qtbase qtquickcontrols ]; + nativeBuildInputs = [ cmake makeQtWrapper ]; + + cmakeFlags = [ + "-Wno-dev" + ]; + + postInstall = '' + wrapQtProgram $out/bin/quaternion + + substituteInPlace $out/share/applications/quaternion.desktop \ + --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" + + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://matrix.org/docs/projects/client/quaternion.html; + description = "Cross-platform desktop IM client for the Matrix protocol"; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; + inherit version; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index ed78274c799d..0dfda79e767c 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,32 +1,30 @@ { stdenv, fetchgit, qtbase, qtquickcontrols, qmakeHook, makeQtWrapper, makeDesktopItem }: -let - rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; - -in stdenv.mkDerivation rec { - name = "tensor-git-${stdenv.lib.strings.substring 0 8 rev}"; +stdenv.mkDerivation rec { + name = "tensor-git-${version}"; + version = "2017-02-21"; src = fetchgit { - url = "https://github.com/davidar/tensor.git"; + url = "https://github.com/davidar/tensor.git"; + rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; + sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; fetchSubmodules = true; - inherit rev; - sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; }; - parallelBuilding = true; + enableParallelBuilding = true; buildInputs = [ qtbase qtquickcontrols ]; nativeBuildInputs = [ qmakeHook makeQtWrapper ]; desktopItem = makeDesktopItem { - name = "tensor"; - exec = "@bin@"; - icon = "tensor.png"; - comment = meta.description; + name = "tensor"; + exec = "@bin@"; + icon = "tensor.png"; + comment = meta.description; desktopName = "Tensor Matrix Client"; genericName = meta.description; - categories = "Chat;Utility"; - mimeType = "text/xml"; + categories = "Chat;Utility"; + mimeType = "application/x-chat"; }; installPhase = '' @@ -51,5 +49,7 @@ in stdenv.mkDerivation rec { description = "Cross-platform Qt5/QML-based Matrix client"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; + inherit version; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 46d7aa32e8a9..1b42957f908e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -1,595 +1,595 @@ { - version = "52.0"; + version = "52.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ar/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ar/thunderbird-52.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "83418f9890becd869c878f4ccb5f2ac9dc57103ac12818e4ff010b0ca1efc85b712692e81e458a59fdea8f878d8c8c77d7e11dd116d045db67a0aef278aab6f9"; + sha512 = "1543d3b17ac8a6a437b34df0b3d33081b86554107321716b534471c86415a80fd4cb7f35fb60be7482a7476bdc4d2c5f9fe29dbd8381ff841e1f0daf2007e8a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ast/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ast/thunderbird-52.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "7c97616d16f9ce706e878307fe11ace62f87e227c9f588bbeb6eda8c6ba51bdee280014c7c831629ca39c6fdae537506100a82ccc801887df8dfeb35ba336141"; + sha512 = "b7b9543253530cb3f166d155465d320d30138542974e71cc92e5c3be6efe12014ff2db5b63372297f7cd3bf72cd1a866606f1bbb288504b6a272e7820ada1bdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/be/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/be/thunderbird-52.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "cb7a99fd462c6b685cba2f95029f7d4225c0dcc95101523a9d3d807f8abc458cc4c0a035a8111d5655e7b47baef1d3b974b4a785fe1803eb09431b7f36129429"; + sha512 = "f9283894e7c9bbeafb8fa6dbd2aeb1756b8d2456fe06c4278741c79171197b505d9a3d4b8e1cc3b18cf22be71555e1eded616ef0ed2648958b0d4d07f9d96654"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/bg/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/bg/thunderbird-52.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f1b2f0001359bcecd3cc1c884ec089c4386fa6679521863b449e2e1cc90a70b06e2c555e18640695c9b5d1d5bd45952bbf489ac3d65bc0adcdfb02b1bfceac4e"; + sha512 = "486e2b3e149b73d3bc272546f7cc55b9d8da97d48808ca5aa0c3fc12d5bc0ea49c353f8b2c95ca398cc6938e67087f8ace8bd9bbbffe75712fe64b05994937e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/bn-BD/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/bn-BD/thunderbird-52.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "b08b572359340e813b71643d3f13b755143a8481343134cbdf49ba7fda1290c48f628c445d57cb254e87650844fe04e9eabf4e4340ec30465d82872aa3eb3cbc"; + sha512 = "da54a9b78deb56de84623e71e60083aaa53dd8180f6d63f6ecc5133af846e5f773e63ce9131dc751178210994765a4e3daf68c582e180dd25f26d4f8e95e9646"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/br/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/br/thunderbird-52.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "7bc083526e8aa4a9c6b59adfe237b25d468c4bf07abfb1a7f76d419e62b887978616337efa814f125d06e6f61361ff0a79ce1c2792ddd5723d7dacbb1f54efd8"; + sha512 = "b647bc0aa73ca1d4deca50f70d5cb78bc95663c7c1668464c1b2d6d0e944f69ad73de28dd3868a6ac3461c5e64e74e206d508569d52ae8aa2a1da8f1164c4d94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ca/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ca/thunderbird-52.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "06e73de3a64b80ba3fab93e08c8b8968d0e84c3f49896bec1c38b2fc35d3c52f5547f5d4ea21f9d2c335e202a078c1c18830e1ccc986823c58e351a85f4337ac"; + sha512 = "3c9562e14e20d90d76e6c8b39ef3047899fa094a5639ddffd716b687adb484a97cb6036e3228cdfb207086b28917b74fc44eca07408e7882f45941e50dfbfed6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/cs/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/cs/thunderbird-52.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "ec8bd4f3f2a6c0e695ab75ddb1d73723472df2a5a2e141a812860c1a20956ffac4a119de737d0adb766ba1f2c664d12cde40158fbffe555c94a77c8054e4e7cd"; + sha512 = "ed20a0b054d4e86ed1577c8a2672aa692ef47345243716f6dc840910b29cd915df75f8be9ac05bef385afb5721739fb08276c4bf48a51178fa46033c1131c1be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/cy/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/cy/thunderbird-52.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e21599c17c21c6d425c9da5ce5998c7b6be36040e0437bd742506c8cad93fbbe15ec5dd7b840b085f3f484d4b6bb99bdcb1a6a28a2610c13411b13a18b1bcb53"; + sha512 = "2dcc1d221db9bb647f5bf454a767f692e5eb592d1c6af52e144c55cfc81f0e3e05ddc2e3c4cb66b0031e09531641716009d062f340a5948233165564a3d5a5d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/da/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/da/thunderbird-52.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "1fff0b5ed313a1c404f86a41dcdc94a0787f01f5fda836713de5713697788274619520e40f48ad559e485e1144b898df338373f3ddc85662a95deb8c39fa66ee"; + sha512 = "1046c0ecf657a9c5b30e99175f6200e541bb5f33031f1a440b26d12d6de0c558e15f8c2f965a05e59f83c46849944e010bcbdeb6fe100672d97acf0d4038febc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/de/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/de/thunderbird-52.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ee7f739d8237d7d5f5936e3f520de7d572bbfd0ff19aca140381daf4b2353a42a7b6b79680440bc2a62321c8089619114bce99bc48a88aa6346228ef8d08012a"; + sha512 = "10842eafd14068ae5d2447fc2d3aa35066af97a6e49b88d38bcf37be1e754d2403b1c039dc09f418128cd9369da6e0afee278914dd41a2ce48cb4872a7d4d18c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/dsb/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/dsb/thunderbird-52.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "9439bdeb224ee48adc0af5bc882d3dcb2fdcb988502f9ede03d2ede67261c8007336414a6935f86690e622d70ddf933efe14ca9ef3640be3de46b6c2eba090bc"; + sha512 = "f7e6b05dfc94f64c988c761877d02ad3c66a7cc47e2818d267d7839d0b1fa7688ecfac8fd3af98e9e9318806a78e4559d6cfe45de0d96b7f5f8d411c6f6cf051"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/el/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/el/thunderbird-52.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "aa8a94bb35c36c0913f8b76944370ac839cbe1c16021f83b3b8c317e03cc1013e35fa502af3293611f7fc89f30513bb24dfc4d89e745364e85d674afe66a0d33"; + sha512 = "0ac5a23a38987a5af15bbb8e458a89df378b89fdd8721063d6df16a3658201ef1fb4f2d04b6272e1d9d43c1d2273df4cc0fc79b7d374f1fdaf7335c77fdd9381"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/en-GB/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/en-GB/thunderbird-52.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "01b79fa4b147fc7ebc07e29582e9fb567c4b0de565d4fd13a71279ee3946b9e182e086c6c3b1b4c413688cc3dc19979e89e5dda87ce10a181be0cb252ca69f4a"; + sha512 = "73f42d30f8fea9063e984d9b44c82aac545a20833133cead89ea147e92595e66da2a1f3d3bd0c09bd1584482474607e6856ba17ff80edff51b169aaba03bdfac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/en-US/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/en-US/thunderbird-52.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "a7e76f80e701b8c1cb1ef190d083d463b9e806ee77a467848caf0425b65bd19c51ea4a137bb59b36334fda129816eb26c9de753b4261cbd8f7040ff63bfe9464"; + sha512 = "51eafcc7466a2136ddad110fc43640c578d69758e53eace8da52a11ea86869b5d05e537b6132c3c49eb6bc6fc5bad77f2967a472c160963a41775b34600b7582"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/es-AR/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/es-AR/thunderbird-52.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "c2df311f50945e103bfa390413d8b0a4ac307f658aacb10b37e69eb6742756b8cac5221e27de5b96ec07e4f657851c17928f8e3dc0100b300ca97f9f643d05ee"; + sha512 = "b57cbef7843364917632605dafc056323adeb9d06da7e53a65a4450e009fa1f2c54cb5380ed886db4530e845bd6f39cd160ac90f19f99d63ca1f85af09ed77fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/es-ES/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/es-ES/thunderbird-52.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "3d54d936ce165eaf9edfe676a42eb4cb257fa8d18cdd98e4027ac8ac76d9264a2676f39ae37459915b17d7b2473057f076bea0a28a0e68570ad8d1bf8b25c520"; + sha512 = "408adb2ef60bbad16152ceaebc8f26c62fb829960e941dc5fc2814b183b780bd0fe79847351395321026a0ef53f703b72b6f4bdc233b3284d050e8bde35c0beb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/et/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/et/thunderbird-52.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "966d12756cea32951a38cacdcc2f9854f88f8d5bc6f07677274e5ab1e9b74c875995dfc226a6df61c8ea1901d14cc7971012a9152f6bc37e4def57166be84312"; + sha512 = "3186c5a026029e7b7b4dec47079b69b7f33398b2cf276b9bbf0b726d64709f176e45e31e0abb74c4302d693aae0ecafcde945c78da097cc2b0c1499481c78ea0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/eu/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/eu/thunderbird-52.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "ac1beb19aadbb0b0b15f53f8778e2b8109eb42913e8ec4b5817dcc31e8dfa8a6d40beb9e0c61a05507cde5d553c7af03587194129d20e388344c4d469a3b1b08"; + sha512 = "c60d3e2ab30e84628158ac65dc5c58ffe5a7b9dc7c3d5e5135456ac4be4d4734a4f4dc7d65c15f400dacc55fddc739934f3978f6184a93a662466b759938d1c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fi/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/fi/thunderbird-52.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5efda4136cc8152367e36a5c460a4f31c8287441599264aa4b5243173fc925475633529564c357385e511d2ac9faddd04c8bba5fa9c1ecfd2ff8e22fb002a025"; + sha512 = "14aadef508eabbaaf81a2304934f3848e3831f9d8df2413a49002be36f951c87355e1954d84d58509086c1b0e0aa1de5865edb733d0a07b655942830c83ffa18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/fr/thunderbird-52.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "75368ffdf22424aa919fd35f47813e13a80197345504c17b4e03673d1666431d4e455d1bc76a8f69fbc25853828d2f6a0b57b705bfd37cf12ca5a3095c075916"; + sha512 = "0711ff8a5955ef185678b27e8e43704c652d9024ab4b8558eddfc2c94f87dd24603f144f391f35580c3fd512cd44ca729253501495860e6799440e56c4895c67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fy-NL/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/fy-NL/thunderbird-52.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "58edaef7cb314a54feb5367a931314e5a0dc1b308f92372a815c7b1407ea783cddf84f0ebb0c8c59c217b3f6a9ad97873ba85641735db9a2503ddd76c26f7b7a"; + sha512 = "99e49dcc4085db1895b0e2ec2e7a769fb608415135d550485fea03ccc99f325771682f725c78578944c82b2f18aeb207c8abceb86db5390056d27c291f19556d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ga-IE/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ga-IE/thunderbird-52.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "dd3aae859b04cb9b945083bbe6fb17ba11fb8b218fe8547c6cd4a0d3adb85051f72bfe2adbdf80ec07066ce1aa03e825b2eb153509a0614d98eca8b5565b2755"; + sha512 = "f0bc291e1b3dc2e226aaa48e5b87c1e6690ccd04b4b62b36fc654e86173c9dc6ef47170524ceffbb59093bd4188a3cb01a894469daa4bf49a0a8895034d17645"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/gd/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/gd/thunderbird-52.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4230cd99c7aa2a9024e76fe52f438574384e682807c09981db24f30cf60dd76ed907f38b212e78b6250f8ee68727e91dcd20fc3b4ce74cd3ad303b9700818091"; + sha512 = "65388bee6e5f8255779f319eb0d47310762ac6d3ff6b61f3accb151e52dfff8e079aa16be714fe4a89bd722bf72b65f930384d555d68016a27b71bd236388f7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/gl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/gl/thunderbird-52.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "d393b4b18458ba2fac188c63bfdccc8e9247b860069606ce21e0533a8316bca15117086216408ae86df18fa3ccfc5605e8de51b80989beed38b55ed7b98bf6ad"; + sha512 = "64c439a0d2a75a3b9a460966c585913656884da7cf7f81f58e612c9f2523ac690a8585bca61e60fe31e13ed6f07d484e3dab6bff876fa247dc1488f084d8a6b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/he/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/he/thunderbird-52.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "3d41e16926d986129b1d7a717464956a8ae27c75a709789eeca4d8be4875627a740f995ca9e00072e12887e5caca4d3df8ba435a60494f84aa321a99bd15c4d2"; + sha512 = "7b20a5d996164daca9ce2d6af03a987eb67394eba01c942b29aca3009ee062f0c57cc011baede67c09a7b0dba63e029a5fb5753d18edc34c87926fd16651e208"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hr/thunderbird-52.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6d8698dcb0d2ced2e893aec1221086dabd7f4f351639281c521110e24c4177f5b79360a1324843c431b7535aa59d222ae52797710c7ad41143f4fb73fcc0eb5e"; + sha512 = "4419fac97644cf895021bd974e15466936b45babab7634e35855ddecb2575a43cf9be65cbf83c1c27648b58b656c9f6b4e8d454be901b479cdf86180f244a646"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hsb/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hsb/thunderbird-52.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "0298d90aa6cedf21002df84bf753b59addb072d187b0ea3170f85c041298591994f7f842a8d86db12374e5f00abd4178820168afee738a07ed886f27ac46e9f1"; + sha512 = "0f31903823ee2cada852aefa8d19b64ef9ee9e9f80fb709481c155a7a4c97169703a35e7de1f2b805fd91d98321dad81fe0321775c4bf9af5f01d38ab75c70a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hu/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hu/thunderbird-52.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "be3dc6926a5ce25a6942a5b33c6d3604c74a0d54b5ae1b4974732cc1fbc4718100fad6f5a6ad77706055c5d9d2c8c2fa52d766bd758e59f44da9db727aadd326"; + sha512 = "a2972f056d54b7d22ff090e43144ee16f38b01a1d6ba76dcebeebfdae086bde752008fdc89650947944bc80c82078f94995db8bf8daf339ec0a8fa5475435477"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hy-AM/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hy-AM/thunderbird-52.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "001726c9b817c9b5c34778e0e6f31deca7d11d4887dfe5707e7e386bc0ef8dd9acb20f5008711d7d51902fc114590712d0264ba229934859b0089a8993deadbf"; + sha512 = "47e80c575adae2327cecb5c41ed747c9d4da5ecc9e9ff8afc5dd35764b039050aa07dcbdb79d50fd7a4d8eff6f233f1a3cac3365e6a4db26e0058030d82a0f6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/id/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/id/thunderbird-52.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "df01723f6fda8f38241683972283c6d1ebf548251d5deb4f061e47d294d67271c72c05cac8aeb2e84afeb4a1af5ea29bbe6293a6a1c4654d597fff2e77b167e8"; + sha512 = "3d8f7a87727e772aa9435bf0e381703003f9a1fee98d71dd7f3fdb7add574a0c5245dcf8903895fa858ec2afbb9823d658db4fd800427d29c71ca93546adcd8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/is/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/is/thunderbird-52.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "12112dc6a40579f16bb9d7d0628a31cdb815d7da0484983be95a1ea6aa456f8690d8c0392b164cd365c94900f0b32acdf4a9a247e795a572da9c024d5fd56470"; + sha512 = "5ba20b28c08cf19f12acf887b92959a09cfb471776ab1805feda15ec4d406a23ab9c6c719a64ad2a65684f9e1bad00dd2f321285bfa85bf8e2f5aea5ffcc26e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/it/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/it/thunderbird-52.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "7dc5c3a52204e4c77f7cb16c40c583eb1617d952c8f887f918479ba3268a006e13cb8d3cf21379b53b217ce7cdc4295876eb9f7e6108760d6d283538fb455bf4"; + sha512 = "127471777e937b3b02f07bd66366680eea194171554bf7f11659331fcba414b49d0ce07457d754f5131084ea89d90d6e9d4e62929fe3d7c8c4a3d58b1b34b72c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ja/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ja/thunderbird-52.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "43d500330ca83420787adad7de1510a6acaa958f82a265e631191d1305ccb70c0ab118c78c1948cb466603b88d023268aa32900fec2e1d81ffc29050227d2c72"; + sha512 = "aa013a6c50d660a150b2b4247eaee467ca1a1a232d268121a8e8113386c9575e2667f4cf75c1e7ae77458869a9bd4d2f7972c5cb2aa919296bbf3aca44d48093"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/kab/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/kab/thunderbird-52.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "609464c5c9a86b7c645049c2c3ac63a936a0670250599290d3f6676414a112f43036bd2867bff462f8c1ba89de053041cba887f5568e519d553e0adbbfc42283"; + sha512 = "6f4f4b27c658103dd6c4a9d2c9cfdca09097539eef1e123bda9f11d185a25f0cb944e96d37e9a2c36664700948c4b052a5eaf463e4fb045fe6def4773b19a8c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ko/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ko/thunderbird-52.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "c3f3d2d5a981a8756a3b76048be1627076e6a822f1cd81c24bfc496ee6de2865744ef50715411d3ffd4db4389e72a1760130d63b421e65c8761a7bb673ce5f3d"; + sha512 = "4efbc262f563e03ec78a10658772c9c3b446e5c378159d35a68b432d1b582dac589723525a26e337a2739c0ea116cbaadfe8fae110ad172fd7268a7c5e76c50f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/lt/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/lt/thunderbird-52.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "cb746e1fbf5929225c91c2989d33b260fd768348ebf6c232586bd27b46e964f94443659270a6bf6017bba48abb93f533f8428ffda52996597ec8959f8efa3026"; + sha512 = "b1f1cbdd9642e283144200d716783a212948bec80e1b5d27046e80c22349e8b103e98f31bbbe392f4a1467805bbb28801b0f8c597808f03bc6fdc9110cef2900"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nb-NO/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/nb-NO/thunderbird-52.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "67d93508be6d5651707ff7109b5e80fad9db5fe442d05f34834c0c05610cee9aa8b3f2b61dae8705a1ab5b5b5addc089a52928ff5655b93d4c0870dcb9dcaeb6"; + sha512 = "51e675ca839bb7d205121b7023244a9716eb4b7f400c534f6b3a3275aceaf827262a816b790492d3cf01b6f01d64b7cb0c1f2385d1ecc74dad0f450f8d1b26dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/nl/thunderbird-52.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "6b40414449c75856280987b49cf3abe6f3725b89c2a53df3c11c942523d32e8cb3195ee49bae9dbe19d507473ac6b91588ed1e75df7aa1e1418a8ac0f69e326d"; + sha512 = "866a4d117196834fc415e6dc394c82a9cef6747c838068abf0efef5cb5e03f26d65f5c3e9ccd90fe7229a8785817736ee574d73424ac50633650bfe6c9848633"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nn-NO/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/nn-NO/thunderbird-52.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "65eff88f0b0f8672bd587693c1e7d55aded95d308f624e9dfd8731b2dec948cb7ee9ffaf484b35130a63fb6d9314ef8f044363c6b41f70f3e540876b109caa41"; + sha512 = "664d8941c433fc04fa836f1dbec12ad73ce3cf9d19d898c8cd6b6c9fc283380e7af27a0ab949881f5b6151595a6c584f938aee6f88e5239fa2de0403813c3388"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pa-IN/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pa-IN/thunderbird-52.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "0d4ac412f5d64aac841a1fb0dbdecfa80ff282aa8472df3e9e65419dac486e3086d954c17d1a535904b61b7907fc55d02376fb7a4c46dbc53f48f427673bce8c"; + sha512 = "4dfb57686154b3542fef873d08037fb86f7574260884494872433496b82f0b58a14710931fdd0bd5dbe7372658691b2e953a4fd794378a993f97fd6c8c9ac496"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pl/thunderbird-52.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "6ded5f995084a9fcee1a49f3204e2342216c9e04b5b7560e52283bb33bfe15fadadecbe9cbb6bc8643a3fc114b44dbe6c53af1b8f31ad3e3a53653f1fef944a0"; + sha512 = "47041481a2cc660bd6de4a018aa77ee4f8217fc7091b37ab8c26d1ec1dcb0678ea80130ee84289dcacd6266431da4532a66b041faba56f1bd8746e991c748a82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pt-BR/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pt-BR/thunderbird-52.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "7199ebcaf1c206fb93fa0c42118876e2e416fdeee9907c6f43ef0244a950a13ddb74282898b52b85cc2fee3f8fa7077512f3414a916fe1a839243b5823aba7f7"; + sha512 = "3001331547a05bf5b76620886096fb80cc594c625a335fc613408da5c43075c15abb0a6803cc34c740cef5d7ed9339e21c2db3a8a736901350674ab3b1024514"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pt-PT/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pt-PT/thunderbird-52.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e6290824e68970d66bbe1787c18062e7638989550f5303c5e42464416a74cdcd95c6005746fcb1ed1a4703fe53032eec1fda92cd0107ca244ee9b8dbc7ee6d50"; + sha512 = "402dc645810068339fb9fc18d6e3f025c48013281e3604e9a3da8228ee6cdd304ad3d2c10781dedbae9dbba3737fb122a3fd5abc3c856d1afaaaed2d7e23042e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/rm/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/rm/thunderbird-52.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "7a7abb88f8cf6d40adfd96c2173a8ecb1f2b4eec4e12111bd6af71837b6ed154086376164c0d3fff56eccf4039c3459e275d1fbcddb42fe6efc5c837816f1f3f"; + sha512 = "4789cbabb8ba897a508e9dff91fcf838eae8fb4d330f500bb7f545cf46efbffd978801016898bc89bd6f9fc558df2737c427c16e2ec40c0a7866301abd7450c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ro/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ro/thunderbird-52.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "27fd6ec6be3a876f2ef65f6cc65284609e03f07d71081c967bdd4aa789602cf3ac29885ca2fd710fd8f93491006f4d1e51e8106bae112cfe1b662e13c24b80b7"; + sha512 = "fbeb8ae935f69efe85b1fb45969b8142b197d340293034c088ed50cdb563466128e305f8ad2c1586c9c18c2fd5fd4042b95ac15aa9e2783fcda2c67a6aa941b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ru/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ru/thunderbird-52.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "19ca3df78354d2c6dbbfdbde975608b73bb4277351fd5d19f15183fc55b8daec2e8eb86edc7f59fe27ef8871497d54b30bf468d2f4f781dc1ec51ef77047feb9"; + sha512 = "a0a21b2ea3720b776b3a7944c1a9030ab80451a4405afd87f49b424326cfa69769e7e9bb54071c7747f4fe4af8f18fc3a9f8db73a848c554d9d4f3eded8cb9f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/si/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/si/thunderbird-52.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "28acca4bb30e303b063c88ebaf320799172421db9c859c3fec5b0bd1f02efd76e52cb82586d577fc73de5f2ee6464ff99dcb32351345d7d1aa28bb14fd856638"; + sha512 = "bb919c3b00f4122cfaefad1a88a68d3dcc88f09bc6db717cee14ba3ab76adc4b4c1ff32dcbbe0babe7336856c31153eb69e2297d88ca60f9e561aab083344710"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sk/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sk/thunderbird-52.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "f62ea125270243a9f09a2b3b57fdeca752da12788301efd89cb3a3ddb72b8bf4e8befe123ed843a6e70aa42c32b14e5fab8e323bc70383be0517082101dc5f05"; + sha512 = "c6e1e049a264bac92fc103b3242fa36dc38caecfe22b909c41ac86e570d7f3c9a7b39ad9d8f9f918fafb60f91e0e3fcd925a598c9f7deb6f7874a92436de6ec6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sl/thunderbird-52.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "bda98cb38a8334b1612ed72a286cc5df7d4310cc0a4f2a0bad9742a66a898c11f393b3fee48bef3996680ec32d7217e5b2b216ea8201d72fac234c3fad0a0bcd"; + sha512 = "7af3e5a875077f94ef0e7aefd1b170d8f8285fe99b9c59ef568c055253f812949127a37557b88f2097282de8f1615d272abdee51713b30f376b08300c29bc814"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sq/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sq/thunderbird-52.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "704a118df4a6279383e62c1a7a09e24ab5073540736979ceb69f57d2d5a4de39e7ec58ddb2384cf48a2924c4424fef2a405a4b5745b54ff63ed56d93a3fc31a1"; + sha512 = "ff37ad0845c95ff043c906bf80b7221a541a1eb038ee2be63d7b2d8d1cc8ecf26698b2fed0433334454203e09c98d4166e972e07968fa32e17d826811687613d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sr/thunderbird-52.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "9457f07c9a91a163927d1cd536e6b918fa7acaec4333a9b22ac1fb8d26bc528cd34346494184bc4d4172110620bd59faab3a2e036afd3a0f6bd871e4a8efdee2"; + sha512 = "487c92ecc4123607466a0e758a16dd87537be32750b12a206129281ec42afc8fc672cebdf948b3233850b8b31338abc829ef60f8a10187eab6bedcc11cd6e11e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sv-SE/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sv-SE/thunderbird-52.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "d9a2e8c1f76600cd9c8e2c1992269ce6a43891e58a9d870b2e2085beadcb46d7af322fa304a99c48dea2c91a68b5adc84094e179efd39034901d1f2c68686e53"; + sha512 = "e0eb86726198982cc14db6bf1c2b7fda2b60492ed318978c6c9349ad7514eb0a35798a3179ba1cc71c84f3219439068c957c38bc87207e5ad81c200378f5ea1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ta-LK/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ta-LK/thunderbird-52.0.1.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "68f61602b4a6a277639df162cc404c4ee2f433daf7bc5b1ad51372e5ba1a469b111d66837be27db3f42e56239f2c34d632a8ccd92fdaea58a6306da822070ab0"; + sha512 = "7a3ab20a071e8cd1728104c31260e3b443cf5c88e116240ce4575c544708fcd5ba386385c72d38b98c1ad76c1d58ff3553828d547e1e64e179521edbe5d31388"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/tr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/tr/thunderbird-52.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "511eb1a4dc9629b5dc7aee5fc47ea2610e367ac871814c6746094cf0250498db59da74b4e3ac84c54a26b4647d3c08b3e5252b6546421d071e203559abe942da"; + sha512 = "6ffd911857ecc23c6a41181b684cb9cf9eadc7a76ecb1cade7ae1a5cedca1cff5b18660d76d6b10d722f28493a618417ccf31037229a1af62281c04360a986a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/uk/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/uk/thunderbird-52.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "07e8b6be8081069ae6a33e30c936ea26faa1dd9018fe78bc0d8783c7e9f4aec35a7ee8ea8fa6fa0763348423f11b4a60fa34c4f64cce1cb45d470512a7b889f1"; + sha512 = "751b43543f7ec4684f4f71450aa301e5f63ea252901cec77593ff637fbb054a578d7fc13a58ba05247af46e86af11f1ec7f0151ab49eb4f824fb11c03c15c6cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/vi/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/vi/thunderbird-52.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "1fb6aa8661adeecbd3fde91e1158f102573e847a88b5ac2e2e79502c292a200edd4a93393fd5e44cccaaf2f91d7195722eb5e0df768fcabcaddb1681d85b5a48"; + sha512 = "9aa955924e9a7cf6dbf9f9ad94e9d8cff9f91cda4da5ddb8a1e9d2719081ba5adce1cdb57ec55a76473679c63dddc9ac95589503adfa5d4ad00afae6002ff4fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/zh-CN/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/zh-CN/thunderbird-52.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "807459ac5666d19595b2095c78116921b046f0cf3c7a4958d56fce8e92e81ac34cb62137a199b7489c72aef1226d29b0c39f34fb9e30c03b1ece12668a00ce1e"; + sha512 = "3bf34fb329ea1bceab24b0249c138e82c3725569ac82023a33d70c8a94e559f9d930b277bfb8df34571e4e2195293ee997de95c6dc22285be9e3ef15bd145ebf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/zh-TW/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/zh-TW/thunderbird-52.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f233f514a91b558b9b792d2c72fa725f1232786797c52d37d49974562f360b5bd94a02efad1aef751ab74d94fd18de389b6dae416497bb764b474c2dcf90fb18"; + sha512 = "f8928de4dce61b52fd69305023ff4893e35cfba2aa712dc34dc7deb024a36cd7c12a662a497a21e7f647b14779216a3aa2b6a01f84751860dea04b388b265c6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ar/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ar/thunderbird-52.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "cb89eb4eb32ac39202cf651aecc963ca0a1b215f5bda3e23fbade26da7c760e3e0ff06184f963904441c8db5ce4f12b34d5d28a6f119c80a5a20305478ed8b54"; + sha512 = "1a5f8a3da90724b1a85b63b7fee31d104e4ba1620b25e6823fa556d8f675335f3c25dce0499defbf8277c3fb6db98c58500aa6ec1460a194715d2d87942a35ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ast/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ast/thunderbird-52.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4cd5cdeea7420f5cc7f1dc2aac10f8db743fcac080a3ecd2b0af33403d364ff6ed711d4307b5126686e06f7d0e759c9f2ebcc69bd21b2eb297a3052a66f483ce"; + sha512 = "a4f5994657846378b0a472deb03d87fc30d27b35d9787c8fa53a7b428dbd4f3b0bef988863894606dc9b6c2370965353bba4b54140602a5acb7f3da433822f72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/be/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/be/thunderbird-52.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "cf4306a2fee98805722391e32f11e230b6b9c400cda8e555900126f6f19e03ef8e45268fbedc81b05a1a2b408b82e740c601ec1d315d3a34257a7513d400726e"; + sha512 = "2c029ac149cfab2eef9e1812dfaf755692265df49bc564f665e34308a1124f749a47850cfc19d1b15a16ee63aaa319ffce97e7025e894aa4a94c91cf81998f28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/bg/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/bg/thunderbird-52.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "0ac427d9b8967316e5b9fe434ac20d019e93fdc4a59f4f0914069d9b9b2fb4238f9f80d030df0b1d07893a0332fd400c2359fcc6dc7bfa728774adfd098fe25e"; + sha512 = "ece638e2a33645df20d4c59b157efc57650b591b78e774dc5f82174495faa6afe9e80aac62e5fa106feb29d5cd7369313e3a182adc65e7c9f870a7d0e9e796e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/bn-BD/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/bn-BD/thunderbird-52.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "035d95bedde2b80451c03412bc3b732f2485931421f0581c8b9d20b543fdd0237334e46e819d98762097dfe321ecd4e872495e6d7478c4632cbf793839a369ce"; + sha512 = "8c799ded0a1d090bc8a82044dbbe843f737d9e0481db6ddf33b1609e19b0f7535249677b22a53d71a3f7cf430adeb86421eb2383cad5c73317da71c2c15e50b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/br/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/br/thunderbird-52.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "156ded085c9800dd6413950e2fa26a2de67834ff48712a3a893e284ff8ec6e18f2eef02031c3962d72b171dda432ac679e6a31b2ffa0f766af1ae8ff6d6ebd20"; + sha512 = "9417121f1d26d5be82e4857b87283857b072e433e0d90c191902a118489f165add64a5241309934a0b91cb21128c92326a4ce98622a2b2444e55d5bf7ddf57ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ca/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ca/thunderbird-52.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "7affe51b4e92dc04569affea1165bbcfeb66468d7c1c1056ce03013c924af3de6c8d979ccb898c9985b0ae076bb662d692d11d7bbbd82e59a9b3bfaf0ca8c584"; + sha512 = "0b0e29ac69055336f5e157bb48d86316f36d86f0e984a11a000e4c4518478e8198cd4eb2d6815c1c6456d17c6047d92ff5ae0f6ef4f26a96bd172b8c0a8c308d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/cs/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/cs/thunderbird-52.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "0c5aaeb88985ac6167c0f28f4115eb3a95be16900677ccf0cf55fa99c7194997939f141ff2bf2d497bce9260628eb2a76083c7e3a1d81511dafb829fac2a91b4"; + sha512 = "6124454cd4ded6cecf953beab5fff1ed6105ba881624b83fef6c0d8798bab161a63abc3b0dd9a94fff5ed850f638feb95f5de4b9268b9ea71b9fb5eb52618407"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/cy/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/cy/thunderbird-52.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0776b21cfc88061b9550ca9a0c3d77a791dcb403f7355235611d4d5861c36a1cd0f64a8ae1de3e5d76bbc560f76f2d6819ca53dc57be5d0fd2a3ebca81d7007b"; + sha512 = "b1f0c7dae07a7130f1e9f2abfeff12008ce40f7486ef14964c17c7e665c3b4ceb52e48d504965da78993117f5bb12e14853c2a740b00a71c03574445f1129db9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/da/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/da/thunderbird-52.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f22f9601cacfcb440a8657a810ad903000b1541930df88766098e1621c883e8f320c13fd09ca7958ce134d93f7aedd22f659b27fd7c50329e67659820034ef41"; + sha512 = "5b1e6fd39cfd1d206a1a670a25df98ea73f490be5880a5190ab918b9ffc852000085c0ad89dec1dcea25c101a7ccc43bbc531f63a5dae95a515e0152dd2eee21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/de/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/de/thunderbird-52.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "6537e54372558d8a65f54e34aa5012b01d637f309ade5708ab040a345ec7c22cc07646caf0f84e68b5d926d24e9dd3d39fd121578ddd7027b2542b93005199f1"; + sha512 = "5690e0d91c4969f36805e21348fd5d868cf02dc524f24081b4af9afde85ec053a76f4b7a7746c591514973cf18b0e153b9e54112393aeea501e7696b3f63b0ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/dsb/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/dsb/thunderbird-52.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a913816a013a3209a071c9666a92e7a876e601bf22af4f3ad6b331788b4693967d5e7a9059dfcd23fa797c7222a303e6708ec3bc39e3f4acaa9650688a2bf4fb"; + sha512 = "8b5663ccb6402578181d84ae92a823d86c243fcdb77a25c69e6be660d137fadde4fae5ca5385bc393d9809ae06bb9b57c68791c8d06c864e710e9f33ab2183e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/el/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/el/thunderbird-52.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "81e8308d1911d45fc1b4da582fee526d52245e96b4935119da542f53434abcfc9d7319acf902b706d667e03e05f4e39c8fe6b5424fd2077c862bff102eab49eb"; + sha512 = "0cbf7aeb360ac59d4d4dcac603194c03082e37325c0aa08e79a872f819f5cb25484f0cd7577333194d12a80260ac665fc964b4300c49c2f96c6a6e885cc8b8c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/en-GB/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/en-GB/thunderbird-52.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "e93fe34674f8cb02e9fb2b2b2695c402e2a4cb35f7b4bfbe96c41cf27e6dd0130647d236a918c9595dedac0b7450aab4c8acfb9e2f18a99979b7099353447507"; + sha512 = "fd565d48ceeaddca038265577fef52643218afdcaeda5d022ea125012ed565628670aeb6db3822830a39b43b8372d843129dbeaabaabe7904e93a2389c03957c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/en-US/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/en-US/thunderbird-52.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "a71b372f1404b1de310494bef37b3d511318d050ce24109fc56749718cdc19a3812323529e9a4a9cb6e9d81794c600c62d5f4487595e4db3a1df444a40d97066"; + sha512 = "a0c4dbb1f39e9bacf8fdd7660d280142c072ab709204f02a2ea4eb7dab9a4475a121551c98fedb4cac2f1700b0adace7e7af04decd8c2d65bb14a4bc58bf8b59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/es-AR/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/es-AR/thunderbird-52.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "bb38d967c613da3122ee421b95d5fa633581193f4899407125403f13d754f1061f78770d342bdeff0e597e1ce813283b25ecb6556aa5bd095f40386fb4e6b563"; + sha512 = "205893ac76ba91d29ed6f169da01b0ac548e03985eae64955c5493969060c7eb31b6fe0557ecf17301576e1a4b637f2615818ef38322f91bb366c747530dfe22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/es-ES/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/es-ES/thunderbird-52.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "77c8da8cd474ea74b0313efdea0bb428bfe164c243178fafe75075b71df8eaba764d7ae9258d00ce02fce3ed4648ce839c46f3f9e431e0123bd41bf313954fb4"; + sha512 = "6ffbb09840acf9033a7f1f1b19e81d6d51cb90f2578c741c42a81f2e7413d4e9f47afbf756a7b317dd7e7d66ffd025c0d2af31c765c7a8318a291e63d4eeb8a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/et/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/et/thunderbird-52.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "323bee6b4005c78c95f1621e9a89d9faa95da44316ce01792e7488b00562d1d64ac23dcf7974d5162e52bff4b9327cfdcff0a85524869cacc4431fe6b1450436"; + sha512 = "79907c40de73a6761bc94b72395eddfd44cac795c6ab0614e764f467f59eb506829c9957ac3fa338feea8a900134195fe549c6b4568655078904337755319523"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/eu/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/eu/thunderbird-52.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d90d4364e891794147ad447f3248444218422f6140e7a202554f25a494a2fdc399823f83ce85edf496753125076b83e19a28987b2dab3aff582d1e860a238d73"; + sha512 = "dd799f923143380e7a639a9ba313e24dc4457e6a0ec9d6b266103e64c606db2ee702f56fca746049972b2fb63f03713307ee7a19ca7b3dcb93ac6d6cabc897db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fi/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/fi/thunderbird-52.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b0c9a426eb74f9a8ef3972f40d4a5d73a1eefadf402e65a137043ecdb9f4e0b79c4e84f78c03afaa3d6f0d455b62ecece1861bc289091f5c2354a226c7e10ffd"; + sha512 = "1aed6627a6a0a72d5e0d52b1831d4f756205d92aadccff43a1b9543d0d426b2cea3b9d20ca1829f29b1c9a1a832a43a7cbe9b870aab138df3133c2e886d826c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/fr/thunderbird-52.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "9e44644cdc545e52e230e440e2277db6b465a5b36d00c7a7fdd65bf8a141e98444682dc1ab8ce2c85d15ef82e739fe3fc7225c551643244d565a06e883227dca"; + sha512 = "c3d1fc74da5379825e180c3a3d0569c83a3f0098eeb396fd73eb3470d054207317506fead5b116a32b7a3e2a4c7c98431da9eb16548daef3baab052d53f432ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fy-NL/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/fy-NL/thunderbird-52.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "f3885565bf6bd223494c2169655844023732207172808d8768f148416d8e56eeba3a154e4b9526bd5799cf400369c7f25e41a5a1b78d17d2fd266f6c1de6bb38"; + sha512 = "c557220187979d06f1697511a69dac852c3f6662e6474b9d8bd0f0d49b5211d5963b1b6dc75a0e3f831bc724f3e28e0548da7cd67e8ab90c29901e07ec802f03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ga-IE/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ga-IE/thunderbird-52.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "f23f42508eb4f4deff3e5b7f39e5ff5e54bf2c973c56a9800036cc1add4b64b0c597babd60a045ed51cae86c025f8455dfb11ad0c1ecf1b774529810519c4ebd"; + sha512 = "02b3ba15ab86764cf41d275aea8d39310455e74e0f00418c91151bfea623385efe0c59202dc499a7f3e72cb6c64c7c30ce35663c1fe69a761a1761865f7852a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/gd/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/gd/thunderbird-52.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "05b37eddcb7d8f78c0676bf918483144d98d935736b562c9fa4b60d1bf290ead4cc9328198da86379d8ed3055d4ed36170897567b3f1273824f7242925d8f55c"; + sha512 = "24086d6f92611b0b8a9e3b79e42a5494dca7147bf8597df33d5d3ff745a1bac41ce39156f7df43bd6c21b4e845474ca085f9082cf4207cfec982c50a88fc6c16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/gl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/gl/thunderbird-52.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "59fab273843a9f1fba78c19d63bd61c0cac0fb28ecc78549dcf4d52955dc108b5e4bd963e49652c4a7e8e4b6c66ce9e62d24a8db6b67b76b234c860d889942d2"; + sha512 = "66b9b1f073b352a6c3147e44631b88cd79e1985a4d6dabea142170871cb795778edcf2e7c2f0d4b94dbf35b24783b26e30534402d2a5e05cf2587609183820f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/he/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/he/thunderbird-52.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "63ad6fd03ce2503431d759d56f3ca92168a7eaf1d23aeaa7c9be5206c94d51813f3ddc06489f2e47d2a182e8dac425e35031b9ddafdc8de34a31f0b69d4c8771"; + sha512 = "b52223e1314043ea50a70184e7812533b389cc58c6e0442daa96975955645478ee161e60f4a8e4f517164efac83e0157bfe6a88d25d056f3849ebd3652b39d56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hr/thunderbird-52.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "3184f7e69c48ee4972aeb4ff7c59bd5db99e5afbab54c82271059c9c2a5d6d42fee1f31030ca7c92812486d9e4c457bb35984a1dc5c055ecf9f7ad9f8e34a986"; + sha512 = "010c2ae0a21e167613b88c110ed93e6e60920e8343c6ef22159dddd116f2cdaec18a6545132bac87d828ea717d6090979ad88483093cc280f9f97292fae1e456"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hsb/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hsb/thunderbird-52.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "4b8a847889b02b04e80301756e403e0c1d8c38db7ad5c74d843e25f29ffbca1e7449d9e6a4ccb55042f868e3c8018ab00f6f4cd53c86518b3b922618c34b6e7c"; + sha512 = "1f7b6864a4760ad77c3b93f56eaa80f07c89cfbbf03523c71c74f7677c4a3b7b54505cc720990308477316d7e30839916b1c51cff8d3cd5c9af99919df8a3f38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hu/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hu/thunderbird-52.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "e0887449cd5668bd06101c637a235d989c93fc831f98b09c7cee031de439d7db9b0a8bb50c1b4fce47bc6c9ef8769d84824e211c7812fa40fb962f88120b9cf1"; + sha512 = "5ef71ed0803dfbc0c4ecb28de017969e40b9df3c6099866863004914fff1804a010f721d779f43e6b240d7b309b7877664b5d96ea2c5dfef6fe0403b3592c359"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hy-AM/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hy-AM/thunderbird-52.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "f00f3d7c58eedffd39d012391c9464d8e0411fd557d1e52191e635503fa5610bb01137c062c455d9174ee83268f81218f9dff9272f4ade078c003f352a16e4d7"; + sha512 = "2271c6d528dfd2e61c98dc976a0aadc20d39bd8d1e7cdeefe7cdebd9e0eedcfc17e6503c8b204d560b2b9bdd05b5a87de5b0422268e39ef8fc1a31874a7807e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/id/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/id/thunderbird-52.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "7e0fcd2d2773a8f765c21b00b1d1945113219ad6834763aa491fcc570c5c536ebe0089c0f0495794d36a2691674fdcb8b22bd95de5a5dbef2f1426024b2bbce4"; + sha512 = "6469eed9762451392ff88ef76a4811b4122413050c4eb5b7f7ccc97e34ae0ce5c00ac8ccd41aeda92a9478d335f62bc2055e7200d1bae5217cc7370275ff72e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/is/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/is/thunderbird-52.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "48d7879aef3e4528c4db7a86cc28dccf31087d171e103ed9b7bfbcab8fb07ace3353a259edd11ae20bf86ddacb31f2c11d96d460a2a2a8ca3c3935fd6d8c5df1"; + sha512 = "6b46c946d456408152f7058540a1247f278b0d228717f089582f11a2e6c8221834fb09da48c93aa8ccd68fab537719d0f8ec3b16cd043ce6b59113cce75d1018"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/it/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/it/thunderbird-52.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4a3437fc5e64ac4e0ed674072ff8311548cb0da1c29bed28d7d47c935aa906905e0d153d00ae434899f281d5efac9c306b2456b58c131369ff993f405491265a"; + sha512 = "2fa1ad4d939fd916e29d3f76bbc55f2eef4823225d32bf2292e03fc59c81d24657aabdd228df092e4039ddd555e7ea3a39c840bec58154f10c8535a79a2d3814"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ja/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ja/thunderbird-52.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d148936fce3b77cfe79c3acd195bc837eba485d6600dd2a19a9d76765435ac6fc6688473eb8572d4bf40461dbca5562cee4baefc9c98aaddb03679748ca4c36c"; + sha512 = "c4ad832486169e0bbbc1a14a7da399e0149b236a8ad9b71ec723a6c9098c4c90446e0c2c8ae0e4ccd78a48fdf8096f6b0290b0f6ab74469a53b8259358e6ea03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/kab/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/kab/thunderbird-52.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "64e1f2044f8dbb1664d8d4ba85514ed17b3c49a16770c4b64e10873e092a9424d939e7fe6bb8d6d1df5f9f3663e259206fe83149f45de16aadf6fb16a8b04755"; + sha512 = "9cfafbe2030610fa01901600c6661af69f9bd66f10c76ab227da966cc860e4a1ab9c07a80b3901d72ee440762536ddd0c1d478539f1087215dfe130e507df79a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ko/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ko/thunderbird-52.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "886566909754431b806bef2f314cc3fcd7330e2df5119c2bf65f5f48a9cf7bc378253c4e1f1b8b6cfa409962d6a801bd6547bf2071738ee1b20306fe64318748"; + sha512 = "640c0f3466aebfb43b88e8a580797661a2eb016f4eea4d9dd081009f4bdb17008bbcae1759a2d70d8dda3159f024813ee943b2a88a0c21a97f14f4079dc7744a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/lt/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/lt/thunderbird-52.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "24377735d80a0d23ceee9b5594cd37c277141b7ad33b146c7a304fa1de66326adf76443966e17fbb1995848d41374cc44137a8b2956e1254744d50a643e4db82"; + sha512 = "9a5c403ea9456d2f27b77c7a46120f45eddad60fc2d93617b246d5b7b7cc59a93698d00dfc35b33997cac5ff71ffb036469f63e8553cf8cc6a73de8959b76b9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nb-NO/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/nb-NO/thunderbird-52.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d53d4089bc057a66cd785e263272962765b2c02eebce6e0830c84748a17cdf09d478f329b486532fbbcfea13967060d2ea2e758b07a8a6cb0a6b56c0a95d611d"; + sha512 = "c485347ea4518875bcc384259bbb63b1bf2b6c1e5fb76e7540bea9ac664c0f6b517c563144489ce6ce3a65fc6aa9736088040020e073627fca032ae53c3c6e2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/nl/thunderbird-52.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "2d23cacfa1166315e5b30562e620bb8f2fedefe62b3478d12ea4bd2a3f9bd24b29022df9c14f76756cca05eae7edc134c505faae8549f701074481d7ad3bb5ae"; + sha512 = "fab94d96dd0a0cd8370c336acda2049c58c73b7f22f7975d8304a33d81950ebf82a14a335dbea02d8e78a63512b4bac041965516948812d9ee833342fd54c951"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nn-NO/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/nn-NO/thunderbird-52.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "518f61379d62f38a1b496221bc898108a693c3378488e7b450c3fb4b133317d9ca92e17e93cf502a8e79b8a3254763aaa0f6b1513487089da514e8c153c432c1"; + sha512 = "63917ddf88f0731c228bf04513a753216c9393f2a9eef685ef36d0d6d442491e6eddcbf4e77cc87c4b588878667aec08c4346f3418a148af77585b0b037285b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pa-IN/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pa-IN/thunderbird-52.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "7ede43d3c8e60529df4ffe62a1f3ebe3c6420f8601c7838afceafe0ca553ac80328f78d82fc04ba68a5af69b71671722509697e9c73ebaa9603f6de0bc42ada4"; + sha512 = "c49d476f02431e3ef23680ffb3dd58dc226e5b6c25003df7a98bebf69a0bb0167d60edc0ff764c9e36aeb9e7a06f19fec4651bee293f986b30688cec2f6d1d9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pl/thunderbird-52.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "18a211aa55724882f3531a8bd588bc418d5d136eef5ad027c18c5b00bac7d0bff6ebf4fef8d3a1d49cf46adfa10040b2cae1e5f039e817067319c66e5af6715a"; + sha512 = "3764defe3440f4c283d9c9e806c05653017f70921d84778a40d71bfc4028d146b8aff5114631050fb3eca8c9f1b33e40f5440c647fadf238ce36dc0eb5245a27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pt-BR/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pt-BR/thunderbird-52.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d5f65af63813b27454d21df094c5b709a1f590144853e9082814ca525ee75f56f1d8aeb9df09bc49c7eeb41eebab6acd46bbc086db4f70c54b8e7be3f9939fdb"; + sha512 = "3c016085676d2fb8b98685d7785f4163ebe4382f051760f2596e072f37c8d5121cdf87b5a90448a1360213fe2f6c1c369be04d744c22d39f7ce4dc6135fe458b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pt-PT/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pt-PT/thunderbird-52.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "66677c8d8e2c9c38b7efefad3ddb14586f6bdeef74087239c7a16e66062afeb719b928a29a516bd720a716d1b05c4e8bcf21cd84f641140acc96ec1ab85165e1"; + sha512 = "79ee1c273c74993b5e98ad9fb3c8434284e414dd14a70028525d214454f83ee1a1475531dd001d1b34ec37eb903f12f9675b388e7728c51c52164020e5cda0db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/rm/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/rm/thunderbird-52.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "2692412244a2153ea701cdc5d6b41caabea82440d5f9eed85ff1024973d287fd0c60066503c8f5336bfe36a9726a0a4df8e30c2181b7d66206c6b3a23a32582c"; + sha512 = "f150d1652924fc6a5f3ab9116a1000c08c99cc597fb433c3c27a4b4008768cd63034ccf6ed75870fa4444af02cbad33d0d11433017a3df461d98af59c1d6c8d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ro/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ro/thunderbird-52.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "3592cb39b622983758c8513a977a2acbd168699ccaee5fb8b6e7cc1714334e4cc48bb48712a764c4a6954d8fbebfa5a1156a89cf41b488026fc2713934a06319"; + sha512 = "524f5266679084fa3d3dd97daa66d2c1c729c70e9d1a77dbb6565e0d8e15dba507f33c4ce4e4ab11a31f69dfafcb67b0d7ef2b20c21b8d98608d242f63313e2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ru/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ru/thunderbird-52.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "df0ad7e0248a0471130faca0fe09f28725352927f362e906365918939d19d0d18a86fa84058463f59376ffbe4f66d574a10823b5e88be3eed8ec39d17c2e2a7a"; + sha512 = "fdc15364d34e676db345189247033b25a6b7cff4cf6b0096845a672e0ecb4d5ae41105b139c6814f359c5f4c2cdb2165faccca1028fe085bca1dd165920030e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/si/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/si/thunderbird-52.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "67c3c007ab101d5528613913a75f512befedb6d1cf1f105c19ffb78a5906c2fc6ab01408a290da58cd04667b6c851219aee0a0df7b9a42d1d7f82b244e046d42"; + sha512 = "d6782f94a20cc654801f3f17cc0b01fef195423b83c4f0ee9582de6af4f7fca97ec12649ae0de432d9ca2f3f1519b399a82609e70f101cea30f85e377dbabd4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sk/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sk/thunderbird-52.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9113fb1d2150c191abe647b761eed5747341ff779e1a02b724f604fe1193b845130cda9585adb8fd4e8f23f9a3f22a5c8c90f9acd5b3381d3f26eb95e5a74259"; + sha512 = "0c3072655ebffc0527f678a1b68cf56b117ea7b247891e12b80c22f2a4936ae087dafe17144d58a406d5b5bf38d2e6090c5146b6d3d34fa5b3ccd911cc960e58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sl/thunderbird-52.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "1ae92f74625a1fc54b0cf2073c8c687fe853dbdc318cc10a2e997f4b6e8062b500f5761128a228987a81f86a2f501163e5fbce5fde05c41a3e2ce0d74c2fc14b"; + sha512 = "439dd725c83bf40b258712385ef8a5286e92b10dc77996c16c6cd22589f7ea276ced47788bae29a6ecc3d2d785f25ce99c98a18fd4f9e0330478645803cc0944"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sq/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sq/thunderbird-52.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "45312d0b18565df69734178eb03b58cd0ea813d7ae099edc03d871a763f715483d9d6a4c375c4f4e6a081d59809beb789c01f0efbe047a6a5d7af40f3280a517"; + sha512 = "59b342d58a04cd4b71f1ae67ba66e3d10f4f464612f6e072c838fa5cf3479ada72fa7be09a10508dcc62da10983cd284f20ca6e4e6874fc92433337332733d51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sr/thunderbird-52.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "61756439561a7395b7f9bd55dbf16e73def6e55469a2e4bdc84207bb9aae5761002411900ed8e31e1a32c2f854b95c9ce0f35f17d15fba673b4e61e07a9675e9"; + sha512 = "1cb49257c91ba6afa41aeaa60380b812017210ea102dec90e405fa80ba48fbf8df70d4128c6c0bbab3bfabf81ee21b06c8180f38cbd87715093ae872f4c941e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sv-SE/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sv-SE/thunderbird-52.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "94cecbfb7d6f6ac060fd2b2aabdb3e049832055c969fa7d3ff518a91b3ccb39f9902910bd282c2d8796e16ea641d6443e4a87545c2328e34e6b567ce6cd2dad1"; + sha512 = "28c6554e85186f5eefd79f63c9d0b3d258ce76c29156e70c1badbfc71e201ee82889223d7c60a98e3fd44644937378892725136781e9a1644007c80207ba1cb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ta-LK/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ta-LK/thunderbird-52.0.1.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "05b4d35f6288944f0fc527c0338ab5cb204d5746b86265638fe66a1921297ad2a6de166782fd5948006d6d71a70c62735afd4936a87b3691d975813fc4ee0be5"; + sha512 = "9f04041814a6f806b9b24aceedb9a7e608384b65a9b607994eded3813af83467c4ab8d85beb972775da7daaf0a86ab55bd74bbdda2a499323b6761550f568a61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/tr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/tr/thunderbird-52.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "98e5f9e9d2f90c6d5b05555f6977bf00179fd8dab49afc2aa157f36ec1c58a5e87043de85de90ee03c7db985f00855ee83d30537b2e514518e90ab782031b426"; + sha512 = "bceaae576db6d1f49c40e9e361b77580f5bf142945ebf20b3cf38b0b61d8a68a2b9478b5a1dfea114daec363aec5934fbcef4ae88638626fe3ff93a28f07ccd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/uk/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/uk/thunderbird-52.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "1495bad171ef4cb4f32e5b02c63c7cc2b8032485192adf5e5d8d8bb8fed897e98e6ead1bf1c71f131178e0059905c82296fb2ab4275c5c979cd963c4176246e6"; + sha512 = "e88f4f496e3dd19655e76a3b79e4519a05e76390fb3acf05d194a300bc459a1e66b082a6150b9f4ec82308c881de402b30474764f946f81f55c1ea6e483e4161"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/vi/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/vi/thunderbird-52.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "23f96b086356818ee9d451651514c84212e98b0616021789e9215dee2a97cc43d06373162860def7fbe00514651b6fa0395ccebf4823a7e5622d432467dd0365"; + sha512 = "1c361e41b1ba06d9a08cfbb5532619311d81e3a7717eb0dd2d289195f198be7fea2558df707f97a49846fe073a0c775cfae610ed3fabeaa2cedbb1fa7c21d8ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/zh-CN/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/zh-CN/thunderbird-52.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "129cf69e007ea57550ee0eafcd086050ad3c70ef6671f7e56f12679bd9fafd40916e206aa932fb339bb361c4d4894bb6aff8199334c21894d48e01bdbe2a9bd5"; + sha512 = "fabe94285cbc1ca40e398dd41747fcfb0a51aaefe3346835ac6e3946d5d8ce1610d39c55276e2c6e02f7a1424af46a06529d5533aeb83b8448aff0dd9183a6b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/zh-TW/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/zh-TW/thunderbird-52.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3fcac7432ce9e1ef4edea97719628374d50173dbb0623866c9bc6aa9644a4d1cebbd640e7dae969b3a7bd067cd29a6d4ff1fb58c18f3eaf3e12c1f9d87f222ce"; + sha512 = "f4764c8fae1231d1e10c30baf99583c534fb403ff03ca9a61a472d932645590ee863b56feb13df13438a7eef83e55445be196a9f62078a0e18961edb043bbec9"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 69286202823b..bb82cac0e84d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.0"; + version = "52.0.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "215de8ae386f6f12d7a4338bb03bac956410be0dd4de5cca218e12241e3948c8c2540756e149bfde597cd10e399b4cb4db86619a2aa50a368ba323b413c1f93c"; + sha512 = "7b8324a230a10b738b9a28c31b195bfb149b1f47eec6662d93a7d0c424d56303dbc2bca6645b30323c6da86628d6e49de359e1067081a5d0bd66541174a8be48"; }; # New sed no longer tolerates this mistake. diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index adcfa656eb98..3ec24bb20226 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -123,14 +123,14 @@ let }; gitSource = rec { - version = "1.3.0-git-2016-04-10"; + version = "2017-04-16"; qtVersion = 5; # Needs submodules src = fetchgit { url = "https://github.com/mumble-voip/mumble"; - rev = "0502fa67b036bae9f07a586d9f05a8bf74c24291"; - sha256 = "07c1r26i0b5z7i787nr4mc60799skdzsh764ckk3gdi76agp2r2z"; + rev = "eb63d0b14a7bc19bfdf34f80921798f0a67cdedf"; + sha256 = "1nirbx0fnvi1nl6s5hrm4b0v7s2i22yshkmqnfjhxyr0y272s7lh"; }; }; in { diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix index 72f6c5de8a19..70d5180191e9 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/applications/office/beancount/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchhg, pkgs, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "2.0b13"; + version = "2.0b15"; name = "beancount-${version}"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/b/beancount/${name}.tar.gz"; - sha256 = "16gkcq28bwd015b1qhdr5d7vhxid8xfn6ia4n9n8dnl5n448yqkm"; + sha256 = "1dvnpgja4v4k5zagfsmdjavlib0z3r9r4z197yvj86szhzs0z86k"; }; buildInputs = with pythonPackages; [ nose ]; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index a246c7290a56..437a0cbbd133 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,17 +1,19 @@ { stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }: python3Packages.buildPythonApplication rec { - version = "1.2"; + version = "1.3"; name = "fava-${version}"; - src = fetchurl { - url = "https://github.com/beancount/fava/archive/v${version}.tar.gz"; - sha256 = "0sykx054w4cvr0pgbqph0lmkxffafl83k5ir252gl5znxgcvg6yw"; + src = fetchFromGitHub { + owner = "beancount"; + repo = "fava"; + rev = "v${version}"; + sha256 = "0g0aj0qcmpny6dipi00nks7h3mf5a4jfd6bxjm1rb5807wswcpg8"; }; assets = fetchzip { - url = "https://github.com/beancount/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz"; - sha256 = "1lk6s3s6xvvwbcbkr1qpr9bqdgwspk3vms25zjd6xcs21s3hchmp"; + url = "https://github.com/beancount/fava/releases/download/v${version}/fava-${version}.tar.gz"; + sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz"; }; buildInputs = with python3Packages; [ pytest_30 ]; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 7656668f0564..8a3645705ab5 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_1, graphviz, libsigcxx -, libunwind, elfutils +{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_3, graphviz, libsigcxx +, libunwind, elfutils, python3, doxygen }: stdenv.mkDerivation rec { - version = "3.11.1"; + version = "3.15"; name = "simgrid-${version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/33686/${name}.tar.gz"; - sha256 = "0mkrzxpf42lmn96khfl1791vram67r2nqsgmppd2yil889nyz5kp"; + url = "https://gforge.inria.fr/frs/download.php/36621/${name}.tar.gz"; + sha256 = "1s595wc4z8hkvim3ypfdxy16pply6ckjg10v84cc0lx9pz6i3r6i"; }; - buildInputs = [ cmake perl ruby boost lua5_1 graphviz libsigcxx libunwind - elfutils + buildInputs = [ cmake perl ruby boost lua5_3 graphviz libsigcxx libunwind + elfutils python3 doxygen ]; preConfigure = @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # Enable more functionality. export cmakeFlags="$cmakeFlags -Denable_tracing=on -Denable_jedule=on -Denable_latency_bound_tracking=on -Denable_lua=on - -Denable_ns3=on -Denable_gtnets=on + -Denable_ns3=off -Denable_gtnets=on " ''; @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { do sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' done + patchShebangs ./tools/ ''; # Fixing the few tests that fail is left as an exercise to the reader. diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 281a39149867..6e0338da9194 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -30,6 +30,8 @@ rec { diff-so-fancy = callPackage ./diff-so-fancy { }; + ghq = callPackage ./ghq { }; + git = appendToName "minimal" gitBase; # The full-featured Git. @@ -68,6 +70,8 @@ rec { git-octopus = callPackage ./git-octopus { }; + git-open = callPackage ./git-open { }; + git-radar = callPackage ./git-radar { }; git-remote-hg = callPackage ./git-remote-hg { }; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix new file mode 100644 index 000000000000..4ba86a2a0866 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "ghq-${version}"; + version = "0.7.4"; + + goPackagePath = "github.com/motemen/ghq"; + + src = fetchFromGitHub { + owner = "motemen"; + repo = "ghq"; + rev = "v${version}"; + sha256 = "0x2agr7why8mcjhq2j8kh8d0gbwx2333zgf1ribc9fn14ryas1j2"; + }; + + goDeps = ./deps.nix; + + buildFlagsArray = '' + -ldflags= + -X=main.Version=${version} + ''; + + postInstall = '' + install -m 444 -D ${src}/zsh/_ghq $bin/share/zsh/site-functions/_ghq + ''; + + meta = { + description = "Remote repository management made easy"; + homepage = https://github.com/motemen/ghq; + maintainers = with stdenv.lib.maintainers; [ sigma ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix new file mode 100644 index 000000000000..ec54803a6e76 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix @@ -0,0 +1,38 @@ +[ + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; + sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + }; + } + { + goPackagePath = "github.com/motemen/go-colorine"; + fetch = { + type = "git"; + url = "https://github.com/motemen/go-colorine"; + rev = "49ff36b8fa42db28092361cd20dcefd0b03b1472"; + sha256 = "1rfi5gggf2sxb52whgxfl37p22r2xp27rndixbiicw6swllmml9l"; + }; + } + { + goPackagePath = "github.com/daviddengcn/go-colortext"; + fetch = { + type = "git"; + url = "https://github.com/daviddengcn/go-colortext"; + rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a"; + sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf"; + }; + } +] diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix new file mode 100644 index 000000000000..6b696821f1c9 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -0,0 +1,32 @@ +{stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: + +stdenv.mkDerivation rec { + name = "git-open-${version}"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "paulirish"; + repo = "git-open"; + rev = "v${version}"; + sha256 = "005am4phf7j4ybc9k1hqsxjb7gv2i56a3axrza866pwwx1ayrhpq"; + }; + + buildInputs = [ makeWrapper ]; + + buildPhase = null; + + installPhase = '' + mkdir -p $out/bin + cp git-open $out/bin + wrapProgram $out/bin/git-open \ + --prefix PATH : "${stdenv.lib.makeBinPath [ git xdg_utils gnugrep ]}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/paulirish/git-open; + description = "Open the GitHub page or website for a repository in your browser"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.jlesquembre ]; + }; +} diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 134e6998670c..b9848f45aabb 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -4,11 +4,11 @@ with rustPlatform; buildRustPackage rec { name = "pijul-${version}"; - version = "0.4.1"; + version = "0.4.4"; src = fetchurl { url = "https://pijul.org/releases/${name}.tar.gz"; - sha256 = "e492fde1bea839f474f5b91bb762a0fab5ff6a9bc2b8f20eb91a253ca6feda5a"; + sha256 = "8f133b7e14bfa84156c103126d53b12c6dfb996dcdebcf1091199ff9c77f3713"; }; sourceRoot = "${name}/pijul"; @@ -18,7 +18,7 @@ buildRustPackage rec { doCheck = false; - depsSha256 = "17n66clr31s49gbbcsii0f31s63rncc9mmz4wwdi0yl4r6ykv9h7"; + depsSha256 = "1zdvnarg182spgydmqwxxr929j44d771zkq7gyh152173i0xqb20"; meta = with stdenv.lib; { description = "A distributed version control system"; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index f62e274874c1..7d0cfb455306 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -23,14 +23,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.3"; + version = "1.0.7"; name = "handbrake-${version}"; src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; rev = "${version}"; - sha256 = "1r8yzs0xih03p5ybx5096zkvlwxhcmg34047awmda1wq3z3rdjh5"; + sha256 = "1pdrvicq40s8n23n6k8k097kkjs3ah5wbz1mvxnfy3h2mh5rwk57"; }; nativeBuildInputs = [ @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; + enableParallelBuilding = true; + preConfigure = '' patchShebangs scripts @@ -85,6 +87,11 @@ stdenv.mkDerivation rec { cd build ''; + # icon-theme.cache belongs in the icon theme, not in individual packages + postInstall = '' + rm $out/share/icons/hicolor/icon-theme.cache + ''; + meta = with stdenv.lib; { homepage = http://handbrake.fr/; description = "A tool for ripping DVDs into video files"; diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 3232e9c089bc..656ec1163dc2 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -1,39 +1,33 @@ { stdenv, fetchFromGitHub -, doxygen, python3Packages, ffmpeg, libopenshot -, qtbase, qtmultimedia, makeQtWrapper }: +, doxygen, python3Packages, libopenshot +, makeQtWrapper, wrapGAppsHook, gtk3 }: -with stdenv.lib; -stdenv.mkDerivation rec { +python3Packages.buildPythonApplication rec { name = "openshot-qt-${version}"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "0dg4fkkci1rz49yrdd4fa1whv10c1pgm3cl4i49452ckqa7qg037"; + sha256 = "10j3p10q66m9nhzcd8315q1yiqscidkjbm474mllw7c281vacvzw"; }; - - buildInputs = - [ python3Packages.python ffmpeg libopenshot qtbase qtmultimedia ]; - - nativeBuildInputs = - [ doxygen makeQtWrapper ]; - - installPhase = '' - mkdir -p $(toPythonPath $out) - cp -r src/* $(toPythonPath $out) - mkdir -p $out/bin - echo "#/usr/bin/env sh" >$out/bin/openshot-qt - echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt - chmod +x $out/bin/openshot-qt - wrapQtProgram $out/bin/openshot-qt \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH" + + nativeBuildInputs = [ doxygen wrapGAppsHook ]; + + buildInputs = [ gtk3 ]; + + propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5 sip httplib2 pyzmq ]; + + + preConfigure = '' + # tries to create caching directories during install + export HOME=$(mktemp -d) ''; doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = http://openshot.org/; description = "Free, open-source video editor"; longDescription = '' diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index dd1410431695..b45460c426cc 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-${version}"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "0slszl6w96rhxhi6agw85dc4gmpab2qw03mq32g4qrirz68anz6f"; + sha256 = "1mqci103kn4l7w8i9kqzi705kxn4q596vw0sh05r1w5nbyjwcyp6"; }; patchPhase = '' diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 462d74c9672f..163218c0478b 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,17 +1,19 @@ -{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump }: +{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "0.3.0"; + version = "0.5.0"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "1bjih6y21vmjmsk3xvhgc1innymryklgylyvjrskqw610niai59j"; + sha256 = "08q7f1fnm3zhs1knrkl6npr4yvpblqbiwa0m9r186ny11jq2dyib"; }; - propagatedBuildInputs = (with pythonPackages; [ pycrypto requests2 ]) ++ [ rtmpdump ]; + buildInputs = with pythonPackages; [ pytest mock ]; + + propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests2 iso-639 iso3166 ]) ++ [ rtmpdump ffmpeg ]; meta = with stdenv.lib; { homepage = https://github.com/streamlink/streamlink; @@ -25,6 +27,6 @@ pythonPackages.buildPythonApplication rec { ''; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.dezgeg ]; + maintainers = with maintainers; [ dezgeg zraexy ]; }; } diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 810803866890..fec3ae631328 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -1,22 +1,29 @@ { stdenv, fetchurl, pkgconfig, perl, autoconf, automake , libX11, inputproto, libXt, libXpm, libXft, libXtst, xextproto, libXi -, fontconfig, freetype, readline +, libXrandr, fontconfig, freetype, readline }: stdenv.mkDerivation rec { name = "ratpoison-${version}"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "mirror://savannah/ratpoison/${name}.tar.xz"; - sha256 = "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains"; + sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr"; }; outputs = [ "out" "contrib" "doc" "info" ]; + configureFlags = [ + # >=1.4.9 requires this even with readline in inputs + "--enable-history" + ]; + + nativeBuildInputs = [ pkgconfig autoconf automake ]; + buildInputs = - [ pkgconfig perl autoconf automake - libX11 inputproto libXt libXpm libXft libXtst xextproto libXi + [ perl + libX11 inputproto libXt libXpm libXft libXtst xextproto libXi libXrandr fontconfig freetype readline ]; postInstall = '' diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index dc05ec1678cb..47e2c1b904c3 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -2,7 +2,7 @@ # a fork of the buildEnv in the Nix distribution. Most changes should # eventually be merged back into the Nix distribution. -{ perl, runCommand, lib }: +{ buildPackages, runCommand, lib }: { name @@ -66,6 +66,6 @@ runCommand name passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null; } '' - ${perl}/bin/perl -w ${./builder.pl} + ${buildPackages.perl}/bin/perl -w ${./builder.pl} eval "$postBuild" '' diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 27575053954f..7f63664dadd0 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -209,7 +209,7 @@ rec { postMount = '' echo "Packing raw image..." - tar -C mnt --mtime=0 -cf $out . + tar -C mnt --mtime="@$SOURCE_DATE_EPOCH" -cf $out . ''; }; @@ -247,7 +247,7 @@ rec { echo "Adding contents..." for item in $contents; do echo "Adding $item" - rsync -ak $item/ layer/ + rsync -ak --chown=0:0 $item/ layer/ done else echo "No contents to add to layer." @@ -260,7 +260,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tar -C layer --mtime=0 -cf $out/layer.tar . + tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . # Compute a checksum of the tarball. echo "Computing layer checksum..." @@ -310,7 +310,7 @@ rec { echo "Adding contents..." for item in ${toString contents}; do echo "Adding $item..." - rsync -ak $item/ layer/ + rsync -ak --chown=0:0 $item/ layer/ done ''; @@ -340,7 +340,7 @@ rec { echo "Packing layer..." mkdir $out - tar -C layer --mtime=0 -cf $out/layer.tar . + tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . # Compute the tar checksum and add it to the output json. echo "Computing checksum..." @@ -467,7 +467,8 @@ rec { comm <(sort -n baseFiles|uniq) \ <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles # Append the new files to the layer. - tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles + tar -rpf temp/layer.tar --mtime="@$SOURCE_DATE_EPOCH" \ + --owner=0 --group=0 --no-recursion --files-from newFiles echo "Adding meta..." @@ -496,7 +497,7 @@ rec { chmod -R a-w image echo "Cooking the image..." - tar -C image --mtime=0 -c . | pigz -nT > $out + tar -C image --mtime="@$SOURCE_DATE_EPOCH" -c . | pigz -nT > $out echo "Finished." ''; diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 91569d0c070a..2275a065594f 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -7,6 +7,7 @@ , buildInputs ? [] , cargoUpdateHook ? "" , cargoDepsHook ? "" +, cargoBuildFlags ? [] , ... } @ args: let @@ -26,7 +27,11 @@ in stdenv.mkDerivation (args // { buildInputs = [ git rust.cargo rust.rustc ] ++ buildInputs; - configurePhase = args.configurePhase or "true"; + configurePhase = args.configurePhase or '' + runHook preConfigure + # noop + runHook postConfigure + ''; postUnpack = '' eval "$cargoDepsHook" @@ -92,22 +97,26 @@ in stdenv.mkDerivation (args // { ) '' + (args.prePatch or ""); - buildPhase = args.buildPhase or '' - echo "Running cargo build --release" - cargo build --release + buildPhase = with builtins; args.buildPhase or '' + runHook preBuild + echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}" + cargo build --release ${concatStringsSep " " cargoBuildFlags} + runHook postBuild ''; checkPhase = args.checkPhase or '' + runHook preCheck echo "Running cargo test" cargo test + runHook postCheck ''; doCheck = args.doCheck or true; installPhase = args.installPhase or '' + runHook preInstall mkdir -p $out/bin - for f in $(find target/release -maxdepth 1 -type f); do - cp $f $out/bin - done; + find target/release -maxdepth 1 -executable -exec cp "{}" $out/bin \; + runHook postInstall ''; }) diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index a8b2b786efaf..31c89215ea77 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "https://dl.dropbox.com/u/56493902/loudifier/comicrelief.zip"; + url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; sha256 = "0wpf10m9zmcfvcxgc7dxzdm3syam7d7qxlfabgr1nxzq299kh8ch"; }; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index ac7dcea31b13..5fde19e01289 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "iosevka-${version}"; - version = "1.12.1"; + version = "1.12.5"; buildInputs = [ unzip ]; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - sha256 = "1rwg06fbizf2cmjwysx4ciz96nh80k48drsyr3rshppycajnaahj"; + sha256 = "0s3g6mk0ngwsrw9h9dqinb50cd9i8zhqdcmmh93fhyf4d87yfwyi"; }; sourceRoot = "."; diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix index 8d9ee143ac2b..b3646abd6dda 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix @@ -20,12 +20,11 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ shared_mime_info gnome3.gnome_themes_standard ]; - buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas - libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview - librsvg libsecret dconf - gobjectIntrospection gnome3.adwaita-icon-theme ]; + buildInputs = [ vala_0_32 libgit2 gtk3 glib json_glib webkitgtk libgee libpeas + libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas + librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook intltool pkgconfig ]; # https://bugzilla.gnome.org/show_bug.cgi?id=758240 preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir''; diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix index bc9e517aceb8..5a78b8d0ca6b 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gitg-3.22.0"; + name = "gitg-3.23.90"; src = fetchurl { - url = mirror://gnome/sources/gitg/3.22/gitg-3.22.0.tar.xz; - sha256 = "ba6895f85c18748294075980a5e03e0936ad4e84534dbb0d8f9e29aa874ddeaf"; + url = mirror://gnome/sources/gitg/3.23/gitg-3.23.90.tar.xz; + sha256 = "0m3g8ag8nh6vj5m188l7sgkm7p8mrs094mjijqaaav3r6cz91fdg"; }; } diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix index 6922a7aee1bc..b9abde42cbda 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix @@ -1,12 +1,12 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: rec { - major = "0.24"; - minor = "4"; + major = "0.25"; + minor = "0"; name = "libgit2-glib-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/libgit2-glib/${major}/${name}.tar.xz"; - sha256 = "0802qskm64l5ic8rvfjxg27chj502irhw1xkabrl4015dxsiy89s"; + sha256 = "0rf5gcr3khp35wj9ax9cbyq5j3iiwa1l0fi16w6sfgmrryd6n9aa"; }; } diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index de2c6d40d40c..224d111026af 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -1,5 +1,5 @@ { stdenv, writeText, erlang, rebar3, openssl, libyaml, - pc, buildEnv, lib }: + pc, lib }: { name, version , src diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix new file mode 100644 index 000000000000..d1fb9b212431 --- /dev/null +++ b/pkgs/development/compilers/dale/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, libffi, llvm_35, perl }: + +let version = "20170416"; + doCheck = false; +in stdenv.mkDerivation { + name = "dale-${version}"; + + src = fetchFromGitHub { + owner = "tomhrr"; + repo = "dale"; + rev = "ecc5ea91efef8a263c7dddd6925983df5b5258b2"; + sha256 = "0naly7jsfriiqf68q210ay9ppcvidbwwcxksy5zwy1m17aq5kxaw"; + }; + + buildInputs = [ cmake libffi llvm_35 ] ++ + stdenv.lib.optional doCheck perl; + + inherit doCheck; + + checkTarget = "tests"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Lisp-flavoured C"; + longDescription = '' + Dale is a system (no GC) programming language that uses + S-expressions for syntax and supports syntactic macros. + ''; + homepage = "https://github.com/tomhrr/dale"; + license = licenses.mit; + maintainers = with maintainers; [ amiloradovsky ]; + platforms = platforms.linux; # fails on Darwin, linking vs. FFI + }; +} diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 48eafff6f724..6fb36d7cbfb9 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -29,6 +29,9 @@ mkDerivation { tasty-hunit tasty-quickcheck text union-find wl-pprint ]; jailbreak = true; + postInstall = '' + ln -s $out/bin/elm-format-0.18 $out/bin/elm-format + ''; homepage = "http://elm-lang.org"; description = "A source code formatter for Elm"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index b5d2ba66e752..d3d7561ddfbc 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python, ... }: let - rev = "1.37.3"; + rev = "1.37.9"; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp"; - sha256 = "0s5156g6576hm31628c2wbqwl9r6vn10z5ry59psl565zz3lpg8x"; + sha256 = "0dvay98hlajhwgl5s58sh8s79i4nbcl3gajssgzimk0id8fa0ifx"; inherit rev; }; srcFL = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp-clang"; - sha256 = "0jhk20wb7275n5m9niqkzmvrr8hh5v26glkmsfmng4p66cs7jkil"; + sha256 = "1ilrb6p3vybjz0hj8hc80hpm0y01794v488dywwj81khhqahnhcv"; inherit rev; }; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 05df6e9359a0..351e045b50af 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }: let - rev = "1.37.3"; + rev = "1.37.9"; appdir = "share/emscripten"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten"; - sha256 = "0pkxm8nd2zv57f2xm0c3n4xsdh2scliyy3zx04xk2bpkvskyzl7x"; + sha256 = "0dmvhw4j9bdqbdknz7ibg2fwzynw4w8ksnj8rkswdmp660889krp"; inherit rev; }; diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix new file mode 100644 index 000000000000..35e6749659e0 --- /dev/null +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -0,0 +1,87 @@ +# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it + +{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, dotnetbuildhelpers, dotnetPackages }: + +stdenv.mkDerivation rec { + name = "fsharp-${version}"; + version = "4.1.7"; + + src = fetchurl { + url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; + sha256 = "0rfkrk4mzi4w54mfqilvng9ar5swhmnwhsyjc54rx3fd0np3jiyl"; + }; + + buildInputs = [ + pkgconfig + autoconf + automake + which + mono + dotnetbuildhelpers + dotnetPackages.FsCheck262 + dotnetPackages.FSharpCompilerTools + dotnetPackages.FSharpCore + dotnetPackages.FSharpData225 + dotnetPackages.FsLexYacc704 + dotnetPackages.MicrosoftDiaSymReader + dotnetPackages.MicrosoftDiaSymReaderPortablePdb + dotnetPackages.NUnit350 + dotnetPackages.SystemCollectionsImmutable131 + dotnetPackages.SystemReflectionMetadata + dotnetPackages.SystemValueTuple + ]; + + configurePhase = '' + substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh" + ./autogen.sh --prefix $out + ''; + + preBuild = '' + substituteInPlace Makefile --replace "MONO_ENV_OPTIONS=\$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config" "true" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.dll\" />" "" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.optdata\" />" "" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.sigdata\" />" "" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.xml\" />" "" + + rm -rf packages + mkdir packages + + ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2 + ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.4 + ln -s ${dotnetPackages.FSharpCore}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1 + ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5 + ln -s ${dotnetPackages.FsLexYacc704}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.4 + ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0 + ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0 + ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0 + ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1 + ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2 + ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.0 + ''; + + # Make sure the executables use the right mono binary, + # and set up some symlinks for backwards compatibility. + postInstall = '' + substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono " + substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono " + substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono " + ln -s $out/bin/fsharpc $out/bin/fsc + ln -s $out/bin/fsharpi $out/bin/fsi + for dll in "$out/lib/mono/fsharp"/FSharp*.dll + do + create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" + done + ''; + + # To fix this error when running: + # The file "/nix/store/path/whatever.exe" is an not a valid CIL image + dontStrip = true; + + meta = { + description = "A functional CLI language"; + homepage = "http://fsharp.org/"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix new file mode 100644 index 000000000000..70ef8b63277f --- /dev/null +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -0,0 +1,26 @@ +{ haskellPackages, mkDerivation, fetchFromGitHub, lib }: + +with lib; + +mkDerivation rec { + pname = "psc-package"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "purescript"; + repo = pname; + rev = "v${version}"; + sha256 = "078xjn10yq4i0ff78bxscvxhn29p3s7iwv3pjyqxzlhaymn5949l"; + }; + + isLibrary = false; + isExecutable = true; + + executableHaskellDepends = with haskellPackages; [ + aeson aeson-pretty optparse-applicative system-filepath turtle + ]; + + description = "An experimental package manager for PureScript"; + license = licenses.bsd3; + maintainers = with lib.maintainers; [ profpatsch ]; +} diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index f0d7e0dabc27..2d4d6ad4db1f 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -24,12 +24,6 @@ rustPlatform.buildRustPackage rec { LIBGIT2_SYS_USE_PKG_CONFIG=1; postInstall = '' - rm "$out/lib/rustlib/components" \ - "$out/lib/rustlib/install.log" \ - "$out/lib/rustlib/rust-installer-version" \ - "$out/lib/rustlib/uninstall.sh" \ - "$out/lib/rustlib/manifest-cargo" - # NOTE: We override the `http.cainfo` option usually specified in # `.cargo/config`. This is an issue when users want to specify # their own certificate chain as environment variables take diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index 8d98ace71f88..313580fe600a 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -8,8 +8,7 @@ fetchgit, guile, libtool, - pkgconfig, - buildEnv + pkgconfig }: stdenv.mkDerivation rec { name = "guile-sdl2-${version}"; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 0c51f208f462..f7d16a89df86 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -330,9 +330,11 @@ stdenv.mkDerivation ({ export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}" export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" - '' + (if isHaLVM - then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"'' - else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"'') + "${shellHook}"; + ${if isHaLVM + then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"'' + else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"''} + ${shellHook} + ''; }; }; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix new file mode 100644 index 000000000000..7b421f4ca365 --- /dev/null +++ b/pkgs/development/libraries/libqtav/default.nix @@ -0,0 +1,63 @@ +{ stdenv, lib, fetchFromGitHub, extra-cmake-modules, makeQtWrapper +, qtbase, qtmultimedia, qtquick1, qttools +, mesa, libX11 +, libass, openal, ffmpeg, libuchardet +, alsaLib, libpulseaudio, libva +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "libqtav-${version}"; + + # Awaiting upcoming `v1.12.0` release. `v1.11.0` is not supporting cmake which is the + # the reason behind taking an unstable git rev. + version = "unstable-2017-03-30"; + + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper qttools ]; + buildInputs = [ + qtbase qtmultimedia qtquick1 + mesa libX11 + libass openal ffmpeg libuchardet + alsaLib libpulseaudio libva + ]; + + src = fetchFromGitHub { + sha256 = "1xw0ynm9w501651rna3ppf8p336ag1p60i9dxhghzm543l7as93v"; + rev = "4b4ae3b470b2fcbbcf1b541c2537fb270ee0bcfa"; + repo = "QtAV"; + owner = "wang-bin"; + fetchSubmodules = true; + }; + + patchPhase = '' + sed -i -e 's#CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT#TRUE#g' ./CMakeLists.txt + sed -i -e 's#DESTINATION ''${QT_INSTALL_LIBS}/cmake#DESTINATION ''${QTAV_INSTALL_LIBS}/cmake#g' ./CMakeLists.txt + ''; + + # Make sure libqtav finds its libGL dependancy at both link and run time + # by adding mesa to rpath. Not sure why it wasn't done automatically like + # the other libraries as `mesa` is part of our `buildInputs`. + NIX_CFLAGS_LINK = [ "-Wl,-rpath,${mesa}/lib"]; + + preFixup = '' + mkdir -p "$out/bin" + cp -a "./bin/"* "$out/bin" + ''; + + postFixup = '' + for i in `find $out/bin -maxdepth 1 -xtype f -executable`; do + wrapQtProgram "$i" + done + ''; + + meta = { + description = "A multimedia playback framework based on Qt + FFmpeg."; + #license = licenses.lgpl21; # For the libraries / headers only. + license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. + homepage = http://www.qtav.org/; + maintainers = [ maintainers.jraygauthier ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 96649a0927ee..9449a8f538f1 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, xen, zfs +, curl, libiconv, gmp, xen, zfs, parted }: with stdenv.lib; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap + attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap parted ] ++ optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl xen @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { "--with-test" "--with-esx" "--with-remote" + "--with-storage-disk" ] ++ optionals stdenv.isLinux [ "--with-attr" "--with-apparmor" diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix new file mode 100644 index 000000000000..50f4d74d15cb --- /dev/null +++ b/pkgs/development/libraries/safefile/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "safefile"; + version = "1.0.5"; + + src = fetchurl { + url = "http://research.cs.wisc.edu/mist/${pname}/releases/${name}.tar.gz"; + sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78"; + }; + + buildInputs = []; + + passthru = { + updateScript = '' + cd ${toString ./.} + ${toString <nixpkgs/pkgs/build-support/upstream-updater/update-walker.sh>} default.nix + ''; + }; + + meta = { + inherit version; + description = "File open routines to safely open a file when in the presence of an attack"; + license = stdenv.lib.licenses.asl20 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://research.cs.wisc.edu/mist/safefile/"; + updateWalker = true; + }; +} diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 347686014d1d..e4b95fc1cb9f 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -7,9 +7,10 @@ with stdenv.lib; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; + mkFlag = trueStr: falseStr: cond: name: val: "--" + + (if cond then trueStr else falseStr) + + name + + optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index e263708c18e9..9538f1dd1f85 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, libX11, cairo -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, +, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, compat24 ? false, compat26 ? true, unicode ? true, }: -assert withMesa -> mesa != null; +assert withMesa -> mesa_glu != null && mesa_noglu != null; with stdenv.lib; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ] - ++ optional withMesa mesa; + ++ optional withMesa mesa_glu; nativeBuildInputs = [ pkgconfig ]; @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; SEARCH_LIB = "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " - + optionalString withMesa "${mesa.out}/lib "; + + optionalString withMesa "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index e19f0bc3a765..28cd79b5549a 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true +, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: -assert withMesa -> mesa != null; +assert withMesa -> mesa_glu != null && mesa_noglu != null; with stdenv.lib; @@ -22,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] - ++ optional withMesa mesa + ++ optional withMesa mesa_glu ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +40,7 @@ stdenv.mkDerivation { # allow building on 64-bit [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; - SEARCH_LIB = optionalString withMesa "${mesa}/lib"; + SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index f40595d4eacb..4fea863827f1 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true +, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, compat24 ? false, compat26 ? true, unicode ? true , withWebKit ? false, webkitgtk2 ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: -assert withMesa -> mesa != null; +assert withMesa -> mesa_glu != null && mesa_noglu != null; assert withWebKit -> webkitgtk2 != null; with stdenv.lib; @@ -25,7 +26,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] - ++ optional withMesa mesa + ++ optional withMesa mesa_glu ++ optional withWebKit webkitgtk2 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; @@ -50,7 +51,7 @@ stdenv.mkDerivation { ++ optionals withWebKit ["--enable-webview" "--enable-webview-webkit"]; - SEARCH_LIB = optionalString withMesa "${mesa}/lib"; + SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 6e1b84eb3e99..2088439c61d5 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation { (uiop/lisp-build:compile-file* \"'"$out"'/lib/common-lisp/asdf/build/asdf.lisp\") (asdf:load-system :uiop :force :all) (asdf:load-system :asdf :force :all) + (ignore-errors (asdf:load-system :uiop/version :force :all)) )"' \ "$out/bin/common-lisp.sh" ''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 377f694e7a8e..2725c354d35b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -134,6 +134,9 @@ in plump = addDeps (with qlnp; [array-utils trivial-indent]); sqlite = addNativeLibs [pkgs.sqlite]; uiop = x: { + testSystems = (x.testSystems or ["uiop"]) ++ [ + "uiop/version" + ]; overrides = y: (x.overrides y) // { postInstall = ((x.overrides y).postInstall or "") + '' cp -r "${pkgs.asdf}/lib/common-lisp/asdf/uiop/contrib" "$out/lib/common-lisp/uiop" diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index a9bdefd03a40..22cd44ddad64 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -625,13 +625,13 @@ let sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970"; }; }; - "azure-arm-trafficmanager-0.10.5" = { + "azure-arm-trafficmanager-0.12.0" = { name = "azure-arm-trafficmanager"; packageName = "azure-arm-trafficmanager"; - version = "0.10.5"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.5.tgz"; - sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; + url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.12.0.tgz"; + sha1 = "609e585c0253960a91deaf773dae1ce184ce414b"; }; }; "azure-arm-dns-0.11.1" = { @@ -697,13 +697,13 @@ let sha1 = "379e6c2ed4155de86caff63243923c7330d34802"; }; }; - "azure-asm-compute-0.17.0" = { + "azure-asm-compute-0.18.0" = { name = "azure-asm-compute"; packageName = "azure-asm-compute"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.17.0.tgz"; - sha1 = "15967b535c06a5d06330b3d5adbf5b4b85e9df90"; + url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz"; + sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685"; }; }; "azure-asm-hdinsight-0.10.2" = { @@ -814,13 +814,13 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-2.0.0" = { + "azure-storage-2.1.0" = { name = "azure-storage"; packageName = "azure-storage"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.0.0.tgz"; - sha1 = "581ed1245ee105e818806efd5cc5cc4c14eab7c0"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz"; + sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01"; }; }; "azure-arm-batch-0.3.0" = { @@ -1750,13 +1750,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "brace-expansion-1.1.6" = { + "brace-expansion-1.1.7" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; - sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"; + sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59"; }; }; "balanced-match-0.4.2" = { @@ -2002,13 +2002,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.2.0" = { + "async-2.3.0" = { name = "async"; packageName = "async"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.2.0.tgz"; - sha1 = "c324eba010a237e4fbd55a12dee86367d5c0ef32"; + url = "https://registry.npmjs.org/async/-/async-2.3.0.tgz"; + sha1 = "1013d1051047dd320fe24e494d5c66ecaf6147d9"; }; }; "lodash-4.17.4" = { @@ -2227,13 +2227,13 @@ let sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "sshpk-1.11.0" = { + "sshpk-1.13.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; - sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz"; + sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"; }; }; "assert-plus-1.0.0" = { @@ -2443,13 +2443,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "readable-stream-2.2.6" = { + "readable-stream-2.2.9" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.6"; + version = "2.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; - sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"; + sha1 = "cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"; }; }; "buffer-shims-1.0.0" = { @@ -2461,6 +2461,15 @@ let sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; }; }; + "string_decoder-1.0.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz"; + sha1 = "f06f41157b664d86069f84bdbdc9b0d8ab281667"; + }; + }; "http-basic-2.5.1" = { name = "http-basic"; packageName = "http-basic"; @@ -2965,13 +2974,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.4.1" = { + "hosted-git-info-2.4.2" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"; - sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"; + sha1 = "0076b9f46a270506ddbaaea56496897460612a67"; }; }; "is-builtin-module-1.0.0" = { @@ -3325,13 +3334,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-5.0.5" = { + "buffer-5.0.6" = { name = "buffer"; packageName = "buffer"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; - sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.6.tgz"; + sha1 = "2ea669f7eec0b6eda05b08f8b5ff661b28573588"; }; }; "cached-path-relative-1.0.1" = { @@ -3442,13 +3451,13 @@ let sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "https-browserify-0.0.1" = { + "https-browserify-1.0.0" = { name = "https-browserify"; packageName = "https-browserify"; - version = "0.0.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; - sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; "insert-module-globals-7.0.1" = { @@ -3559,13 +3568,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.6.3" = { + "stream-http-2.7.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.6.3"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz"; - sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.0.tgz"; + sha1 = "cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"; }; }; "subarg-1.0.0" = { @@ -3946,13 +3955,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "hmac-drbg-1.0.0" = { + "hmac-drbg-1.0.1" = { name = "hmac-drbg"; packageName = "hmac-drbg"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz"; - sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5"; + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -4639,13 +4648,13 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; - "parse-torrent-5.8.2" = { + "parse-torrent-5.8.3" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.2.tgz"; - sha1 = "09f02ca43ec2d885d1460aacb0fb50c79b3c49f9"; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz"; + sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c"; }; }; "pump-0.3.5" = { @@ -4837,31 +4846,31 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; - "magnet-uri-5.1.5" = { + "magnet-uri-5.1.6" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz"; - sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.6.tgz"; + sha1 = "60e8fb5ea90488c8491701eb306970f3126480b3"; }; }; - "parse-torrent-file-4.0.1" = { + "parse-torrent-file-4.0.2" = { name = "parse-torrent-file"; packageName = "parse-torrent-file"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz"; - sha1 = "4580c5ebb3f6e607baa02ef0ace51f627859e699"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.2.tgz"; + sha1 = "981a22143832abbcd99052d889d31a39ae3f9bfe"; }; }; - "simple-get-2.4.0" = { + "simple-get-2.5.1" = { name = "simple-get"; packageName = "simple-get"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz"; - sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.5.1.tgz"; + sha1 = "eb418fb2c9e431631b4cd6c478af548da613ccd2"; }; }; "thirty-two-1.0.2" = { @@ -4990,13 +4999,13 @@ let sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; }; }; - "fs-chunk-store-1.6.4" = { + "fs-chunk-store-1.6.5" = { name = "fs-chunk-store"; packageName = "fs-chunk-store"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.4.tgz"; - sha1 = "5aa0025d58533118552e815f5986f39f93b06e69"; + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz"; + sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156"; }; }; "hat-0.0.3" = { @@ -5062,22 +5071,22 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-piece-1.1.0" = { + "torrent-piece-1.1.1" = { name = "torrent-piece"; packageName = "torrent-piece"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.0.tgz"; - sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; + url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.1.tgz"; + sha1 = "50346e42a43b35daf2a86f414afb153629a854be"; }; }; - "random-access-file-1.5.0" = { + "random-access-file-1.6.1" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz"; - sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.6.1.tgz"; + sha1 = "33358436f43076d34a058db47177a691319f0e99"; }; }; "run-parallel-1.1.6" = { @@ -5098,6 +5107,15 @@ let sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; + "buffer-alloc-unsafe-1.0.0" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; + sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + }; + }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -5395,13 +5413,13 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; - "ws-2.2.2" = { + "ws-2.2.3" = { name = "ws"; packageName = "ws"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-2.2.2.tgz"; - sha1 = "aa26daf39c52b20ed716e3447f8641494a726b01"; + url = "https://registry.npmjs.org/ws/-/ws-2.2.3.tgz"; + sha1 = "f36c9719a56dff813f455af912a2078145bbd940"; }; }; "ultron-1.1.0" = { @@ -5872,13 +5890,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.17" = { + "big-integer-1.6.19" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.17"; + version = "1.6.19"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz"; - sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.19.tgz"; + sha1 = "4a5e915e3188c8708f254b356196f28542acc1e0"; }; }; "sax-1.1.4" = { @@ -5971,13 +5989,13 @@ let sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; }; }; - "init-package-json-1.9.5" = { + "init-package-json-1.9.6" = { name = "init-package-json"; packageName = "init-package-json"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.5.tgz"; - sha1 = "7d4d64a264dc76c1f1f557cbbe824978bf10cd09"; + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.6.tgz"; + sha1 = "789fc2b74466a4952b9ea77c0575bc78ebd60a61"; }; }; "nopt-3.0.6" = { @@ -6070,13 +6088,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "xcode-0.9.1" = { + "xcode-0.9.3" = { name = "xcode"; packageName = "xcode"; - version = "0.9.1"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz"; - sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95"; + url = "https://registry.npmjs.org/xcode/-/xcode-0.9.3.tgz"; + sha1 = "910a89c16aee6cc0b42ca805a6d0b4cf87211cf3"; }; }; "browserify-transform-tools-1.5.3" = { @@ -6205,6 +6223,15 @@ let sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; + "https-browserify-0.0.1" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; + sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + }; + }; "compression-1.6.2" = { name = "compression"; packageName = "compression"; @@ -6484,13 +6511,13 @@ let sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; }; }; - "type-is-1.6.14" = { + "type-is-1.6.15" = { name = "type-is"; packageName = "type-is"; - version = "1.6.14"; + version = "1.6.15"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; - sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"; + sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; }; }; "utils-merge-1.0.0" = { @@ -6574,13 +6601,13 @@ let sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; }; }; - "npm-package-arg-4.2.1" = { + "npm-package-arg-5.0.1" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "4.2.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz"; - sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.0.1.tgz"; + sha1 = "09a816e3f45a549e3ddaf33e9bae5e7b31077872"; }; }; "promzard-0.3.0" = { @@ -7402,49 +7429,40 @@ let sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; }; }; - "pegjs-0.9.0" = { + "pegjs-0.10.0" = { name = "pegjs"; packageName = "pegjs"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/pegjs/-/pegjs-0.9.0.tgz"; - sha1 = "f6aefa2e3ce56169208e52179dfe41f89141a369"; + url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; + sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; }; }; - "simple-plist-0.1.4" = { + "simple-plist-0.2.1" = { name = "simple-plist"; packageName = "simple-plist"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.1.4.tgz"; - sha1 = "10eb51b47e33c556eb8ec46d5ee64d64e717db5d"; - }; - }; - "bplist-parser-0.0.6" = { - name = "bplist-parser"; - packageName = "bplist-parser"; - version = "0.0.6"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"; - sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9"; + url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; + sha1 = "71766db352326928cf3a807242ba762322636723"; }; }; - "bplist-creator-0.0.4" = { + "bplist-creator-0.0.7" = { name = "bplist-creator"; packageName = "bplist-creator"; - version = "0.0.4"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.4.tgz"; - sha1 = "4ac0496782e127a85c1d2026a4f5eb22a7aff991"; + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz"; + sha1 = "37df1536092824b87c42f957b01344117372ae45"; }; }; - "stream-buffers-0.2.6" = { + "stream-buffers-2.2.0" = { name = "stream-buffers"; packageName = "stream-buffers"; - version = "0.2.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-0.2.6.tgz"; - sha1 = "181c08d5bb3690045f69401b9ae6a7a0cf3313fc"; + url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; + sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; "async-1.5.2" = { @@ -7663,13 +7681,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "form-data-2.1.2" = { + "form-data-2.1.4" = { name = "form-data"; packageName = "form-data"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; - sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; + sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; "har-validator-4.2.1" = { @@ -7708,13 +7726,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "ajv-4.11.5" = { + "ajv-4.11.6" = { name = "ajv"; packageName = "ajv"; - version = "4.11.5"; + version = "4.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; - sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.6.tgz"; + sha1 = "947e93049790942b2a2d60a8289b28924d39f987"; }; }; "har-schema-1.0.5" = { @@ -7843,13 +7861,13 @@ let sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; - "rc-1.2.0" = { + "rc-1.2.1" = { name = "rc"; packageName = "rc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.0.tgz"; - sha1 = "c7de973b7b46297c041366b2fd3d2363b1697c66"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz"; + sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"; }; }; "strip-json-comments-2.0.1" = { @@ -8276,13 +8294,13 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "nan-2.5.1" = { + "nan-2.6.2" = { name = "nan"; packageName = "nan"; - version = "2.5.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; - sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; + url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; + sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; }; }; "jsonparse-0.0.6" = { @@ -9242,13 +9260,13 @@ let sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "espree-3.4.0" = { + "espree-3.4.1" = { name = "espree"; packageName = "espree"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz"; - sha1 = "41656fa5628e042878025ef467e78f125cb86e1d"; + url = "https://registry.npmjs.org/espree/-/espree-3.4.1.tgz"; + sha1 = "28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"; }; }; "esquery-1.0.0" = { @@ -9296,13 +9314,13 @@ let sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286"; }; }; - "ignore-3.2.6" = { + "ignore-3.2.7" = { name = "ignore"; packageName = "ignore"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.6.tgz"; - sha1 = "26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz"; + sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"; }; }; "inquirer-0.12.0" = { @@ -9323,13 +9341,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.8.2" = { + "js-yaml-3.8.3" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz"; - sha1 = "02d3e2c0f6beab20248d412c352203827d786721"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz"; + sha1 = "33a05ec481c850c8875929166fe1beb61c728766"; }; }; "levn-0.3.0" = { @@ -9494,13 +9512,13 @@ let sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; }; }; - "acorn-4.0.4" = { + "acorn-5.0.3" = { name = "acorn"; packageName = "acorn"; - version = "4.0.4"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz"; - sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz"; + sha1 = "c460df08491463f028ccb82eab3730bf01087b3d"; }; }; "acorn-jsx-3.0.1" = { @@ -10097,13 +10115,13 @@ let sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"; }; }; - "arr-flatten-1.0.1" = { + "arr-flatten-1.0.2" = { name = "arr-flatten"; packageName = "arr-flatten"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"; - sha1 = "e5ffe54d45e19f32f216e91eb99c8ce892bb604b"; + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.2.tgz"; + sha1 = "1ec1e63439c54f67d6f72bb4299c3d4f73b2d996"; }; }; "expand-range-1.8.2" = { @@ -10448,13 +10466,13 @@ let sha1 = "21ffdc429be2b50cb361df990a40a7731288e935"; }; }; - "simple-git-1.69.0" = { + "simple-git-1.70.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.69.0"; + version = "1.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.69.0.tgz"; - sha1 = "e86ead16abfc273dca9ae2bd51e5eb3c0122c177"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.70.0.tgz"; + sha1 = "62cfd90bb2628a13ff4fe704c840fcef56244a71"; }; }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { @@ -10494,13 +10512,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.4" = { + "coffee-script-1.12.5" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; - sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz"; + sha1 = "809f4585419112bbfe46a073ad7543af18c27346"; }; }; "jade-1.11.0" = { @@ -10584,13 +10602,13 @@ let sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }; }; - "uglify-js-2.8.20" = { + "uglify-js-2.8.22" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.20"; + version = "2.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.22.tgz"; + sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0"; }; }; "void-elements-2.0.1" = { @@ -13221,6 +13239,15 @@ let sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; }; }; + "npm-package-arg-4.2.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz"; + sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec"; + }; + }; "retry-0.8.0" = { name = "retry"; packageName = "retry"; @@ -13824,13 +13851,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.21" = { + "node-red-node-email-0.1.22" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.21"; + version = "0.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.21.tgz"; - sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.22.tgz"; + sha1 = "99c610fdba3f498ddab71da9273d6003e4e0280e"; }; }; "node-red-node-twitter-0.1.10" = { @@ -13842,13 +13869,13 @@ let sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221"; }; }; - "node-red-node-rbe-0.1.6" = { + "node-red-node-rbe-0.1.8" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.6"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz"; - sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.8.tgz"; + sha1 = "96108a5720842387ea5ddd046d7e483c7ab2a5dc"; }; }; "bcrypt-1.0.2" = { @@ -14031,13 +14058,13 @@ let sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "moment-timezone-0.5.11" = { + "moment-timezone-0.5.13" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.11"; + version = "0.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz"; - sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz"; + sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90"; }; }; "content-disposition-0.5.1" = { @@ -14139,22 +14166,22 @@ let sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; }; }; - "help-me-1.0.1" = { + "help-me-1.1.0" = { name = "help-me"; packageName = "help-me"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-1.0.1.tgz"; - sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a"; + url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; + sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "mqtt-packet-5.2.2" = { + "mqtt-packet-5.3.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "5.2.2"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.2.tgz"; - sha1 = "190d4358f415c6f964211030c20ca0bf45d5698a"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.3.0.tgz"; + sha1 = "078ed59ae4c06febf3b3eaca90b50e97e269f206"; }; }; "reinterval-1.1.0" = { @@ -14193,6 +14220,42 @@ let sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; }; }; + "glob-stream-6.1.0" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; + sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; + }; + }; + "is-negated-glob-1.0.0" = { + name = "is-negated-glob"; + packageName = "is-negated-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; + sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + }; + }; + "ordered-read-streams-1.0.0" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.0.tgz"; + sha1 = "d674a86ffcedf83d0ae06afa2918855e96d4033a"; + }; + }; + "to-absolute-glob-2.0.1" = { + name = "to-absolute-glob"; + packageName = "to-absolute-glob"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz"; + sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b"; + }; + }; "feedparser-1.1.3" = { name = "feedparser"; packageName = "feedparser"; @@ -14940,13 +15003,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-4.0.1" = { + "mailcomposer-4.0.2" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; - sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz"; + sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101"; }; }; "simplesmtp-0.3.35" = { @@ -15075,15 +15138,6 @@ let sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; }; }; - "hosted-git-info-2.2.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; - sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; - }; - }; "lazy-property-1.0.0" = { name = "lazy-property"; packageName = "lazy-property"; @@ -15156,15 +15210,6 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; - "node-gyp-3.5.0" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; - sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; - }; - }; "npm-install-checks-3.0.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -15174,13 +15219,13 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "npm-registry-client-7.4.6" = { + "npm-registry-client-8.1.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.4.6"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.6.tgz"; - sha1 = "0aa7c55f18631b941b7b80a7aa501bfcb8b19717"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz"; + sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf"; }; }; "opener-1.4.3" = { @@ -15525,13 +15570,13 @@ let sha1 = "f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998"; }; }; - "registry-auth-token-3.1.0" = { + "registry-auth-token-3.1.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz"; - sha1 = "997c08256e0c7999837b90e944db39d8a790276b"; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.2.tgz"; + sha1 = "1b9e51a185c930da34a9894b12a52ea998f1adaf"; }; }; "argparse-0.1.15" = { @@ -15786,13 +15831,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.26.1" = { + "snyk-1.28.1" = { name = "snyk"; packageName = "snyk"; - version = "1.26.1"; + version = "1.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.26.1.tgz"; - sha1 = "12b28e9b43c6453ecb6d4be7670b0c0df7db38a5"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.28.1.tgz"; + sha1 = "ae0faed0fcee7d5dbc0fa8a7a8c9ebacb03b6151"; }; }; "spawn-please-0.2.0" = { @@ -15903,22 +15948,22 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-module-1.7.0" = { + "snyk-module-1.8.1" = { name = "snyk-module"; packageName = "snyk-module"; - version = "1.7.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.7.0.tgz"; - sha1 = "07c6ca8556d281de6f9e2368c04ecb6dd1f2631a"; + url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz"; + sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; }; }; - "snyk-policy-1.7.0" = { + "snyk-policy-1.7.1" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.0.tgz"; - sha1 = "2151c751ab1edc040fc6b94a872aa989db492324"; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz"; + sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22"; }; }; "snyk-recursive-readdir-2.0.0" = { @@ -16318,15 +16363,6 @@ let sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; - "gelf-stream-0.2.4" = { - name = "gelf-stream"; - packageName = "gelf-stream"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz"; - sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013"; - }; - }; "mediawiki-title-0.5.6" = { name = "mediawiki-title"; packageName = "mediawiki-title"; @@ -16383,6 +16419,15 @@ let sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; }; }; + "yargs-5.0.0" = { + name = "yargs"; + packageName = "yargs"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; + sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + }; + }; "is-arguments-1.0.2" = { name = "is-arguments"; packageName = "is-arguments"; @@ -16437,22 +16482,13 @@ let sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; }; }; - "gelfling-0.2.0" = { - name = "gelfling"; - packageName = "gelfling"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; - sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; - }; - }; - "bunyan-1.8.9" = { + "bunyan-1.8.10" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.9"; + version = "1.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz"; - sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz"; + sha1 = "201fedd26c7080b632f416072f53a90b9a52981c"; }; }; "bunyan-syslog-udp-0.1.0" = { @@ -16672,6 +16708,15 @@ let sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; }; }; + "yargs-parser-3.2.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; + sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; + }; + }; "airplayer-2.0.0" = { name = "airplayer"; packageName = "airplayer"; @@ -16762,15 +16807,6 @@ let sha1 = "d5bd826506425a3b3eacadf1e0e2c1ac3e289728"; }; }; - "stream-buffers-2.2.0" = { - name = "stream-buffers"; - packageName = "stream-buffers"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; - sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; - }; - }; "consume-http-header-1.0.0" = { name = "consume-http-header"; packageName = "consume-http-header"; @@ -17554,6 +17590,96 @@ let sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; }; }; + "ast-types-0.9.8" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.9.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.8.tgz"; + sha1 = "6cb6a40beba31f49f20928e28439fc14a3dab078"; + }; + }; + "babylon-7.0.0-beta.8" = { + name = "babylon"; + packageName = "babylon"; + version = "7.0.0-beta.8"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.8.tgz"; + sha1 = "2bdc5ae366041442c27e068cce6f0d7c06ea9949"; + }; + }; + "flow-parser-0.43.0" = { + name = "flow-parser"; + packageName = "flow-parser"; + version = "0.43.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.43.0.tgz"; + sha1 = "e2b8eb1ac83dd53f7b6b04a7c35b6a52c33479b7"; + }; + }; + "jest-validate-19.0.0" = { + name = "jest-validate"; + packageName = "jest-validate"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-19.0.0.tgz"; + sha1 = "8c6318a20ecfeaba0ba5378bfbb8277abded4173"; + }; + }; + "jest-matcher-utils-19.0.0" = { + name = "jest-matcher-utils"; + packageName = "jest-matcher-utils"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz"; + sha1 = "5ecd9b63565d2b001f61fbf7ec4c7f537964564d"; + }; + }; + "leven-2.1.0" = { + name = "leven"; + packageName = "leven"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; + }; + }; + "pretty-format-19.0.0" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-19.0.0.tgz"; + sha1 = "56530d32acb98a3fa4851c4e2b9d37b420684c84"; + }; + }; + "ansi-styles-3.0.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.0.0.tgz"; + sha1 = "5404e93a544c4fec7f048262977bebfe3155e0c1"; + }; + }; + "color-convert-1.9.0" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; + sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + }; + }; + "color-name-1.1.2" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; + sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; + }; + }; "commoner-0.10.8" = { name = "commoner"; packageName = "commoner"; @@ -18698,22 +18824,13 @@ let sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580"; }; }; - "express-4.14.1" = { - name = "express"; - packageName = "express"; - version = "4.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz"; - sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33"; - }; - }; - "express-session-1.14.2" = { + "express-session-1.15.2" = { name = "express-session"; packageName = "express-session"; - version = "1.14.2"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz"; - sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; + sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; }; }; "forever-monitor-1.1.0" = { @@ -18770,13 +18887,13 @@ let sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; }; }; - "npm-4.1.2" = { + "npm-4.5.0" = { name = "npm"; packageName = "npm"; - version = "4.1.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz"; - sha1 = "daaa77d631947135b36528c304573243f5cd2e07"; + url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz"; + sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475"; }; }; "octicons-3.5.0" = { @@ -18797,13 +18914,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.1.5" = { + "raven-1.2.1" = { name = "raven"; packageName = "raven"; - version = "1.1.5"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.1.5.tgz"; - sha1 = "6af541406c37da1d678781d0af411c27c6f05fbf"; + url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz"; + sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd"; }; }; "signals-1.0.0" = { @@ -18815,13 +18932,13 @@ let sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; }; }; - "snapsvg-0.4.0" = { + "snapsvg-0.5.1" = { name = "snapsvg"; packageName = "snapsvg"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.4.0.tgz"; - sha1 = "e0767014167825957de7e125c29b0fa89796ea03"; + url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz"; + sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; }; }; "winston-2.3.1" = { @@ -18833,13 +18950,13 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "color-convert-1.9.0" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.0"; + "yargs-7.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; - sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz"; + sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; }; }; "color-string-1.5.2" = { @@ -18851,15 +18968,6 @@ let sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; }; }; - "color-name-1.1.2" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; - sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; - }; - }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -18896,13 +19004,13 @@ let sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; }; }; - "crc-3.4.1" = { + "crc-3.4.4" = { name = "crc"; packageName = "crc"; - version = "3.4.1"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz"; - sha1 = "65d5830b1a2569557cfb324c0e679998521473ee"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; + sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; "broadway-0.2.10" = { @@ -19031,15 +19139,6 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "mississippi-1.2.0" = { - name = "mississippi"; - packageName = "mississippi"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; - sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; - }; - }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -19058,13 +19157,22 @@ let sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; - "eve-0.4.2" = { + "eve-0.5.3" = { name = "eve"; packageName = "eve"; - version = "0.4.2"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eve/-/eve-0.5.3.tgz"; + sha1 = "6c2f6588f7d0b392044d245ba5af9d7cfe237f42"; + }; + }; + "yargs-parser-5.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eve/-/eve-0.4.2.tgz"; - sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz"; + sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; }; }; "kew-0.1.7" = { @@ -19130,6 +19238,15 @@ let sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de"; }; }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; "loader-runner-2.3.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -19202,15 +19319,6 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; - }; - }; "os-browserify-0.2.1" = { name = "os-browserify"; packageName = "os-browserify"; @@ -19310,15 +19418,6 @@ let sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; }; }; - "leven-2.1.0" = { - name = "leven"; - packageName = "leven"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; - sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; - }; - }; "node-emoji-1.5.1" = { name = "node-emoji"; packageName = "node-emoji"; @@ -19364,6 +19463,15 @@ let sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e"; }; }; + "v8-compile-cache-1.1.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.0.tgz"; + sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9"; + }; + }; "regenerator-runtime-0.10.3" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -19865,10 +19973,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.8"; + version = "1.9.11"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.8.tgz"; - sha1 = "17294e9828a1f11ef241d59f5eb040e6a5b4ed13"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.11.tgz"; + sha1 = "6e185c5c3211b5a86d272caec63b8daf80e5b186"; }; dependencies = [ sources."colors-0.6.0-1" @@ -20007,10 +20115,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.11"; + version = "0.10.12"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.11.tgz"; - sha1 = "aa1a379386b5c60f90f86134b4047acb1302d482"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.12.tgz"; + sha1 = "4446af5df8dda6c755a0bf7dfec2468a9f63f26d"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -20059,7 +20167,7 @@ in sources."azure-arm-servermanagement-0.1.2" sources."azure-arm-network-0.18.0" sources."azure-arm-powerbiembedded-0.1.0" - sources."azure-arm-trafficmanager-0.10.5" + sources."azure-arm-trafficmanager-0.12.0" sources."azure-arm-dns-0.11.1" sources."azure-arm-website-0.11.4" sources."azure-arm-rediscache-0.2.3" @@ -20067,7 +20175,7 @@ in sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" sources."azure-keyvault-0.11.0" - sources."azure-asm-compute-0.17.0" + sources."azure-asm-compute-0.18.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" sources."azure-asm-mgmt-0.10.1" @@ -20088,7 +20196,7 @@ in sources."moment-2.14.1" ]; }) - (sources."azure-storage-2.0.0" // { + (sources."azure-storage-2.1.0" // { dependencies = [ sources."browserify-mime-1.2.9" sources."extend-1.2.1" @@ -20231,7 +20339,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -20299,7 +20407,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -20368,7 +20476,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -20427,13 +20535,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -20549,13 +20657,13 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -20574,14 +20682,14 @@ in sources."prepend-http-1.0.4" (sources."read-all-stream-2.2.0" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -20615,7 +20723,7 @@ in sources."minimist-1.2.0" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -20752,7 +20860,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -20804,7 +20912,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -20832,10 +20940,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.1.0"; + version = "14.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz"; - sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.3.0.tgz"; + sha1 = "fd003a2386ac1aec127f097885a3cc6373b745c4"; }; dependencies = [ (sources."JSONStream-1.3.1" // { @@ -20868,7 +20976,7 @@ in sources."pako-0.2.9" ]; }) - (sources."buffer-5.0.5" // { + (sources."buffer-5.0.6" // { dependencies = [ sources."base64-js-1.2.0" sources."ieee754-1.1.8" @@ -20925,7 +21033,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -20955,7 +21063,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -21021,7 +21129,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -21043,7 +21151,7 @@ in ]; }) sources."htmlescape-1.1.1" - sources."https-browserify-0.0.1" + sources."https-browserify-1.0.0" sources."inherits-2.0.3" (sources."insert-module-globals-7.0.1" // { dependencies = [ @@ -21094,12 +21202,13 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -21127,7 +21236,7 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.6.3" // { + (sources."stream-http-2.7.0" // { dependencies = [ sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" @@ -21291,7 +21400,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -21449,17 +21558,17 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.2" // { + (sources."parse-torrent-5.8.3" // { dependencies = [ sources."blob-to-buffer-1.2.6" sources."get-stdin-5.0.1" - (sources."magnet-uri-5.1.5" // { + (sources."magnet-uri-5.1.6" // { dependencies = [ sources."thirty-two-1.0.2" sources."uniq-1.0.1" ]; }) - (sources."parse-torrent-file-4.0.1" // { + (sources."parse-torrent-file-4.0.2" // { dependencies = [ sources."bencode-0.11.0" (sources."simple-sha1-2.1.0" // { @@ -21470,7 +21579,7 @@ in sources."uniq-1.0.1" ]; }) - (sources."simple-get-2.4.0" // { + (sources."simple-get-2.5.1" // { dependencies = [ (sources."once-1.4.0" // { dependencies = [ @@ -21518,15 +21627,16 @@ in }) ]; }) - (sources."fs-chunk-store-1.6.4" // { + (sources."fs-chunk-store-1.6.5" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - (sources."random-access-file-1.5.0" // { + (sources."random-access-file-1.6.1" // { dependencies = [ + sources."buffer-alloc-unsafe-1.0.0" sources."inherits-2.0.3" ]; }) @@ -21605,7 +21715,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -21669,7 +21779,7 @@ in }) sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-get-2.4.0" // { + (sources."simple-get-2.5.1" // { dependencies = [ sources."simple-concat-1.0.0" sources."unzip-response-2.0.1" @@ -21679,13 +21789,13 @@ in dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -21694,18 +21804,19 @@ in (sources."simple-websocket-4.3.1" // { dependencies = [ sources."randombytes-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) - (sources."ws-2.2.2" // { + (sources."ws-2.2.3" // { dependencies = [ + sources."safe-buffer-5.0.1" sources."ultron-1.1.0" ]; }) @@ -21731,7 +21842,7 @@ in sources."run-parallel-1.1.6" ]; }) - sources."torrent-piece-1.1.0" + sources."torrent-piece-1.1.1" ]; }) sources."windows-no-runnable-0.0.6" @@ -21832,13 +21943,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -21884,10 +21995,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; - sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz"; + sha1 = "809f4585419112bbfe46a073ad7543af18c27346"; }; buildInputs = globalBuildInputs; meta = { @@ -21911,7 +22022,7 @@ in sources."ansi-0.3.1" (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" ]; }) sources."cordova-registry-mapper-1.1.15" @@ -21938,7 +22049,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22017,7 +22128,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22139,7 +22250,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -22169,7 +22280,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -22235,7 +22346,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22308,12 +22419,13 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -22341,7 +22453,7 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.6.3" // { + (sources."stream-http-2.7.0" // { dependencies = [ sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" @@ -22498,7 +22610,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -22535,7 +22647,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22551,7 +22663,7 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -22564,7 +22676,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22580,9 +22692,15 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."npm-package-arg-4.2.1" // { + (sources."npm-package-arg-5.0.1" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" + (sources."osenv-0.1.4" // { + dependencies = [ + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + ]; + }) sources."semver-5.3.0" ]; }) @@ -22601,7 +22719,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -22705,7 +22823,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22741,13 +22859,13 @@ in (sources."concat-stream-1.6.0" // { dependencies = [ sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -22846,7 +22964,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -22906,7 +23024,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -23071,7 +23189,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -23096,20 +23214,31 @@ in }) sources."unorm-1.3.3" sources."valid-identifier-0.0.1" - (sources."xcode-0.9.1" // { + (sources."xcode-0.9.3" // { dependencies = [ - sources."node-uuid-1.4.7" - sources."pegjs-0.9.0" - (sources."simple-plist-0.1.4" // { + sources."pegjs-0.10.0" + (sources."simple-plist-0.2.1" // { dependencies = [ - sources."bplist-parser-0.0.6" - (sources."bplist-creator-0.0.4" // { + (sources."bplist-creator-0.0.7" // { + dependencies = [ + sources."stream-buffers-2.2.0" + ]; + }) + (sources."bplist-parser-0.1.1" // { + dependencies = [ + sources."big-integer-1.6.19" + ]; + }) + (sources."plist-2.0.1" // { dependencies = [ - sources."stream-buffers-0.2.6" + sources."base64-js-1.1.2" + sources."xmlbuilder-8.2.2" + sources."xmldom-0.1.27" ]; }) ]; }) + sources."uuid-3.0.1" ]; }) ]; @@ -23240,14 +23369,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -23279,7 +23408,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -23392,13 +23521,13 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -23423,14 +23552,14 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -23441,7 +23570,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -23601,7 +23730,7 @@ in (sources."hiredis-0.4.1" // { dependencies = [ sources."bindings-1.2.1" - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) (sources."json-rpc2-0.8.1" // { @@ -23815,13 +23944,13 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -23950,14 +24079,14 @@ in sources."split2-2.1.1" (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -23987,13 +24116,13 @@ in }) ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -24036,14 +24165,14 @@ in (sources."tar-stream-1.5.2" // { dependencies = [ sources."bl-1.2.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -24087,7 +24216,7 @@ in sources."through-2.3.8" ]; }) - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -24112,14 +24241,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -24151,7 +24280,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -24331,7 +24460,7 @@ in sources."minimist-1.2.0" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -24442,10 +24571,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.18.0"; + version = "3.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.18.0.tgz"; - sha1 = "647e985c4ae71502d20ac62c109f66d5104c8a4b"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; + sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; dependencies = [ (sources."babel-code-frame-6.22.0" // { @@ -24474,13 +24603,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -24524,9 +24653,9 @@ in }) ]; }) - (sources."espree-3.4.0" // { + (sources."espree-3.4.1" // { dependencies = [ - sources."acorn-4.0.4" + sources."acorn-5.0.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -24587,7 +24716,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -24604,7 +24733,7 @@ in ]; }) sources."globals-9.17.0" - sources."ignore-3.2.6" + sources."ignore-3.2.7" sources."imurmurhash-0.1.4" (sources."inquirer-0.12.0" // { dependencies = [ @@ -24679,7 +24808,7 @@ in sources."tryit-1.0.3" ]; }) - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -24747,7 +24876,7 @@ in sources."strip-json-comments-2.0.1" (sources."table-3.8.3" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" ]; @@ -24915,7 +25044,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -25001,13 +25130,13 @@ in (sources."readdirp-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.11" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -25016,7 +25145,7 @@ in }) (sources."fsevents-1.1.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -25040,13 +25169,13 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -25080,7 +25209,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -25100,14 +25229,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -25139,7 +25268,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -25224,13 +25353,13 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -25245,7 +25374,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -25344,7 +25473,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -25391,7 +25520,7 @@ in sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4"; }; dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -25402,7 +25531,7 @@ in sources."microee-0.0.2" ]; }) - sources."simple-git-1.69.0" + sources."simple-git-1.70.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -25434,7 +25563,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -25478,7 +25607,7 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" (sources."jade-1.11.0" // { dependencies = [ sources."character-parser-1.2.1" @@ -25546,7 +25675,7 @@ in }) ]; }) - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" (sources."yargs-3.10.0" // { @@ -25627,7 +25756,7 @@ in }) (sources."msgpack-1.0.2" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) ]; @@ -25736,14 +25865,14 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -25778,7 +25907,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -25983,7 +26112,7 @@ in }) (sources."minimatch-2.0.10" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -26124,7 +26253,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -26190,7 +26319,7 @@ in }) (sources."minimatch-2.0.10" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -26283,7 +26412,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -26307,7 +26436,7 @@ in sources."amdefine-1.0.1" ]; }) - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" (sources."yargs-3.10.0" // { @@ -26358,7 +26487,7 @@ in }) ]; }) - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -26482,7 +26611,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -26535,10 +26664,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz"; - sha1 = "02d3e2c0f6beab20248d412c352203827d786721"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz"; + sha1 = "33a05ec481c850c8875929166fe1beb61c728766"; }; dependencies = [ (sources."argparse-1.0.9" // { @@ -26559,10 +26688,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.5.0.tgz"; - sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009"; + url = "https://registry.npmjs.org/karma/-/karma-1.6.0.tgz"; + sha1 = "0e871d4527d5eac56c41d181f03c5c0a7e6dbf3e"; }; dependencies = [ sources."bluebird-3.5.0" @@ -26595,7 +26724,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -26616,7 +26745,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -26702,13 +26831,13 @@ in sources."path-is-absolute-1.0.1" (sources."readdirp-2.1.0" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -26717,7 +26846,7 @@ in }) (sources."fsevents-1.1.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -26741,13 +26870,13 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -26781,7 +26910,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -26801,14 +26930,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -26840,7 +26969,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -26897,13 +27026,13 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -27014,7 +27143,7 @@ in sources."mime-1.3.4" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -27366,7 +27495,7 @@ in }) ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -27493,14 +27622,14 @@ in dependencies = [ (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -27544,7 +27673,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -27574,7 +27703,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -27701,14 +27830,14 @@ in ]; }) sources."object-assign-4.1.1" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -27819,7 +27948,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -27912,13 +28041,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -27932,7 +28061,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -27952,7 +28081,7 @@ in }) (sources."npm-package-arg-4.2.1" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" ]; }) (sources."once-1.4.0" // { @@ -27972,14 +28101,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -28011,7 +28140,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -28062,7 +28191,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -28081,14 +28210,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -28182,7 +28311,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -28278,7 +28407,7 @@ in sources."graceful-fs-4.1.11" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -28301,14 +28430,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -28360,14 +28489,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -28399,7 +28528,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -28461,10 +28590,10 @@ in node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; packageName = "node-inspector"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.0.0.tgz"; - sha1 = "c6221619e3f0bd8f1f24e0e882a65eb793f69d37"; + url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.0.tgz"; + sha1 = "0f8ffffbf9a9b86540eb33c1d64e7ba546457622"; }; dependencies = [ sources."async-0.9.2" @@ -28515,7 +28644,7 @@ in dependencies = [ (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" ]; }) (sources."meow-3.7.0" // { @@ -28539,7 +28668,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -28722,7 +28851,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -28746,7 +28875,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -28762,7 +28891,7 @@ in ]; }) sources."path-is-absolute-1.0.1" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -28786,7 +28915,7 @@ in }) (sources."v8-debug-1.0.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -28810,14 +28939,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -28863,14 +28992,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -28902,7 +29031,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -28952,7 +29081,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -28994,7 +29123,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -29009,14 +29138,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29029,7 +29158,7 @@ in }) (sources."v8-profiler-5.7.0" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -29053,14 +29182,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29106,14 +29235,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -29145,7 +29274,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -29195,7 +29324,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -29237,7 +29366,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -29252,14 +29381,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29361,14 +29490,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29402,7 +29531,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -29422,14 +29551,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -29461,7 +29590,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -29511,7 +29640,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -29559,7 +29688,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -29574,14 +29703,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29615,7 +29744,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -29702,13 +29831,13 @@ in (sources."readdirp-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.11" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29717,7 +29846,7 @@ in }) (sources."fsevents-1.1.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -29741,13 +29870,13 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29781,7 +29910,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -29801,14 +29930,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -29840,7 +29969,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -29920,13 +30049,13 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29975,7 +30104,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -30075,13 +30204,13 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -30106,14 +30235,14 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -30124,7 +30253,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -30212,7 +30341,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ (sources."mime-types-2.1.15" // { dependencies = [ @@ -30249,13 +30378,13 @@ in sources."domhandler-2.3.0" sources."domutils-1.5.1" sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -30289,7 +30418,7 @@ in }) (sources."cron-1.2.1" // { dependencies = [ - (sources."moment-timezone-0.5.11" // { + (sources."moment-timezone-0.5.13" // { dependencies = [ sources."moment-2.18.1" ]; @@ -30378,7 +30507,7 @@ in }) ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ (sources."mime-types-2.1.15" // { dependencies = [ @@ -30460,14 +30589,15 @@ in }) ]; }) - (sources."help-me-1.0.1" // { + (sources."help-me-1.1.0" // { dependencies = [ sources."callback-stream-1.1.0" - (sources."glob-stream-5.3.5" // { + (sources."glob-stream-6.1.0" // { dependencies = [ sources."extend-3.0.0" - (sources."glob-5.0.15" // { + (sources."glob-7.1.1" // { dependencies = [ + sources."fs.realpath-1.0.0" (sources."inflight-1.0.6" // { dependencies = [ sources."wrappy-1.0.2" @@ -30475,7 +30605,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -30501,104 +30631,50 @@ in sources."path-dirname-1.0.2" ]; }) - (sources."micromatch-2.3.11" // { + sources."is-negated-glob-1.0.0" + (sources."ordered-read-streams-1.0.0" // { dependencies = [ - (sources."arr-diff-2.0.0" // { - dependencies = [ - sources."arr-flatten-1.0.1" - ]; - }) - sources."array-unique-0.2.1" - (sources."braces-1.8.5" // { + sources."is-stream-1.1.0" + ]; + }) + (sources."pumpify-1.3.5" // { + dependencies = [ + (sources."duplexify-3.5.0" // { dependencies = [ - (sources."expand-range-1.8.2" // { + (sources."end-of-stream-1.0.0" // { dependencies = [ - (sources."fill-range-2.2.3" // { + (sources."once-1.3.3" // { dependencies = [ - sources."is-number-2.1.0" - (sources."isobject-2.1.0" // { - dependencies = [ - sources."isarray-1.0.0" - ]; - }) - sources."randomatic-1.1.6" - sources."repeat-string-1.6.1" + sources."wrappy-1.0.2" ]; }) ]; }) - sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - ]; - }) - (sources."expand-brackets-0.1.5" // { - dependencies = [ - sources."is-posix-bracket-0.1.1" - ]; - }) - sources."extglob-0.3.2" - sources."filename-regex-2.0.0" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - (sources."kind-of-3.1.0" // { - dependencies = [ - sources."is-buffer-1.1.5" - ]; - }) - (sources."normalize-path-2.1.1" // { - dependencies = [ - sources."remove-trailing-separator-1.0.1" + sources."stream-shift-1.0.0" ]; }) - (sources."object.omit-2.0.1" // { + ]; + }) + sources."remove-trailing-separator-1.0.1" + (sources."to-absolute-glob-2.0.1" // { + dependencies = [ + (sources."extend-shallow-2.0.1" // { dependencies = [ - (sources."for-own-0.1.5" // { - dependencies = [ - sources."for-in-1.0.2" - ]; - }) sources."is-extendable-0.1.1" ]; }) - (sources."parse-glob-3.0.4" // { + (sources."is-absolute-0.2.6" // { dependencies = [ - (sources."glob-base-0.3.0" // { + (sources."is-relative-0.2.1" // { dependencies = [ - sources."glob-parent-2.0.0" + (sources."is-unc-path-0.1.2" // { + dependencies = [ + sources."unc-path-regex-0.1.2" + ]; + }) ]; }) - sources."is-dotfile-1.0.2" - ]; - }) - (sources."regex-cache-0.4.3" // { - dependencies = [ - sources."is-equal-shallow-0.1.3" - sources."is-primitive-2.0.0" - ]; - }) - ]; - }) - (sources."ordered-read-streams-0.3.0" // { - dependencies = [ - sources."is-stream-1.1.0" - ]; - }) - (sources."through2-0.6.5" // { - dependencies = [ - (sources."readable-stream-1.0.34" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) - ]; - }) - (sources."to-absolute-glob-0.1.1" // { - dependencies = [ - (sources."extend-shallow-2.0.1" // { - dependencies = [ - sources."is-extendable-0.1.1" + sources."is-windows-0.2.0" ]; }) ]; @@ -30610,11 +30686,7 @@ in sources."jsonify-0.0.0" ]; }) - (sources."through2-filter-2.0.0" // { - dependencies = [ - sources."through2-2.0.3" - ]; - }) + sources."through2-filter-2.0.0" ]; }) ]; @@ -30624,19 +30696,20 @@ in }) sources."inherits-2.0.3" sources."minimist-1.2.0" - (sources."mqtt-packet-5.2.2" // { + (sources."mqtt-packet-5.3.0" // { dependencies = [ sources."bl-1.2.0" sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.0.1" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -30832,7 +30905,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -30901,7 +30974,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -30937,7 +31010,7 @@ in }) ]; }) - (sources."node-red-node-email-0.1.21" // { + (sources."node-red-node-email-0.1.22" // { dependencies = [ (sources."nodemailer-1.11.0" // { dependencies = [ @@ -31054,14 +31127,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -31093,7 +31166,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -31131,7 +31204,7 @@ in }) ]; }) - sources."node-red-node-rbe-0.1.6" + sources."node-red-node-rbe-0.1.8" (sources."bcrypt-1.0.2" // { dependencies = [ sources."bindings-1.2.1" @@ -31148,14 +31221,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -31209,14 +31282,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -31248,7 +31321,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -31297,7 +31370,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -31344,7 +31417,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -31453,7 +31526,7 @@ in (sources."config-0.4.15" // { dependencies = [ sources."js-yaml-0.3.7" - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" (sources."vows-0.8.1" // { dependencies = [ sources."eyes-0.1.8" @@ -31514,7 +31587,7 @@ in sources."moment-2.1.0" (sources."nodemailer-0.3.35" // { dependencies = [ - (sources."mailcomposer-4.0.1" // { + (sources."mailcomposer-4.0.2" // { dependencies = [ (sources."buildmail-4.0.1" // { dependencies = [ @@ -31580,10 +31653,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.4.4"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.4.4.tgz"; - sha1 = "d5ec661923a06bcd6a6eec3d0433a9da3fd67e37"; + url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz"; + sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475"; }; dependencies = [ (sources."JSONStream-1.3.1" // { @@ -31632,7 +31705,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -31649,7 +31722,7 @@ in sources."fs.realpath-1.0.0" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -31662,12 +31735,12 @@ in }) sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.2" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ sources."promzard-0.3.0" ]; @@ -31734,11 +31807,11 @@ in sources."run-queue-1.0.3" ]; }) - (sources."node-gyp-3.5.0" // { + (sources."node-gyp-3.6.0" // { dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -31763,7 +31836,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.1" - (sources."npm-registry-client-7.4.6" // { + (sources."npm-registry-client-8.1.1" // { dependencies = [ (sources."concat-stream-1.6.0" // { dependencies = [ @@ -31831,13 +31904,13 @@ in ]; }) sources."read-package-tree-5.1.5" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -31854,14 +31927,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -31893,7 +31966,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -32084,9 +32157,9 @@ in }) ]; }) - (sources."registry-auth-token-3.1.0" // { + (sources."registry-auth-token-3.1.2" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."minimist-1.2.0" @@ -32097,7 +32170,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."minimist-1.2.0" @@ -32187,14 +32260,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -32226,7 +32299,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -32281,7 +32354,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -32306,14 +32379,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -32403,7 +32476,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -32453,7 +32526,7 @@ in ]; }) sources."findit-1.2.0" - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" ]; buildInputs = globalBuildInputs; meta = { @@ -32465,10 +32538,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.10.4"; + version = "2.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.4.tgz"; - sha1 = "0833dd707f983a04fdcd615afb860ce82b1e54a2"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.5.tgz"; + sha1 = "2d047e3a24d676e0c99cf7221361088dcc247a6a"; }; dependencies = [ sources."bluebird-3.5.0" @@ -32558,7 +32631,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -32575,7 +32648,7 @@ in sources."fs.realpath-1.0.0" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -32593,7 +32666,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ sources."promzard-0.3.0" (sources."validate-npm-package-name-3.0.0" // { @@ -32623,7 +32696,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -32704,13 +32777,13 @@ in (sources."concat-stream-1.6.0" // { dependencies = [ sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -32879,7 +32952,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -32976,7 +33049,7 @@ in sources."require-dir-0.3.1" sources."semver-5.3.0" sources."semver-utils-1.1.1" - (sources."snyk-1.26.1" // { + (sources."snyk-1.28.1" // { dependencies = [ sources."abbrev-1.1.0" sources."ansi-escapes-1.4.0" @@ -33092,14 +33165,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -33131,7 +33204,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -33221,19 +33294,14 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."snyk-module-1.7.0" // { + (sources."snyk-module-1.8.1" // { dependencies = [ - sources."hosted-git-info-2.4.1" - (sources."validate-npm-package-name-2.2.2" // { - dependencies = [ - sources."builtins-0.0.7" - ]; - }) + sources."hosted-git-info-2.4.2" ]; }) - (sources."snyk-policy-1.7.0" // { + (sources."snyk-policy-1.7.1" // { dependencies = [ - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -33250,7 +33318,7 @@ in dependencies = [ (sources."minimatch-3.0.2" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -33370,14 +33438,14 @@ in ]; }) sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -33390,9 +33458,9 @@ in }) ]; }) - (sources."registry-auth-token-3.1.0" // { + (sources."registry-auth-token-3.1.2" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -33403,7 +33471,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -33474,7 +33542,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -33599,13 +33667,13 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -33630,14 +33698,14 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -33648,7 +33716,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -33792,14 +33860,14 @@ in ]; }) sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -33812,9 +33880,9 @@ in }) ]; }) - (sources."registry-auth-token-3.1.0" // { + (sources."registry-auth-token-3.1.2" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -33826,7 +33894,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -33861,10 +33929,10 @@ in parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; - version = "0.6.1"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz"; - sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723"; + url = "https://registry.npmjs.org/parsoid/-/parsoid-0.7.1.tgz"; + sha1 = "121dcf59d0bacd9247405988525888f9a6ba2328"; }; dependencies = [ sources."async-0.9.2" @@ -33903,7 +33971,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -34035,7 +34103,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -34061,7 +34129,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -34092,7 +34160,7 @@ in sources."amdefine-1.0.1" ]; }) - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" (sources."yargs-3.10.0" // { @@ -34178,12 +34246,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."gelf-stream-0.2.4" // { - dependencies = [ - sources."gelfling-0.2.0" - ]; - }) - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -34210,14 +34273,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -34249,7 +34312,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -34298,11 +34361,11 @@ in (sources."service-runner-2.2.5" // { dependencies = [ sources."bluebird-3.5.0" - (sources."bunyan-1.8.9" // { + (sources."bunyan-1.8.10" // { dependencies = [ (sources."dtrace-provider-0.8.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) (sources."mv-2.1.1" // { @@ -34325,7 +34388,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -34382,14 +34445,14 @@ in }) ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -34460,7 +34523,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -34529,7 +34592,7 @@ in ]; }) sources."simplediff-0.1.1" - (sources."yargs-4.8.1" // { + (sources."yargs-5.0.0" // { dependencies = [ (sources."cliui-3.2.0" // { dependencies = [ @@ -34594,7 +34657,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -34648,7 +34711,7 @@ in sources."which-module-1.0.0" sources."window-size-0.2.0" sources."y18n-3.2.1" - (sources."yargs-parser-2.4.1" // { + (sources."yargs-parser-3.2.0" // { dependencies = [ sources."camelcase-3.0.0" ]; @@ -34684,20 +34747,20 @@ in }) (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" ]; }) (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -34827,7 +34890,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -34968,13 +35031,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -35038,17 +35101,17 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.2" // { + (sources."parse-torrent-5.8.3" // { dependencies = [ sources."blob-to-buffer-1.2.6" sources."get-stdin-5.0.1" - (sources."magnet-uri-5.1.5" // { + (sources."magnet-uri-5.1.6" // { dependencies = [ sources."thirty-two-1.0.2" sources."uniq-1.0.1" ]; }) - (sources."parse-torrent-file-4.0.1" // { + (sources."parse-torrent-file-4.0.2" // { dependencies = [ sources."bencode-0.11.0" (sources."simple-sha1-2.1.0" // { @@ -35059,7 +35122,7 @@ in sources."uniq-1.0.1" ]; }) - (sources."simple-get-2.4.0" // { + (sources."simple-get-2.5.1" // { dependencies = [ (sources."once-1.4.0" // { dependencies = [ @@ -35083,7 +35146,7 @@ in ]; }) sources."range-parser-1.2.0" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -35104,15 +35167,16 @@ in }) ]; }) - (sources."fs-chunk-store-1.6.4" // { + (sources."fs-chunk-store-1.6.5" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - (sources."random-access-file-1.5.0" // { + (sources."random-access-file-1.6.1" // { dependencies = [ + sources."buffer-alloc-unsafe-1.0.0" (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" @@ -35196,7 +35260,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -35261,7 +35325,7 @@ in }) sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-get-2.4.0" // { + (sources."simple-get-2.5.1" // { dependencies = [ sources."simple-concat-1.0.0" sources."unzip-response-2.0.1" @@ -35271,13 +35335,13 @@ in dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -35286,18 +35350,19 @@ in (sources."simple-websocket-4.3.1" // { dependencies = [ sources."randombytes-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) - (sources."ws-2.2.2" // { + (sources."ws-2.2.3" // { dependencies = [ + sources."safe-buffer-5.0.1" sources."ultron-1.1.0" ]; }) @@ -35328,7 +35393,7 @@ in sources."run-parallel-1.1.6" ]; }) - sources."torrent-piece-1.1.0" + sources."torrent-piece-1.1.1" ]; }) sources."windows-no-runnable-0.0.6" @@ -35840,7 +35905,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -35863,7 +35928,7 @@ in }) (sources."fluent-ffmpeg-2.1.0" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -35946,7 +36011,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -35998,7 +36063,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -36026,7 +36091,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -36123,6 +36188,98 @@ in }; production = true; }; + prettier = nodeEnv.buildNodePackage { + name = "prettier"; + packageName = "prettier"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-1.1.0.tgz"; + sha1 = "9d6ad005703efefa66b6999b8916bfc6afeaf9f8"; + }; + dependencies = [ + sources."ast-types-0.9.8" + (sources."babel-code-frame-6.22.0" // { + dependencies = [ + sources."js-tokens-3.0.1" + ]; + }) + sources."babylon-7.0.0-beta.8" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + sources."esutils-2.0.2" + sources."flow-parser-0.43.0" + sources."get-stdin-5.0.1" + (sources."glob-7.1.1" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.7" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) + (sources."jest-validate-19.0.0" // { + dependencies = [ + sources."jest-matcher-utils-19.0.0" + sources."leven-2.1.0" + (sources."pretty-format-19.0.0" // { + dependencies = [ + (sources."ansi-styles-3.0.0" // { + dependencies = [ + (sources."color-convert-1.9.0" // { + dependencies = [ + sources."color-name-1.1.2" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + sources."minimist-1.2.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Prettier is an opinionated JavaScript formatter"; + homepage = "https://github.com/prettier/prettier#readme"; + license = "MIT"; + }; + production = true; + }; react-tools = nodeEnv.buildNodePackage { name = "react-tools"; packageName = "react-tools"; @@ -36155,7 +36312,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -36319,14 +36476,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -36358,7 +36515,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -36516,7 +36673,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -36562,7 +36719,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -36606,7 +36763,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -36634,14 +36791,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -36673,7 +36830,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -36719,11 +36876,11 @@ in sources."sigmund-1.0.1" ]; }) - (sources."bunyan-1.8.9" // { + (sources."bunyan-1.8.10" // { dependencies = [ (sources."dtrace-provider-0.8.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) (sources."mv-2.1.1" // { @@ -36741,7 +36898,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -36818,13 +36975,13 @@ in }) sources."entities-1.1.1" sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -36867,12 +37024,12 @@ in }) (sources."fs-ext-0.6.0" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) (sources."crypt3-0.2.0" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) ]; @@ -36916,7 +37073,7 @@ in sources."graceful-fs-4.1.11" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -36924,14 +37081,14 @@ in }) ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -37018,7 +37175,7 @@ in }) (sources."dtrace-provider-0.6.0" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) ]; @@ -37027,7 +37184,7 @@ in dependencies = [ (sources."dtrace-provider-0.6.0" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) (sources."mv-2.1.1" // { @@ -37050,7 +37207,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -37096,14 +37253,14 @@ in (sources."sshpk-agent-1.2.1" // { dependencies = [ sources."assert-plus-0.1.5" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -37198,7 +37355,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -37315,14 +37472,14 @@ in sources."prr-0.0.0" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -37351,7 +37508,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -37487,7 +37644,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -37554,7 +37711,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -37642,10 +37799,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.20"; + version = "2.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.22.tgz"; + sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0"; }; dependencies = [ sources."source-map-0.5.6" @@ -37705,10 +37862,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.11"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.11.tgz"; - sha1 = "a6391af1d6d132c2f995dbf9740b17b315b2f90f"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.14.tgz"; + sha1 = "e65f05f541bc8b829f9720f28e74c4a12c7b6dd2"; }; dependencies = [ sources."async-2.1.5" @@ -37743,7 +37900,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -37797,7 +37954,7 @@ in sources."whatwg-fetch-2.0.3" ]; }) - (sources."express-4.14.1" // { + (sources."express-4.15.2" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -37814,22 +37971,26 @@ in sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - (sources."debug-2.2.0" // { + (sources."debug-2.6.1" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."depd-1.1.0" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - (sources."finalhandler-0.5.1" // { + sources."etag-1.8.0" + (sources."finalhandler-1.0.1" // { dependencies = [ - sources."statuses-1.3.1" + (sources."debug-2.6.3" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."unpipe-1.0.0" ]; }) - sources."fresh-0.3.0" + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" (sources."on-finished-2.3.0" // { @@ -37845,23 +38006,23 @@ in sources."ipaddr.js-1.3.0" ]; }) - sources."qs-6.2.0" + sources."qs-6.4.0" sources."range-parser-1.2.0" - (sources."send-0.14.2" // { + (sources."send-0.15.1" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.5.1" // { + (sources."http-errors-1.6.1" // { dependencies = [ sources."inherits-2.0.3" - sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" sources."ms-0.7.2" - sources."statuses-1.3.1" ]; }) - (sources."type-is-1.6.14" // { + sources."setprototypeof-1.0.3" + sources."statuses-1.3.1" + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -37875,14 +38036,14 @@ in sources."vary-1.1.1" ]; }) - (sources."express-session-1.14.2" // { + (sources."express-session-1.15.2" // { dependencies = [ sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."crc-3.4.1" - (sources."debug-2.2.0" // { + sources."crc-3.4.4" + (sources."debug-2.6.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."depd-1.1.0" @@ -38021,7 +38182,7 @@ in ]; }) sources."hasher-1.2.0" - sources."ignore-3.2.6" + sources."ignore-3.2.7" (sources."keen.io-0.1.3" // { dependencies = [ sources."underscore-1.5.2" @@ -38034,13 +38195,13 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.17.1" + sources."moment-2.18.1" (sources."node-cache-4.1.1" // { dependencies = [ sources."clone-2.1.1" ]; }) - (sources."npm-4.1.2" // { + (sources."npm-4.5.0" // { dependencies = [ (sources."JSONStream-1.3.1" // { dependencies = [ @@ -38048,12 +38209,15 @@ in sources."through-2.3.8" ]; }) - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" + sources."ansi-regex-2.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."archy-1.0.0" sources."asap-2.0.5" + sources."bluebird-3.5.0" + sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" (sources."columnify-1.5.4" // { @@ -38085,7 +38249,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -38102,7 +38266,7 @@ in sources."fs.realpath-1.0.0" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -38115,21 +38279,17 @@ in }) sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.4.2" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ sources."promzard-0.3.0" - (sources."validate-npm-package-name-3.0.0" // { - dependencies = [ - sources."builtins-1.0.3" - ]; - }) ]; }) + sources."lazy-property-1.0.0" sources."lockfile-1.0.3" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ @@ -38141,7 +38301,7 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - (sources."mississippi-1.2.0" // { + (sources."mississippi-1.3.0" // { dependencies = [ (sources."concat-stream-1.6.0" // { dependencies = [ @@ -38161,6 +38321,11 @@ in sources."end-of-stream-1.4.0" sources."flush-write-stream-1.0.2" sources."from2-2.3.0" + (sources."parallel-transform-1.1.0" // { + dependencies = [ + sources."cyclist-0.2.2" + ]; + }) sources."pump-1.0.2" sources."pumpify-1.3.5" (sources."stream-each-1.2.0" // { @@ -38175,11 +38340,17 @@ in }) ]; }) - (sources."node-gyp-3.5.0" // { + (sources."move-concurrently-1.0.1" // { + dependencies = [ + sources."copy-concurrently-1.0.3" + sources."run-queue-1.0.3" + ]; + }) + (sources."node-gyp-3.6.0" // { dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -38262,22 +38433,22 @@ in ]; }) sources."read-package-tree-5.1.5" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) sources."realize-package-specifier-3.0.3" - (sources."request-2.79.0" // { + (sources."request-2.81.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { dependencies = [ sources."delayed-stream-1.0.0" @@ -38285,43 +38456,24 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) - (sources."har-validator-2.0.6" // { + (sources."har-validator-4.2.1" // { dependencies = [ - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - ]; - }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.16.0" // { + (sources."ajv-4.11.6" // { dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { + sources."co-4.6.0" + (sources."json-stable-stringify-1.0.1" // { dependencies = [ - sources."is-property-1.0.2" + sources."jsonify-0.0.0" ]; }) - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" ]; }) + sources."har-schema-1.0.5" ]; }) (sources."hawk-3.1.3" // { @@ -38343,7 +38495,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -38367,14 +38519,16 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.2" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" ]; }) sources."retry-0.10.1" @@ -38416,10 +38570,135 @@ in ]; }) sources."unpipe-1.0.0" + (sources."update-notifier-2.1.0" // { + dependencies = [ + (sources."boxen-1.0.0" // { + dependencies = [ + (sources."ansi-align-1.1.0" // { + dependencies = [ + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + ]; + }) + sources."camelcase-4.1.0" + sources."cli-boxes-1.0.0" + (sources."string-width-2.0.0" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + (sources."term-size-0.1.1" // { + dependencies = [ + (sources."execa-0.4.0" // { + dependencies = [ + (sources."cross-spawn-async-2.2.5" // { + dependencies = [ + (sources."lru-cache-4.0.2" // { + dependencies = [ + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + ]; + }) + ]; + }) + sources."is-stream-1.1.0" + sources."npm-run-path-1.0.0" + sources."object-assign-4.1.1" + sources."path-key-1.0.0" + sources."strip-eof-1.0.0" + ]; + }) + ]; + }) + (sources."widest-line-1.0.0" // { + dependencies = [ + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + ]; + }) + (sources."configstore-3.0.0" // { + dependencies = [ + (sources."dot-prop-4.1.1" // { + dependencies = [ + sources."is-obj-1.0.1" + ]; + }) + (sources."unique-string-1.0.0" // { + dependencies = [ + sources."crypto-random-string-1.0.0" + ]; + }) + ]; + }) + sources."is-npm-1.0.0" + (sources."latest-version-3.1.0" // { + dependencies = [ + (sources."package-json-4.0.0" // { + dependencies = [ + (sources."got-6.7.1" // { + dependencies = [ + (sources."create-error-class-3.0.2" // { + dependencies = [ + sources."capture-stack-trace-1.0.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."get-stream-3.0.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."safe-buffer-5.0.1" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + (sources."url-parse-lax-1.0.0" // { + dependencies = [ + sources."prepend-http-1.0.4" + ]; + }) + ]; + }) + sources."registry-auth-token-3.1.2" + sources."registry-url-3.1.0" + ]; + }) + ]; + }) + sources."lazy-req-2.0.0" + sources."semver-diff-2.1.0" + sources."xdg-basedir-3.0.0" + ]; + }) sources."uuid-3.0.1" - (sources."validate-npm-package-name-2.2.2" // { + (sources."validate-npm-package-name-3.0.0" // { dependencies = [ - sources."builtins-0.0.7" + sources."builtins-1.0.3" ]; }) (sources."which-1.2.14" // { @@ -38429,7 +38708,6 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-1.3.1" - sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -38451,19 +38729,19 @@ in }) ]; }) - (sources."npm-registry-client-7.4.6" // { + (sources."npm-registry-client-8.1.1" // { dependencies = [ (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -38472,7 +38750,7 @@ in sources."graceful-fs-4.1.11" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -38490,9 +38768,19 @@ in }) ]; }) - (sources."npm-package-arg-4.2.1" // { + (sources."npm-package-arg-5.0.1" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" + (sources."osenv-0.1.4" // { + dependencies = [ + sources."os-tmpdir-1.0.2" + ]; + }) + (sources."validate-npm-package-name-3.0.0" // { + dependencies = [ + sources."builtins-1.0.3" + ]; + }) ]; }) (sources."once-1.4.0" // { @@ -38512,14 +38800,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -38551,7 +38839,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -38595,14 +38883,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -38652,7 +38940,7 @@ in sources."passport-strategy-1.0.0" ]; }) - (sources."raven-1.1.5" // { + (sources."raven-1.2.1" // { dependencies = [ sources."cookie-0.3.1" sources."json-stringify-safe-5.0.1" @@ -38661,7 +38949,7 @@ in sources."stack-trace-0.0.9" ]; }) - (sources."rc-1.1.7" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -38669,7 +38957,7 @@ in sources."strip-json-comments-2.0.1" ]; }) - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -38682,7 +38970,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -38701,26 +38989,22 @@ in ]; }) sources."semver-5.3.0" - (sources."serve-static-1.11.2" // { + (sources."serve-static-1.12.1" // { dependencies = [ sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."parseurl-1.3.1" - (sources."send-0.14.2" // { + (sources."send-0.15.1" // { dependencies = [ - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) + sources."debug-2.6.1" sources."depd-1.1.0" sources."destroy-1.0.4" - sources."etag-1.7.0" - sources."fresh-0.3.0" - (sources."http-errors-1.5.1" // { + sources."etag-1.8.0" + sources."fresh-0.5.0" + (sources."http-errors-1.6.1" // { dependencies = [ sources."inherits-2.0.3" - sources."setprototypeof-1.0.2" + sources."setprototypeof-1.0.3" ]; }) sources."mime-1.3.4" @@ -38737,9 +39021,9 @@ in ]; }) sources."signals-1.0.0" - (sources."snapsvg-0.4.0" // { + (sources."snapsvg-0.5.1" // { dependencies = [ - sources."eve-0.4.2" + sources."eve-0.5.3" ]; }) (sources."socket.io-1.7.3" // { @@ -38912,7 +39196,7 @@ in sources."stack-trace-0.0.9" ]; }) - (sources."yargs-6.6.0" // { + (sources."yargs-7.1.0" // { dependencies = [ sources."camelcase-3.0.0" (sources."cliui-3.2.0" // { @@ -38977,7 +39261,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -39030,7 +39314,7 @@ in }) sources."which-module-1.0.0" sources."y18n-3.2.1" - sources."yargs-parser-4.2.1" + sources."yargs-parser-5.0.0" ]; }) ]; @@ -39133,7 +39417,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -39185,7 +39469,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -39213,7 +39497,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -39325,15 +39609,19 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "2.3.2"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-2.3.2.tgz"; - sha1 = "7d521e6f0777a3a58985c69425263fdfe977b458"; + url = "https://registry.npmjs.org/webpack/-/webpack-2.4.1.tgz"; + sha1 = "15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a"; }; dependencies = [ - sources."acorn-4.0.11" - sources."acorn-dynamic-import-2.0.2" - (sources."ajv-4.11.5" // { + sources."acorn-5.0.3" + (sources."acorn-dynamic-import-2.0.2" // { + dependencies = [ + sources."acorn-4.0.11" + ]; + }) + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -39344,7 +39632,7 @@ in ]; }) sources."ajv-keywords-1.5.1" - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -39357,12 +39645,12 @@ in }) sources."interpret-1.0.2" sources."json-loader-0.5.4" + sources."json5-0.5.1" sources."loader-runner-2.3.0" (sources."loader-utils-0.2.17" // { dependencies = [ sources."big.js-3.1.3" sources."emojis-list-2.1.0" - sources."json5-0.5.1" sources."object-assign-4.1.1" ]; }) @@ -39373,14 +39661,14 @@ in sources."prr-0.0.0" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -39443,7 +39731,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -39473,7 +39761,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -39533,13 +39821,14 @@ in sources."process-0.11.9" sources."punycode-1.4.1" sources."querystring-es3-0.2.1" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -39548,7 +39837,7 @@ in sources."inherits-2.0.3" ]; }) - (sources."stream-http-2.6.3" // { + (sources."stream-http-2.7.0" // { dependencies = [ sources."builtin-status-codes-3.0.0" sources."inherits-2.0.3" @@ -39588,7 +39877,7 @@ in ]; }) sources."tapable-0.2.6" - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ (sources."yargs-3.10.0" // { dependencies = [ @@ -39647,7 +39936,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -39735,7 +40024,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -39743,13 +40032,13 @@ in }) ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -39758,7 +40047,7 @@ in }) (sources."fsevents-1.1.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."nopt-4.0.1" // { @@ -39777,13 +40066,13 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -39817,7 +40106,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -39837,7 +40126,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -39866,7 +40155,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -39915,7 +40204,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -39951,7 +40240,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -39966,13 +40255,13 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -40058,7 +40347,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -40143,10 +40432,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.21.3"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz"; - sha1 = "8dda3a63c798b383cfa577452c2b3cb3e4aa87e0"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.22.0.tgz"; + sha1 = "fd8511dc29225b925be967dc185772cc59de5888"; }; dependencies = [ (sources."babel-runtime-6.23.0" // { @@ -40156,7 +40445,7 @@ in ]; }) sources."bytes-2.5.0" - sources."camelcase-3.0.0" + sources."camelcase-4.1.0" (sources."chalk-1.1.3" // { dependencies = [ sources."ansi-styles-2.2.1" @@ -40190,11 +40479,6 @@ in sources."ms-0.7.2" ]; }) - (sources."defaults-1.0.3" // { - dependencies = [ - sources."clone-1.0.2" - ]; - }) sources."detect-indent-5.0.0" sources."ini-1.3.4" (sources."inquirer-3.0.6" // { @@ -40282,7 +40566,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -40335,14 +40619,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -40413,14 +40697,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -40452,7 +40736,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -40537,20 +40821,21 @@ in }) ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) sources."xtend-4.0.1" ]; }) + sources."v8-compile-cache-1.1.0" (sources."validate-npm-package-license-3.0.1" // { dependencies = [ (sources."spdx-correct-1.0.2" // { @@ -40721,14 +41006,14 @@ in ]; }) sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -40870,14 +41155,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -40909,7 +41194,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -40971,7 +41256,7 @@ in sources."minimist-1.2.0" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -41014,7 +41299,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -41033,9 +41318,9 @@ in }) (sources."package-json-2.4.0" // { dependencies = [ - (sources."registry-auth-token-3.1.0" // { + (sources."registry-auth-token-3.1.2" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -41047,7 +41332,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -41115,7 +41400,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -41223,13 +41508,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -41288,14 +41573,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -41438,7 +41723,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -41477,7 +41762,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -41526,13 +41811,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -41584,14 +41869,14 @@ in dependencies = [ (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -41623,14 +41908,14 @@ in dependencies = [ (sources."first-chunk-stream-2.0.0" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 08070fe0e5f1..d61af12b7132 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -625,13 +625,13 @@ let sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970"; }; }; - "azure-arm-trafficmanager-0.10.5" = { + "azure-arm-trafficmanager-0.12.0" = { name = "azure-arm-trafficmanager"; packageName = "azure-arm-trafficmanager"; - version = "0.10.5"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.5.tgz"; - sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; + url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.12.0.tgz"; + sha1 = "609e585c0253960a91deaf773dae1ce184ce414b"; }; }; "azure-arm-dns-0.11.1" = { @@ -697,13 +697,13 @@ let sha1 = "379e6c2ed4155de86caff63243923c7330d34802"; }; }; - "azure-asm-compute-0.17.0" = { + "azure-asm-compute-0.18.0" = { name = "azure-asm-compute"; packageName = "azure-asm-compute"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.17.0.tgz"; - sha1 = "15967b535c06a5d06330b3d5adbf5b4b85e9df90"; + url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz"; + sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685"; }; }; "azure-asm-hdinsight-0.10.2" = { @@ -814,13 +814,13 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-2.0.0" = { + "azure-storage-2.1.0" = { name = "azure-storage"; packageName = "azure-storage"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.0.0.tgz"; - sha1 = "581ed1245ee105e818806efd5cc5cc4c14eab7c0"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz"; + sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01"; }; }; "azure-arm-batch-0.3.0" = { @@ -1741,13 +1741,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "brace-expansion-1.1.6" = { + "brace-expansion-1.1.7" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; - sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"; + sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59"; }; }; "balanced-match-0.4.2" = { @@ -1993,13 +1993,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.2.0" = { + "async-2.3.0" = { name = "async"; packageName = "async"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.2.0.tgz"; - sha1 = "c324eba010a237e4fbd55a12dee86367d5c0ef32"; + url = "https://registry.npmjs.org/async/-/async-2.3.0.tgz"; + sha1 = "1013d1051047dd320fe24e494d5c66ecaf6147d9"; }; }; "lodash-4.17.4" = { @@ -2218,13 +2218,13 @@ let sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "sshpk-1.11.0" = { + "sshpk-1.13.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; - sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz"; + sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"; }; }; "assert-plus-1.0.0" = { @@ -2434,13 +2434,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "readable-stream-2.2.6" = { + "readable-stream-2.2.9" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.6"; + version = "2.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; - sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"; + sha1 = "cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"; }; }; "buffer-shims-1.0.0" = { @@ -2452,6 +2452,15 @@ let sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; }; }; + "string_decoder-1.0.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz"; + sha1 = "f06f41157b664d86069f84bdbdc9b0d8ab281667"; + }; + }; "http-basic-2.5.1" = { name = "http-basic"; packageName = "http-basic"; @@ -2938,13 +2947,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.4.1" = { + "hosted-git-info-2.4.2" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"; - sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"; + sha1 = "0076b9f46a270506ddbaaea56496897460612a67"; }; }; "is-builtin-module-1.0.0" = { @@ -3298,13 +3307,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-5.0.5" = { + "buffer-5.0.6" = { name = "buffer"; packageName = "buffer"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; - sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.6.tgz"; + sha1 = "2ea669f7eec0b6eda05b08f8b5ff661b28573588"; }; }; "cached-path-relative-1.0.1" = { @@ -3415,13 +3424,13 @@ let sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "https-browserify-0.0.1" = { + "https-browserify-1.0.0" = { name = "https-browserify"; packageName = "https-browserify"; - version = "0.0.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; - sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; "insert-module-globals-7.0.1" = { @@ -3532,13 +3541,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.6.3" = { + "stream-http-2.7.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.6.3"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz"; - sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.0.tgz"; + sha1 = "cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"; }; }; "subarg-1.0.0" = { @@ -3919,13 +3928,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "hmac-drbg-1.0.0" = { + "hmac-drbg-1.0.1" = { name = "hmac-drbg"; packageName = "hmac-drbg"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz"; - sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5"; + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -4612,13 +4621,13 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; - "parse-torrent-5.8.2" = { + "parse-torrent-5.8.3" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.2.tgz"; - sha1 = "09f02ca43ec2d885d1460aacb0fb50c79b3c49f9"; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz"; + sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c"; }; }; "pump-0.3.5" = { @@ -4810,31 +4819,31 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; - "magnet-uri-5.1.5" = { + "magnet-uri-5.1.6" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz"; - sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.6.tgz"; + sha1 = "60e8fb5ea90488c8491701eb306970f3126480b3"; }; }; - "parse-torrent-file-4.0.1" = { + "parse-torrent-file-4.0.2" = { name = "parse-torrent-file"; packageName = "parse-torrent-file"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz"; - sha1 = "4580c5ebb3f6e607baa02ef0ace51f627859e699"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.2.tgz"; + sha1 = "981a22143832abbcd99052d889d31a39ae3f9bfe"; }; }; - "simple-get-2.4.0" = { + "simple-get-2.5.1" = { name = "simple-get"; packageName = "simple-get"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz"; - sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.5.1.tgz"; + sha1 = "eb418fb2c9e431631b4cd6c478af548da613ccd2"; }; }; "thirty-two-1.0.2" = { @@ -4963,13 +4972,13 @@ let sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; }; }; - "fs-chunk-store-1.6.4" = { + "fs-chunk-store-1.6.5" = { name = "fs-chunk-store"; packageName = "fs-chunk-store"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.4.tgz"; - sha1 = "5aa0025d58533118552e815f5986f39f93b06e69"; + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz"; + sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156"; }; }; "hat-0.0.3" = { @@ -5035,22 +5044,22 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-piece-1.1.0" = { + "torrent-piece-1.1.1" = { name = "torrent-piece"; packageName = "torrent-piece"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.0.tgz"; - sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; + url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.1.tgz"; + sha1 = "50346e42a43b35daf2a86f414afb153629a854be"; }; }; - "random-access-file-1.5.0" = { + "random-access-file-1.6.1" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz"; - sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.6.1.tgz"; + sha1 = "33358436f43076d34a058db47177a691319f0e99"; }; }; "run-parallel-1.1.6" = { @@ -5071,6 +5080,15 @@ let sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; + "buffer-alloc-unsafe-1.0.0" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; + sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + }; + }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -5368,13 +5386,13 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; - "ws-2.2.2" = { + "ws-2.2.3" = { name = "ws"; packageName = "ws"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-2.2.2.tgz"; - sha1 = "aa26daf39c52b20ed716e3447f8641494a726b01"; + url = "https://registry.npmjs.org/ws/-/ws-2.2.3.tgz"; + sha1 = "f36c9719a56dff813f455af912a2078145bbd940"; }; }; "ultron-1.1.0" = { @@ -5863,13 +5881,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.17" = { + "big-integer-1.6.19" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.17"; + version = "1.6.19"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz"; - sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.19.tgz"; + sha1 = "4a5e915e3188c8708f254b356196f28542acc1e0"; }; }; "sax-1.1.4" = { @@ -5962,13 +5980,13 @@ let sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; }; }; - "init-package-json-1.9.5" = { + "init-package-json-1.9.6" = { name = "init-package-json"; packageName = "init-package-json"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.5.tgz"; - sha1 = "7d4d64a264dc76c1f1f557cbbe824978bf10cd09"; + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.6.tgz"; + sha1 = "789fc2b74466a4952b9ea77c0575bc78ebd60a61"; }; }; "nopt-3.0.6" = { @@ -6061,13 +6079,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "xcode-0.9.1" = { + "xcode-0.9.3" = { name = "xcode"; packageName = "xcode"; - version = "0.9.1"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz"; - sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95"; + url = "https://registry.npmjs.org/xcode/-/xcode-0.9.3.tgz"; + sha1 = "910a89c16aee6cc0b42ca805a6d0b4cf87211cf3"; }; }; "browserify-transform-tools-1.5.3" = { @@ -6196,6 +6214,15 @@ let sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; + "https-browserify-0.0.1" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; + sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + }; + }; "compression-1.6.2" = { name = "compression"; packageName = "compression"; @@ -6484,13 +6511,13 @@ let sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; }; }; - "type-is-1.6.14" = { + "type-is-1.6.15" = { name = "type-is"; packageName = "type-is"; - version = "1.6.14"; + version = "1.6.15"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; - sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"; + sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; }; }; "utils-merge-1.0.0" = { @@ -6574,13 +6601,13 @@ let sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; }; }; - "npm-package-arg-4.2.1" = { + "npm-package-arg-5.0.1" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "4.2.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz"; - sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.0.1.tgz"; + sha1 = "09a816e3f45a549e3ddaf33e9bae5e7b31077872"; }; }; "promzard-0.3.0" = { @@ -7150,6 +7177,15 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; + "npm-package-arg-4.2.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz"; + sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec"; + }; + }; "request-2.81.0" = { name = "request"; packageName = "request"; @@ -7168,13 +7204,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "form-data-2.1.2" = { + "form-data-2.1.4" = { name = "form-data"; packageName = "form-data"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; - sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; + sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; "har-validator-4.2.1" = { @@ -7213,13 +7249,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "ajv-4.11.5" = { + "ajv-4.11.6" = { name = "ajv"; packageName = "ajv"; - version = "4.11.5"; + version = "4.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; - sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.6.tgz"; + sha1 = "947e93049790942b2a2d60a8289b28924d39f987"; }; }; "har-schema-1.0.5" = { @@ -7501,49 +7537,40 @@ let sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; }; }; - "pegjs-0.9.0" = { + "pegjs-0.10.0" = { name = "pegjs"; packageName = "pegjs"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/pegjs/-/pegjs-0.9.0.tgz"; - sha1 = "f6aefa2e3ce56169208e52179dfe41f89141a369"; + url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; + sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; }; }; - "simple-plist-0.1.4" = { + "simple-plist-0.2.1" = { name = "simple-plist"; packageName = "simple-plist"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.1.4.tgz"; - sha1 = "10eb51b47e33c556eb8ec46d5ee64d64e717db5d"; - }; - }; - "bplist-parser-0.0.6" = { - name = "bplist-parser"; - packageName = "bplist-parser"; - version = "0.0.6"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"; - sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9"; + url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; + sha1 = "71766db352326928cf3a807242ba762322636723"; }; }; - "bplist-creator-0.0.4" = { + "bplist-creator-0.0.7" = { name = "bplist-creator"; packageName = "bplist-creator"; - version = "0.0.4"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.4.tgz"; - sha1 = "4ac0496782e127a85c1d2026a4f5eb22a7aff991"; + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz"; + sha1 = "37df1536092824b87c42f957b01344117372ae45"; }; }; - "stream-buffers-0.2.6" = { + "stream-buffers-2.2.0" = { name = "stream-buffers"; packageName = "stream-buffers"; - version = "0.2.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-0.2.6.tgz"; - sha1 = "181c08d5bb3690045f69401b9ae6a7a0cf3313fc"; + url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; + sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; "async-1.5.2" = { @@ -7834,13 +7861,13 @@ let sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; - "rc-1.2.0" = { + "rc-1.2.1" = { name = "rc"; packageName = "rc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.0.tgz"; - sha1 = "c7de973b7b46297c041366b2fd3d2363b1697c66"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz"; + sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"; }; }; "strip-json-comments-2.0.1" = { @@ -8267,13 +8294,13 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "nan-2.5.1" = { + "nan-2.6.2" = { name = "nan"; packageName = "nan"; - version = "2.5.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; - sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; + url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; + sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; }; }; "jsonparse-0.0.6" = { @@ -9233,13 +9260,13 @@ let sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "espree-3.4.0" = { + "espree-3.4.1" = { name = "espree"; packageName = "espree"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz"; - sha1 = "41656fa5628e042878025ef467e78f125cb86e1d"; + url = "https://registry.npmjs.org/espree/-/espree-3.4.1.tgz"; + sha1 = "28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"; }; }; "esquery-1.0.0" = { @@ -9287,13 +9314,13 @@ let sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286"; }; }; - "ignore-3.2.6" = { + "ignore-3.2.7" = { name = "ignore"; packageName = "ignore"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.6.tgz"; - sha1 = "26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz"; + sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"; }; }; "inquirer-0.12.0" = { @@ -9314,13 +9341,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.8.2" = { + "js-yaml-3.8.3" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz"; - sha1 = "02d3e2c0f6beab20248d412c352203827d786721"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz"; + sha1 = "33a05ec481c850c8875929166fe1beb61c728766"; }; }; "levn-0.3.0" = { @@ -9485,13 +9512,13 @@ let sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; }; }; - "acorn-4.0.4" = { + "acorn-5.0.3" = { name = "acorn"; packageName = "acorn"; - version = "4.0.4"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz"; - sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz"; + sha1 = "c460df08491463f028ccb82eab3730bf01087b3d"; }; }; "acorn-jsx-3.0.1" = { @@ -10088,13 +10115,13 @@ let sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"; }; }; - "arr-flatten-1.0.1" = { + "arr-flatten-1.0.2" = { name = "arr-flatten"; packageName = "arr-flatten"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"; - sha1 = "e5ffe54d45e19f32f216e91eb99c8ce892bb604b"; + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.2.tgz"; + sha1 = "1ec1e63439c54f67d6f72bb4299c3d4f73b2d996"; }; }; "expand-range-1.8.2" = { @@ -10439,13 +10466,13 @@ let sha1 = "21ffdc429be2b50cb361df990a40a7731288e935"; }; }; - "simple-git-1.69.0" = { + "simple-git-1.70.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.69.0"; + version = "1.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.69.0.tgz"; - sha1 = "e86ead16abfc273dca9ae2bd51e5eb3c0122c177"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.70.0.tgz"; + sha1 = "62cfd90bb2628a13ff4fe704c840fcef56244a71"; }; }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { @@ -10485,13 +10512,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.4" = { + "coffee-script-1.12.5" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; - sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz"; + sha1 = "809f4585419112bbfe46a073ad7543af18c27346"; }; }; "jade-1.11.0" = { @@ -10575,13 +10602,13 @@ let sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }; }; - "uglify-js-2.8.20" = { + "uglify-js-2.8.22" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.20"; + version = "2.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.22.tgz"; + sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0"; }; }; "void-elements-2.0.1" = { @@ -13824,13 +13851,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.21" = { + "node-red-node-email-0.1.22" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.21"; + version = "0.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.21.tgz"; - sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.22.tgz"; + sha1 = "99c610fdba3f498ddab71da9273d6003e4e0280e"; }; }; "node-red-node-twitter-0.1.10" = { @@ -13842,13 +13869,13 @@ let sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221"; }; }; - "node-red-node-rbe-0.1.6" = { + "node-red-node-rbe-0.1.8" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.6"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz"; - sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.8.tgz"; + sha1 = "96108a5720842387ea5ddd046d7e483c7ab2a5dc"; }; }; "bcrypt-1.0.2" = { @@ -14031,13 +14058,13 @@ let sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "moment-timezone-0.5.11" = { + "moment-timezone-0.5.13" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.11"; + version = "0.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz"; - sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz"; + sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90"; }; }; "content-disposition-0.5.1" = { @@ -14139,22 +14166,22 @@ let sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; }; }; - "help-me-1.0.1" = { + "help-me-1.1.0" = { name = "help-me"; packageName = "help-me"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-1.0.1.tgz"; - sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a"; + url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; + sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "mqtt-packet-5.2.2" = { + "mqtt-packet-5.3.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "5.2.2"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.2.tgz"; - sha1 = "190d4358f415c6f964211030c20ca0bf45d5698a"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.3.0.tgz"; + sha1 = "078ed59ae4c06febf3b3eaca90b50e97e269f206"; }; }; "reinterval-1.1.0" = { @@ -14193,6 +14220,42 @@ let sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; }; }; + "glob-stream-6.1.0" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; + sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; + }; + }; + "is-negated-glob-1.0.0" = { + name = "is-negated-glob"; + packageName = "is-negated-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; + sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + }; + }; + "ordered-read-streams-1.0.0" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.0.tgz"; + sha1 = "d674a86ffcedf83d0ae06afa2918855e96d4033a"; + }; + }; + "to-absolute-glob-2.0.1" = { + name = "to-absolute-glob"; + packageName = "to-absolute-glob"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz"; + sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b"; + }; + }; "feedparser-1.1.3" = { name = "feedparser"; packageName = "feedparser"; @@ -14940,13 +15003,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-4.0.1" = { + "mailcomposer-4.0.2" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; - sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz"; + sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101"; }; }; "simplesmtp-0.3.35" = { @@ -15075,15 +15138,6 @@ let sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; }; }; - "hosted-git-info-2.2.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; - sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; - }; - }; "lazy-property-1.0.0" = { name = "lazy-property"; packageName = "lazy-property"; @@ -15156,15 +15210,6 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; - "node-gyp-3.5.0" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; - sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; - }; - }; "npm-install-checks-3.0.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -15174,13 +15219,13 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "npm-registry-client-7.4.6" = { + "npm-registry-client-8.1.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.4.6"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.6.tgz"; - sha1 = "0aa7c55f18631b941b7b80a7aa501bfcb8b19717"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz"; + sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf"; }; }; "opener-1.4.3" = { @@ -15525,13 +15570,13 @@ let sha1 = "f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998"; }; }; - "registry-auth-token-3.1.0" = { + "registry-auth-token-3.1.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz"; - sha1 = "997c08256e0c7999837b90e944db39d8a790276b"; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.2.tgz"; + sha1 = "1b9e51a185c930da34a9894b12a52ea998f1adaf"; }; }; "argparse-0.1.15" = { @@ -15786,13 +15831,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.26.1" = { + "snyk-1.28.1" = { name = "snyk"; packageName = "snyk"; - version = "1.26.1"; + version = "1.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.26.1.tgz"; - sha1 = "12b28e9b43c6453ecb6d4be7670b0c0df7db38a5"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.28.1.tgz"; + sha1 = "ae0faed0fcee7d5dbc0fa8a7a8c9ebacb03b6151"; }; }; "spawn-please-0.2.0" = { @@ -15903,22 +15948,22 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-module-1.7.0" = { + "snyk-module-1.8.1" = { name = "snyk-module"; packageName = "snyk-module"; - version = "1.7.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.7.0.tgz"; - sha1 = "07c6ca8556d281de6f9e2368c04ecb6dd1f2631a"; + url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz"; + sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; }; }; - "snyk-policy-1.7.0" = { + "snyk-policy-1.7.1" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.0.tgz"; - sha1 = "2151c751ab1edc040fc6b94a872aa989db492324"; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz"; + sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22"; }; }; "snyk-recursive-readdir-2.0.0" = { @@ -16318,15 +16363,6 @@ let sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; - "gelf-stream-0.2.4" = { - name = "gelf-stream"; - packageName = "gelf-stream"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz"; - sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013"; - }; - }; "mediawiki-title-0.5.6" = { name = "mediawiki-title"; packageName = "mediawiki-title"; @@ -16383,6 +16419,15 @@ let sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; }; }; + "yargs-5.0.0" = { + name = "yargs"; + packageName = "yargs"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; + sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + }; + }; "is-arguments-1.0.2" = { name = "is-arguments"; packageName = "is-arguments"; @@ -16437,22 +16482,13 @@ let sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; }; }; - "gelfling-0.2.0" = { - name = "gelfling"; - packageName = "gelfling"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; - sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; - }; - }; - "bunyan-1.8.9" = { + "bunyan-1.8.10" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.9"; + version = "1.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz"; - sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz"; + sha1 = "201fedd26c7080b632f416072f53a90b9a52981c"; }; }; "bunyan-syslog-udp-0.1.0" = { @@ -16663,6 +16699,15 @@ let sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; }; }; + "yargs-parser-3.2.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; + sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; + }; + }; "airplayer-2.0.0" = { name = "airplayer"; packageName = "airplayer"; @@ -16753,15 +16798,6 @@ let sha1 = "d5bd826506425a3b3eacadf1e0e2c1ac3e289728"; }; }; - "stream-buffers-2.2.0" = { - name = "stream-buffers"; - packageName = "stream-buffers"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; - sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; - }; - }; "consume-http-header-1.0.0" = { name = "consume-http-header"; packageName = "consume-http-header"; @@ -17545,6 +17581,96 @@ let sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; }; }; + "ast-types-0.9.8" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.9.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.8.tgz"; + sha1 = "6cb6a40beba31f49f20928e28439fc14a3dab078"; + }; + }; + "babylon-7.0.0-beta.8" = { + name = "babylon"; + packageName = "babylon"; + version = "7.0.0-beta.8"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.8.tgz"; + sha1 = "2bdc5ae366041442c27e068cce6f0d7c06ea9949"; + }; + }; + "flow-parser-0.43.0" = { + name = "flow-parser"; + packageName = "flow-parser"; + version = "0.43.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.43.0.tgz"; + sha1 = "e2b8eb1ac83dd53f7b6b04a7c35b6a52c33479b7"; + }; + }; + "jest-validate-19.0.0" = { + name = "jest-validate"; + packageName = "jest-validate"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-19.0.0.tgz"; + sha1 = "8c6318a20ecfeaba0ba5378bfbb8277abded4173"; + }; + }; + "jest-matcher-utils-19.0.0" = { + name = "jest-matcher-utils"; + packageName = "jest-matcher-utils"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz"; + sha1 = "5ecd9b63565d2b001f61fbf7ec4c7f537964564d"; + }; + }; + "leven-2.1.0" = { + name = "leven"; + packageName = "leven"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; + }; + }; + "pretty-format-19.0.0" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-19.0.0.tgz"; + sha1 = "56530d32acb98a3fa4851c4e2b9d37b420684c84"; + }; + }; + "ansi-styles-3.0.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.0.0.tgz"; + sha1 = "5404e93a544c4fec7f048262977bebfe3155e0c1"; + }; + }; + "color-convert-1.9.0" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; + sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + }; + }; + "color-name-1.1.2" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; + sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; + }; + }; "commoner-0.10.8" = { name = "commoner"; packageName = "commoner"; @@ -18689,22 +18815,13 @@ let sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580"; }; }; - "express-4.14.1" = { - name = "express"; - packageName = "express"; - version = "4.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz"; - sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33"; - }; - }; - "express-session-1.14.2" = { + "express-session-1.15.2" = { name = "express-session"; packageName = "express-session"; - version = "1.14.2"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz"; - sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; + sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; }; }; "forever-monitor-1.1.0" = { @@ -18761,13 +18878,13 @@ let sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; }; }; - "npm-4.1.2" = { + "npm-4.5.0" = { name = "npm"; packageName = "npm"; - version = "4.1.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz"; - sha1 = "daaa77d631947135b36528c304573243f5cd2e07"; + url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz"; + sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475"; }; }; "octicons-3.5.0" = { @@ -18788,13 +18905,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.1.5" = { + "raven-1.2.1" = { name = "raven"; packageName = "raven"; - version = "1.1.5"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.1.5.tgz"; - sha1 = "6af541406c37da1d678781d0af411c27c6f05fbf"; + url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz"; + sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd"; }; }; "signals-1.0.0" = { @@ -18806,13 +18923,13 @@ let sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; }; }; - "snapsvg-0.4.0" = { + "snapsvg-0.5.1" = { name = "snapsvg"; packageName = "snapsvg"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.4.0.tgz"; - sha1 = "e0767014167825957de7e125c29b0fa89796ea03"; + url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz"; + sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; }; }; "winston-2.3.1" = { @@ -18824,13 +18941,13 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "color-convert-1.9.0" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.0"; + "yargs-7.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; - sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz"; + sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; }; }; "color-string-1.5.2" = { @@ -18842,15 +18959,6 @@ let sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; }; }; - "color-name-1.1.2" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; - sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; - }; - }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -18887,13 +18995,13 @@ let sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; }; }; - "crc-3.4.1" = { + "crc-3.4.4" = { name = "crc"; packageName = "crc"; - version = "3.4.1"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz"; - sha1 = "65d5830b1a2569557cfb324c0e679998521473ee"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; + sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; "broadway-0.2.10" = { @@ -19022,15 +19130,6 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "mississippi-1.2.0" = { - name = "mississippi"; - packageName = "mississippi"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; - sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; - }; - }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -19049,13 +19148,22 @@ let sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; - "eve-0.4.2" = { + "eve-0.5.3" = { name = "eve"; packageName = "eve"; - version = "0.4.2"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eve/-/eve-0.5.3.tgz"; + sha1 = "6c2f6588f7d0b392044d245ba5af9d7cfe237f42"; + }; + }; + "yargs-parser-5.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eve/-/eve-0.4.2.tgz"; - sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz"; + sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; }; }; "kew-0.1.7" = { @@ -19121,6 +19229,15 @@ let sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de"; }; }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; "loader-runner-2.3.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -19193,15 +19310,6 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; - }; - }; "os-browserify-0.2.1" = { name = "os-browserify"; packageName = "os-browserify"; @@ -19301,15 +19409,6 @@ let sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; }; }; - "leven-2.1.0" = { - name = "leven"; - packageName = "leven"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; - sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; - }; - }; "node-emoji-1.5.1" = { name = "node-emoji"; packageName = "node-emoji"; @@ -19355,6 +19454,15 @@ let sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e"; }; }; + "v8-compile-cache-1.1.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.0.tgz"; + sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9"; + }; + }; "regenerator-runtime-0.10.3" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -19856,10 +19964,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.8"; + version = "1.9.11"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.8.tgz"; - sha1 = "17294e9828a1f11ef241d59f5eb040e6a5b4ed13"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.11.tgz"; + sha1 = "6e185c5c3211b5a86d272caec63b8daf80e5b186"; }; dependencies = [ sources."colors-0.6.0-1" @@ -19937,10 +20045,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.11"; + version = "0.10.12"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.11.tgz"; - sha1 = "aa1a379386b5c60f90f86134b4047acb1302d482"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.12.tgz"; + sha1 = "4446af5df8dda6c755a0bf7dfec2468a9f63f26d"; }; dependencies = [ sources."adal-node-0.1.21" @@ -19964,7 +20072,7 @@ in sources."azure-arm-servermanagement-0.1.2" sources."azure-arm-network-0.18.0" sources."azure-arm-powerbiembedded-0.1.0" - sources."azure-arm-trafficmanager-0.10.5" + sources."azure-arm-trafficmanager-0.12.0" sources."azure-arm-dns-0.11.1" sources."azure-arm-website-0.11.4" sources."azure-arm-rediscache-0.2.3" @@ -19972,7 +20080,7 @@ in sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" sources."azure-keyvault-0.11.0" - sources."azure-asm-compute-0.17.0" + sources."azure-asm-compute-0.18.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" sources."azure-asm-mgmt-0.10.1" @@ -19993,7 +20101,7 @@ in sources."moment-2.14.1" ]; }) - (sources."azure-storage-2.0.0" // { + (sources."azure-storage-2.1.0" // { dependencies = [ sources."readable-stream-2.0.6" sources."validator-3.22.2" @@ -20145,7 +20253,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" @@ -20162,7 +20270,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.2.0" + sources."async-2.3.0" ]; }) (sources."har-validator-2.0.6" // { @@ -20208,7 +20316,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -20241,7 +20349,8 @@ in sources."amdefine-1.0.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" + sources."string_decoder-1.0.0" ]; }) sources."http-response-object-1.1.0" @@ -20332,7 +20441,7 @@ in sources."timed-out-2.0.0" sources."end-of-stream-1.0.0" sources."inherits-2.0.3" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."stream-shift-1.0.0" sources."once-1.3.3" sources."wrappy-1.0.2" @@ -20340,7 +20449,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" @@ -20355,7 +20464,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -20411,7 +20520,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."q-1.5.0" @@ -20435,10 +20544,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.1.0"; + version = "14.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz"; - sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.3.0.tgz"; + sha1 = "fd003a2386ac1aec127f097885a3cc6373b745c4"; }; dependencies = [ sources."JSONStream-1.3.1" @@ -20450,7 +20559,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."buffer-5.0.5" + sources."buffer-5.0.6" sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -20468,7 +20577,7 @@ in sources."glob-7.1.1" sources."has-1.0.1" sources."htmlescape-1.1.1" - sources."https-browserify-0.0.1" + sources."https-browserify-1.0.0" sources."inherits-2.0.3" sources."insert-module-globals-7.0.1" (sources."labeled-stream-splicer-2.0.0" // { @@ -20484,12 +20593,16 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - sources."readable-stream-2.2.6" + (sources."readable-stream-2.2.9" // { + dependencies = [ + sources."string_decoder-1.0.0" + ]; + }) sources."resolve-1.3.2" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.6.3" + sources."stream-http-2.7.0" sources."string_decoder-0.10.31" sources."subarg-1.0.0" sources."syntax-error-1.3.0" @@ -20547,7 +20660,7 @@ in sources."parse-asn1-5.1.0" sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" @@ -20559,7 +20672,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."function-bind-1.1.0" @@ -20696,7 +20809,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -20734,7 +20847,7 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.2" // { + (sources."parse-torrent-5.8.3" // { dependencies = [ sources."get-stdin-5.0.1" ]; @@ -20785,9 +20898,9 @@ in sources."mute-stream-0.0.4" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-5.1.5" - sources."parse-torrent-file-4.0.1" - sources."simple-get-2.4.0" + sources."magnet-uri-5.1.6" + sources."parse-torrent-file-4.0.2" + sources."simple-get-2.5.1" sources."thirty-two-1.0.2" sources."uniq-1.0.1" sources."bencode-0.11.0" @@ -20807,7 +20920,7 @@ in sources."ini-1.1.0" sources."bitfield-0.1.0" sources."bncode-0.5.3" - (sources."fs-chunk-store-1.6.4" // { + (sources."fs-chunk-store-1.6.5" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" @@ -20821,8 +20934,8 @@ in sources."peer-wire-swarm-0.12.1" sources."rimraf-2.6.1" sources."torrent-discovery-5.4.0" - sources."torrent-piece-1.1.0" - (sources."random-access-file-1.5.0" // { + sources."torrent-piece-1.1.1" + (sources."random-access-file-1.6.1" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" @@ -20831,6 +20944,7 @@ in }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" + sources."buffer-alloc-unsafe-1.0.0" sources."inherits-2.0.3" sources."ip-1.1.5" sources."flatten-0.0.1" @@ -20852,7 +20966,7 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" (sources."bittorrent-dht-6.4.2" // { @@ -20882,15 +20996,17 @@ in sources."run-series-1.1.4" (sources."simple-peer-6.4.4" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.2.6" - sources."ws-2.2.2" + sources."readable-stream-2.2.9" + sources."ws-2.2.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."string2compact-1.2.2" @@ -20904,6 +21020,7 @@ in sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" + sources."safe-buffer-5.0.1" sources."ultron-1.1.0" sources."addr-to-ip-port-1.4.2" sources."options-0.0.6" @@ -20940,8 +21057,9 @@ in sources."voc-0.5.0" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."exit-on-epipe-1.0.0" @@ -20962,10 +21080,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; - sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz"; + sha1 = "809f4585419112bbfe46a073ad7543af18c27346"; }; buildInputs = globalBuildInputs; meta = { @@ -21021,14 +21139,14 @@ in sources."semver-5.3.0" sources."shelljs-0.5.3" sources."unorm-1.4.1" - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" sources."sax-1.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."os-homedir-1.0.2" @@ -21062,7 +21180,7 @@ in sources."underscore-1.2.1" ]; }) - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ sources."glob-7.1.1" ]; @@ -21118,11 +21236,7 @@ in }) sources."tar-1.0.2" sources."valid-identifier-0.0.1" - (sources."xcode-0.9.1" // { - dependencies = [ - sources."node-uuid-1.4.7" - ]; - }) + sources."xcode-0.9.3" sources."browserify-transform-tools-1.5.3" sources."falafel-1.2.0" sources."through-2.3.8" @@ -21190,15 +21304,16 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.6.3" + sources."stream-http-2.7.0" sources."string_decoder-0.10.31" sources."subarg-1.0.0" (sources."syntax-error-1.3.0" // { @@ -21256,7 +21371,7 @@ in sources."parse-asn1-5.1.0" sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" @@ -21346,7 +21461,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."utils-merge-1.0.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" @@ -21356,7 +21471,7 @@ in sources."http-errors-1.6.1" sources."mime-1.3.4" sources."media-typer-0.3.0" - sources."npm-package-arg-4.2.1" + sources."npm-package-arg-5.0.1" sources."promzard-0.3.0" sources."read-1.0.7" (sources."read-package-json-2.0.5" // { @@ -21366,7 +21481,7 @@ in }) sources."validate-npm-package-license-3.0.1" sources."validate-npm-package-name-3.0.0" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."mute-stream-0.0.7" sources."json-parse-helpfulerror-1.0.3" sources."normalize-package-data-2.3.6" @@ -21417,6 +21532,7 @@ in sources."npm-install-checks-1.0.7" (sources."npm-registry-client-7.2.1" // { dependencies = [ + sources."npm-package-arg-4.2.1" sources."request-2.81.0" ]; }) @@ -21424,7 +21540,11 @@ in sources."npmlog-2.0.4" sources."path-is-inside-1.0.2" sources."read-installed-4.0.3" - sources."realize-package-specifier-3.0.3" + (sources."realize-package-specifier-3.0.3" // { + dependencies = [ + sources."npm-package-arg-4.2.1" + ]; + }) sources."retry-0.10.1" (sources."rimraf-2.5.4" // { dependencies = [ @@ -21455,7 +21575,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -21471,7 +21591,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."json-stable-stringify-1.0.1" ]; @@ -21488,7 +21608,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21529,7 +21649,7 @@ in ]; }) sources."node-uuid-1.4.8" - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -21545,14 +21665,16 @@ in sources."pinkie-2.0.4" sources."isexe-2.0.0" sources."ctype-0.5.3" - sources."pegjs-0.9.0" - (sources."simple-plist-0.1.4" // { + sources."pegjs-0.10.0" + (sources."simple-plist-0.2.1" // { dependencies = [ - sources."bplist-parser-0.0.6" + sources."plist-2.0.1" + sources."base64-js-1.1.2" + sources."xmlbuilder-8.2.2" ]; }) - sources."bplist-creator-0.0.4" - sources."stream-buffers-0.2.6" + sources."bplist-creator-0.0.7" + sources."stream-buffers-2.2.0" (sources."configstore-1.4.0" // { dependencies = [ sources."uuid-2.0.3" @@ -21610,7 +21732,7 @@ in ]; }) sources."stream-shift-1.0.0" - sources."rc-1.2.0" + sources."rc-1.2.1" sources."deep-extend-0.4.1" sources."strip-json-comments-2.0.1" sources."is-finite-1.0.2" @@ -21732,7 +21854,7 @@ in sources."destroy-1.0.3" sources."mime-1.2.11" sources."bindings-1.2.1" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."jsonparse-0.0.6" sources."es5class-2.3.1" sources."faye-websocket-0.11.1" @@ -21835,8 +21957,9 @@ in sources."minimist-1.2.0" sources."split2-2.1.1" sources."through2-2.0.3" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."pump-1.0.2" @@ -21849,8 +21972,9 @@ in (sources."tar-stream-1.5.2" // { dependencies = [ sources."bl-1.2.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) (sources."through2-0.6.5" // { @@ -21874,9 +21998,10 @@ in (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."once-1.3.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."lru-cache-2.7.3" @@ -21943,7 +22068,7 @@ in }; dependencies = [ sources."JSONStream-1.3.1" - sources."async-2.2.0" + sources."async-2.3.0" sources."aws4-1.6.0" sources."awscred-1.2.0" sources."ini-1.3.4" @@ -21959,7 +22084,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -21977,7 +22102,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -21992,7 +22117,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22099,7 +22224,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -22137,10 +22262,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.18.0"; + version = "3.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.18.0.tgz"; - sha1 = "647e985c4ae71502d20ac62c109f66d5104c8a4b"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; + sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; dependencies = [ sources."babel-code-frame-6.22.0" @@ -22149,19 +22274,19 @@ in sources."debug-2.6.3" sources."doctrine-2.0.0" sources."escope-3.6.0" - sources."espree-3.4.0" + sources."espree-3.4.1" sources."esquery-1.0.0" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."glob-7.1.1" sources."globals-9.17.0" - sources."ignore-3.2.6" + sources."ignore-3.2.7" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" sources."is-my-json-valid-2.16.0" sources."is-resolvable-1.0.0" - sources."js-yaml-3.8.2" + sources."js-yaml-3.8.3" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" @@ -22192,12 +22317,12 @@ in sources."ansi-regex-2.1.1" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."ms-0.7.2" sources."es6-map-0.1.5" @@ -22214,7 +22339,7 @@ in sources."es6-symbol-3.1.1" sources."event-emitter-0.3.5" sources."object-assign-4.1.1" - sources."acorn-4.0.4" + sources."acorn-5.0.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -22242,7 +22367,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."ansi-escapes-1.4.0" @@ -22284,7 +22409,7 @@ in sources."rechoir-0.6.2" sources."resolve-1.3.2" sources."path-parse-1.0.5" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" sources."co-4.6.0" @@ -22428,7 +22553,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -22450,14 +22575,14 @@ in sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."node-pre-gyp-0.6.34" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -22466,7 +22591,7 @@ in }) sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -22508,7 +22633,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -22526,7 +22651,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -22541,7 +22666,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22578,7 +22703,7 @@ in sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" sources."ms-0.7.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" (sources."event-stream-0.5.3" // { @@ -22613,10 +22738,10 @@ in sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4"; }; dependencies = [ - sources."async-2.2.0" + sources."async-2.3.0" sources."lodash.groupby-4.6.0" sources."minilog-2.0.8" - sources."simple-git-1.69.0" + sources."simple-git-1.70.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" sources."lodash-4.17.4" sources."microee-0.0.2" @@ -22649,7 +22774,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."abbrev-1.1.0" @@ -22672,7 +22797,7 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" sources."jade-1.11.0" (sources."q-2.0.3" // { dependencies = [ @@ -22699,7 +22824,7 @@ in sources."source-map-0.1.43" ]; }) - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" ]; @@ -22747,7 +22872,7 @@ in sources."sax-1.2.2" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" - sources."nan-2.5.1" + sources."nan-2.6.2" ]; buildInputs = globalBuildInputs; meta = { @@ -22807,8 +22932,9 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."vinyl-0.5.3" @@ -22865,7 +22991,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -22938,7 +23064,7 @@ in sources."glob2base-0.0.12" sources."unique-stream-1.0.0" sources."inflight-1.0.6" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."find-index-0.1.1" @@ -23018,7 +23144,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" (sources."cli-0.6.6" // { @@ -23098,7 +23224,7 @@ in sources."source-map-0.4.4" ]; }) - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ sources."esprima-3.1.3" ]; @@ -23129,7 +23255,7 @@ in sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" (sources."optimist-0.6.1" // { @@ -23137,7 +23263,7 @@ in sources."wordwrap-0.0.3" ]; }) - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" ]; @@ -23232,7 +23358,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" ]; @@ -23277,10 +23403,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz"; - sha1 = "02d3e2c0f6beab20248d412c352203827d786721"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz"; + sha1 = "33a05ec481c850c8875929166fe1beb61c728766"; }; dependencies = [ sources."argparse-1.0.9" @@ -23298,10 +23424,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.5.0.tgz"; - sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009"; + url = "https://registry.npmjs.org/karma/-/karma-1.6.0.tgz"; + sha1 = "0e871d4527d5eac56c41d181f03c5c0a7e6dbf3e"; }; dependencies = [ sources."bluebird-3.5.0" @@ -23335,6 +23461,7 @@ in sources."readable-stream-1.0.34" sources."semver-4.3.6" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."mime-1.3.4" @@ -23362,7 +23489,7 @@ in sources."on-finished-2.3.0" sources."qs-6.4.0" sources."raw-body-2.2.0" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."ms-0.7.2" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" @@ -23394,7 +23521,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -23415,19 +23542,19 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."node-pre-gyp-0.6.34" sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -23466,7 +23593,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -23481,7 +23608,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -23496,7 +23623,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23540,7 +23667,7 @@ in sources."inflight-1.0.6" sources."eventemitter3-1.2.0" sources."requires-port-1.0.0" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."wordwrap-0.0.3" @@ -23717,7 +23844,7 @@ in sources."statuses-1.2.1" ]; }) - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."vhost-3.0.2" sources."iconv-lite-0.4.11" sources."on-finished-2.3.0" @@ -23786,14 +23913,14 @@ in sources."through2-2.0.3" sources."vinyl-1.2.0" sources."vinyl-fs-2.4.4" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."xtend-4.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."clone-1.0.2" sources."clone-stats-0.0.1" @@ -23804,6 +23931,7 @@ in sources."through2-0.6.5" sources."readable-stream-1.0.34" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."graceful-fs-4.1.11" @@ -23837,7 +23965,7 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."is-glob-3.1.0" @@ -23863,7 +23991,7 @@ in ]; }) sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -23969,7 +24097,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."lodash._baseassign-3.2.0" @@ -24057,15 +24185,15 @@ in sources."npmlog-3.1.2" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -24079,7 +24207,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -24097,7 +24225,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -24112,7 +24240,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24143,7 +24271,7 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."are-we-there-yet-1.1.2" @@ -24222,7 +24350,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" @@ -24232,12 +24360,12 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aproba-1.1.1" sources."has-unicode-2.0.1" @@ -24258,7 +24386,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -24276,7 +24404,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -24291,7 +24419,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24331,10 +24459,10 @@ in node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; packageName = "node-inspector"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.0.0.tgz"; - sha1 = "c6221619e3f0bd8f1f24e0e882a65eb793f69d37"; + url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.0.tgz"; + sha1 = "0f8ffffbf9a9b86540eb33c1d64e7ba546457622"; }; dependencies = [ sources."async-0.9.2" @@ -24347,7 +24475,7 @@ in }) sources."glob-5.0.15" sources."path-is-absolute-1.0.1" - sources."rc-1.2.0" + sources."rc-1.2.1" sources."semver-4.3.6" (sources."serve-favicon-2.4.2" // { dependencies = [ @@ -24395,7 +24523,7 @@ in sources."bplist-parser-0.1.1" sources."meow-3.7.0" sources."untildify-2.1.0" - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -24409,7 +24537,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -24465,7 +24593,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."utils-merge-1.0.0" sources."vary-1.1.1" sources."mime-types-2.1.15" @@ -24484,14 +24612,14 @@ in sources."minimatch-3.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" sources."truncate-1.0.5" - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ sources."rimraf-2.6.1" @@ -24515,12 +24643,12 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."string-width-1.0.2" @@ -24535,7 +24663,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -24551,7 +24679,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -24566,7 +24694,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24626,7 +24754,7 @@ in sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -24646,13 +24774,13 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aproba-1.1.1" sources."has-unicode-2.0.1" @@ -24674,7 +24802,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -24692,7 +24820,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -24707,7 +24835,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24740,7 +24868,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."block-stream-0.0.9" @@ -24805,7 +24933,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -24827,19 +24955,19 @@ in sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."node-pre-gyp-0.6.34" sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -24879,7 +25007,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -24897,7 +25025,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -24912,7 +25040,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24959,7 +25087,7 @@ in sources."lodash._getnative-3.9.1" sources."lodash.isarguments-3.1.0" sources."lodash.isarray-3.0.4" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."event-stream-3.3.4" @@ -25083,18 +25211,18 @@ in sources."ws-1.1.1" sources."xml2js-0.4.17" sources."node-red-node-feedparser-0.1.7" - sources."node-red-node-email-0.1.21" + sources."node-red-node-email-0.1.22" (sources."node-red-node-twitter-0.1.10" // { dependencies = [ sources."request-2.81.0" sources."caseless-0.12.0" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."qs-6.4.0" sources."tunnel-agent-0.6.0" ]; }) - sources."node-red-node-rbe-0.1.6" + sources."node-red-node-rbe-0.1.8" sources."bcrypt-1.0.2" sources."bytes-2.4.0" sources."content-type-1.0.2" @@ -25104,7 +25232,7 @@ in sources."iconv-lite-0.4.13" sources."on-finished-2.3.0" sources."qs-6.2.0" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."ms-0.7.1" sources."inherits-2.0.3" sources."setprototypeof-1.0.2" @@ -25139,17 +25267,17 @@ in sources."nth-check-1.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.3.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."vary-1.1.1" - sources."moment-timezone-0.5.11" + sources."moment-timezone-0.5.13" sources."moment-2.18.1" sources."accepts-1.3.3" sources."array-flatten-1.1.1" @@ -25193,9 +25321,9 @@ in sources."commist-1.0.0" sources."concat-stream-1.6.0" sources."end-of-stream-1.4.0" - sources."help-me-1.0.1" + sources."help-me-1.1.0" sources."minimist-1.2.0" - sources."mqtt-packet-5.2.2" + sources."mqtt-packet-5.3.0" sources."pump-1.0.2" sources."reinterval-1.1.0" sources."split2-2.1.1" @@ -25206,86 +25334,28 @@ in sources."once-1.4.0" sources."wrappy-1.0.2" sources."callback-stream-1.1.0" - (sources."glob-stream-5.3.5" // { - dependencies = [ - sources."through2-0.6.5" - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" - ]; - }) + sources."glob-stream-6.1.0" sources."through2-2.0.3" sources."extend-3.0.0" - sources."glob-5.0.15" + sources."glob-7.1.1" sources."glob-parent-3.1.0" - (sources."micromatch-2.3.11" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) - sources."ordered-read-streams-0.3.0" - sources."to-absolute-glob-0.1.1" + sources."is-negated-glob-1.0.0" + sources."ordered-read-streams-1.0.0" + sources."pumpify-1.3.5" + sources."remove-trailing-separator-1.0.1" + sources."to-absolute-glob-2.0.1" sources."unique-stream-2.2.1" + sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."is-glob-3.1.0" sources."path-dirname-1.0.2" sources."is-extglob-2.1.1" - sources."arr-diff-2.0.0" - sources."array-unique-0.2.1" - sources."braces-1.8.5" - sources."expand-brackets-0.1.5" - (sources."extglob-0.3.2" // { - dependencies = [ - sources."is-extglob-1.0.0" - ]; - }) - sources."filename-regex-2.0.0" - sources."kind-of-3.1.0" - sources."normalize-path-2.1.1" - sources."object.omit-2.0.1" - (sources."parse-glob-3.0.4" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) - sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" - sources."expand-range-1.8.2" - sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - sources."fill-range-2.2.3" - sources."is-number-2.1.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.6" - sources."repeat-string-1.6.1" - sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.5" - sources."remove-trailing-separator-1.0.1" - sources."for-own-0.1.5" - sources."is-extendable-0.1.1" - sources."for-in-1.0.2" - (sources."glob-base-0.3.0" // { - dependencies = [ - sources."glob-parent-2.0.0" - sources."is-glob-2.0.1" - sources."is-extglob-1.0.0" - ]; - }) - sources."is-dotfile-1.0.2" - sources."is-equal-shallow-0.1.3" - sources."is-primitive-2.0.0" sources."is-stream-1.1.0" - sources."extend-shallow-2.0.1" - sources."json-stable-stringify-1.0.1" - sources."through2-filter-2.0.0" - sources."jsonify-0.0.0" - sources."bl-1.2.0" (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" @@ -25293,6 +25363,18 @@ in ]; }) sources."stream-shift-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-absolute-0.2.6" + sources."is-extendable-0.1.1" + sources."is-relative-0.2.1" + sources."is-windows-0.2.0" + sources."is-unc-path-0.1.2" + sources."unc-path-regex-0.1.2" + sources."json-stable-stringify-1.0.1" + sources."through2-filter-2.0.0" + sources."jsonify-0.0.0" + sources."bl-1.2.0" + sources."safe-buffer-5.0.1" sources."abbrev-1.1.0" sources."uid2-0.0.3" sources."passport-strategy-1.0.0" @@ -25309,7 +25391,10 @@ in sources."wordwrap-0.0.2" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" + sources."kind-of-3.1.0" sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.5" sources."options-0.0.6" sources."ultron-1.0.2" sources."sax-1.2.2" @@ -25320,12 +25405,14 @@ in sources."sax-0.6.1" sources."readable-stream-1.0.34" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) (sources."request-2.74.0" // { dependencies = [ sources."bl-1.1.2" sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" ]; }) sources."addressparser-0.1.3" @@ -25337,7 +25424,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.2.0" + sources."async-2.3.0" ]; }) sources."har-validator-2.0.6" @@ -25377,7 +25464,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25409,6 +25496,7 @@ in dependencies = [ sources."readable-stream-1.1.14" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."libmime-1.2.0" @@ -25446,10 +25534,9 @@ in sources."twitter-ng-0.6.2" sources."oauth-0.9.14" sources."performance-now-0.2.0" - sources."safe-buffer-5.0.1" sources."uuid-3.0.1" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."bindings-1.2.1" @@ -25458,7 +25545,7 @@ in dependencies = [ sources."request-2.81.0" sources."caseless-0.12.0" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."qs-6.4.0" sources."tunnel-agent-0.6.0" @@ -25471,16 +25558,13 @@ in }) sources."npmlog-4.0.2" sources."rc-1.1.7" - (sources."rimraf-2.5.4" // { - dependencies = [ - sources."glob-7.1.1" - ]; - }) + sources."rimraf-2.5.4" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ sources."once-1.3.3" sources."readable-stream-2.1.5" + sources."string_decoder-0.10.31" ]; }) sources."are-we-there-yet-1.1.2" @@ -25500,7 +25584,6 @@ in sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."fs.realpath-1.0.0" sources."block-stream-0.0.9" sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" @@ -25578,7 +25661,7 @@ in sources."bytes-0.2.0" sources."pause-0.0.1" sources."mime-1.2.6" - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" sources."vows-0.8.1" sources."eyes-0.1.8" sources."diff-1.0.8" @@ -25607,7 +25690,7 @@ in sources."tinycolor-0.0.1" sources."options-0.0.6" sources."zeparser-0.0.5" - sources."mailcomposer-4.0.1" + sources."mailcomposer-4.0.2" sources."simplesmtp-0.3.35" sources."optimist-0.6.1" sources."buildmail-4.0.1" @@ -25643,10 +25726,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.4.4"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.4.4.tgz"; - sha1 = "d5ec661923a06bcd6a6eec3d0433a9da3fd67e37"; + url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz"; + sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475"; }; dependencies = [ sources."JSONStream-1.3.1" @@ -25672,12 +25755,12 @@ in sources."glob-7.1.1" sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.2" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - sources."init-package-json-1.9.5" + sources."init-package-json-1.9.6" sources."lazy-property-1.0.0" sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" @@ -25688,7 +25771,7 @@ in sources."mississippi-1.3.0" sources."mkdirp-0.5.1" sources."move-concurrently-1.0.1" - (sources."node-gyp-3.5.0" // { + (sources."node-gyp-3.6.0" // { dependencies = [ sources."nopt-3.0.6" ]; @@ -25699,7 +25782,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.1" - sources."npm-registry-client-7.4.6" + sources."npm-registry-client-8.1.1" sources."npm-user-validate-0.1.5" sources."npmlog-4.0.2" sources."once-1.4.0" @@ -25711,7 +25794,7 @@ in sources."read-installed-4.0.3" sources."read-package-json-2.0.5" sources."read-package-tree-5.1.5" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."realize-package-specifier-3.0.3" sources."request-2.81.0" sources."retry-0.10.1" @@ -25725,6 +25808,7 @@ in sources."from2-1.3.0" sources."readable-stream-1.1.14" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."strip-ansi-3.0.1" @@ -25758,7 +25842,7 @@ in sources."proto-list-1.2.4" sources."fstream-ignore-1.0.5" sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" @@ -25812,7 +25896,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -25820,7 +25904,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -25837,7 +25921,7 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -25852,7 +25936,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25918,7 +26002,7 @@ in sources."crypto-random-string-1.0.0" sources."package-json-4.0.0" sources."got-6.7.1" - sources."registry-auth-token-3.1.0" + sources."registry-auth-token-3.1.2" sources."registry-url-3.1.0" sources."create-error-class-3.0.2" sources."duplexer3-0.1.4" @@ -25931,7 +26015,7 @@ in sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" sources."prepend-http-1.0.4" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -25989,7 +26073,7 @@ in }) sources."fs.extra-1.3.2" sources."findit-1.2.0" - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."request-2.81.0" @@ -26007,7 +26091,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -26025,7 +26109,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -26040,7 +26124,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26074,7 +26158,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."are-we-there-yet-1.1.2" @@ -26082,12 +26166,12 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aproba-1.1.1" sources."has-unicode-2.0.1" @@ -26139,10 +26223,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.10.4"; + version = "2.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.4.tgz"; - sha1 = "0833dd707f983a04fdcd615afb860ce82b1e54a2"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.5.tgz"; + sha1 = "2d047e3a24d676e0c99cf7221361088dcc247a6a"; }; dependencies = [ sources."bluebird-3.5.0" @@ -26165,7 +26249,7 @@ in sources."require-dir-0.3.1" sources."semver-5.3.0" sources."semver-utils-1.1.1" - (sources."snyk-1.26.1" // { + (sources."snyk-1.28.1" // { dependencies = [ sources."update-notifier-0.5.0" sources."latest-version-1.0.1" @@ -26221,7 +26305,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ sources."validate-npm-package-name-3.0.0" ]; @@ -26264,7 +26348,11 @@ in sources."read-installed-4.0.3" sources."read-package-json-2.0.5" sources."read-package-tree-5.1.5" - sources."readable-stream-2.1.5" + (sources."readable-stream-2.1.5" // { + dependencies = [ + sources."string_decoder-0.10.31" + ]; + }) sources."realize-package-specifier-3.0.3" sources."request-2.75.0" sources."retry-0.10.1" @@ -26302,7 +26390,7 @@ in sources."proto-list-1.2.4" sources."fstream-ignore-1.0.5" sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" @@ -26337,7 +26425,7 @@ in sources."builtin-modules-1.1.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" ]; }) sources."typedarray-0.0.6" @@ -26345,7 +26433,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -26356,6 +26444,7 @@ in (sources."bl-1.1.2" // { dependencies = [ sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" ]; }) sources."caseless-0.11.0" @@ -26394,7 +26483,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26442,8 +26531,8 @@ in sources."open-0.0.5" sources."os-name-1.0.3" sources."snyk-config-1.0.1" - sources."snyk-module-1.7.0" - sources."snyk-policy-1.7.0" + sources."snyk-module-1.8.1" + sources."snyk-policy-1.7.1" (sources."snyk-recursive-readdir-2.0.0" // { dependencies = [ sources."minimatch-3.0.2" @@ -26507,7 +26596,7 @@ in sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.5" - sources."js-yaml-3.8.2" + sources."js-yaml-3.8.3" sources."argparse-1.0.9" sources."esprima-3.1.3" sources."sprintf-js-1.0.3" @@ -26537,7 +26626,7 @@ in sources."is-obj-1.0.1" sources."package-json-2.4.0" sources."got-5.7.1" - sources."registry-auth-token-3.1.0" + sources."registry-auth-token-3.1.2" sources."registry-url-3.1.0" sources."create-error-class-3.0.2" sources."duplexer2-0.1.4" @@ -26555,7 +26644,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."prepend-http-1.0.4" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -26613,10 +26702,10 @@ in parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; - version = "0.6.1"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz"; - sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723"; + url = "https://registry.npmjs.org/parsoid/-/parsoid-0.7.1.tgz"; + sha1 = "121dcf59d0bacd9247405988525888f9a6ba2328"; }; dependencies = [ sources."async-0.9.2" @@ -26656,8 +26745,7 @@ in sources."ms-0.7.1" ]; }) - sources."gelf-stream-0.2.4" - sources."js-yaml-3.8.2" + sources."js-yaml-3.8.3" sources."mediawiki-title-0.5.6" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."node-uuid-1.4.8" @@ -26672,19 +26760,17 @@ in }) (sources."service-runner-2.2.5" // { dependencies = [ - sources."gelf-stream-1.1.1" sources."yargs-6.6.0" - sources."gelfling-0.3.1" sources."camelcase-3.0.0" sources."cliui-3.2.0" ]; }) sources."simplediff-0.1.1" - (sources."yargs-4.8.1" // { + (sources."yargs-5.0.0" // { dependencies = [ sources."cliui-3.2.0" sources."window-size-0.2.0" - sources."yargs-parser-2.4.1" + sources."yargs-parser-3.2.0" sources."camelcase-3.0.0" ]; }) @@ -26698,7 +26784,7 @@ in sources."on-finished-2.3.0" sources."qs-6.4.0" sources."raw-body-2.2.0" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."ms-0.7.2" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" @@ -26754,12 +26840,12 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."optimist-0.6.1" sources."source-map-0.4.4" - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" sources."yargs-3.10.0" @@ -26789,7 +26875,6 @@ in sources."object-keys-1.0.11" sources."define-properties-1.1.2" sources."foreach-2.0.5" - sources."gelfling-0.2.0" sources."argparse-1.0.9" sources."esprima-3.1.3" sources."sprintf-js-1.0.3" @@ -26799,7 +26884,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -26815,7 +26900,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -26830,7 +26915,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26856,13 +26941,15 @@ in sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."bluebird-3.5.0" - sources."bunyan-1.8.9" + sources."bunyan-1.8.10" sources."bunyan-syslog-udp-0.1.0" + sources."gelf-stream-1.1.1" sources."hot-shots-4.4.0" (sources."limitation-0.2.0" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."dnscache-1.0.1" @@ -26870,7 +26957,7 @@ in sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."moment-2.18.1" - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -26878,29 +26965,33 @@ in }) sources."ncp-2.0.0" sources."rimraf-2.4.5" + sources."gelfling-0.3.1" sources."kad-git+https://github.com/gwicke/kad.git#master" sources."clarinet-0.11.0" sources."colors-1.1.2" sources."hat-0.0.3" (sources."kad-fs-0.0.4" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."kad-localstorage-0.0.7" (sources."kad-memstore-0.0.1" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."lodash-3.10.1" sources."merge-1.2.0" (sources."msgpack5-3.4.1" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."buffer-shims-1.0.0" @@ -26909,8 +27000,9 @@ in sources."dom-storage-2.0.2" (sources."bl-1.2.0" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."get-caller-file-1.0.2" @@ -26946,7 +27038,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -26994,14 +27086,14 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.2" // { + (sources."parse-torrent-5.8.3" // { dependencies = [ sources."get-stdin-5.0.1" ]; }) sources."pump-1.0.2" sources."range-parser-1.2.0" - sources."rc-1.2.0" + sources."rc-1.2.1" (sources."torrent-stream-1.0.3" // { dependencies = [ sources."end-of-stream-0.1.5" @@ -27027,15 +27119,15 @@ in sources."plist-1.2.0" sources."reverse-http-1.2.0" sources."stream-buffers-2.2.0" - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."base64-js-0.0.8" sources."xmlbuilder-4.0.0" @@ -27084,7 +27176,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -27131,9 +27223,9 @@ in sources."is-promise-2.1.0" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-5.1.5" - sources."parse-torrent-file-4.0.1" - sources."simple-get-2.4.0" + sources."magnet-uri-5.1.6" + sources."parse-torrent-file-4.0.2" + sources."simple-get-2.5.1" sources."thirty-two-1.0.2" sources."uniq-1.0.1" sources."bencode-0.11.0" @@ -27147,7 +27239,7 @@ in sources."strip-json-comments-2.0.1" sources."bitfield-0.1.0" sources."bncode-0.5.3" - (sources."fs-chunk-store-1.6.4" // { + (sources."fs-chunk-store-1.6.5" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" @@ -27161,8 +27253,8 @@ in sources."peer-wire-swarm-0.12.1" sources."rimraf-2.6.1" sources."torrent-discovery-5.4.0" - sources."torrent-piece-1.1.0" - (sources."random-access-file-1.5.0" // { + sources."torrent-piece-1.1.1" + (sources."random-access-file-1.6.1" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" @@ -27171,6 +27263,7 @@ in }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" + sources."buffer-alloc-unsafe-1.0.0" sources."debug-2.6.3" sources."ms-0.7.2" sources."flatten-0.0.1" @@ -27180,6 +27273,7 @@ in sources."readable-stream-1.1.14" sources."bncode-0.2.3" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."speedometer-0.1.4" @@ -27190,7 +27284,7 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" (sources."bittorrent-dht-6.4.2" // { @@ -27221,7 +27315,7 @@ in sources."simple-peer-6.4.4" (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."ws-2.2.2" + sources."ws-2.2.3" ]; }) sources."string2compact-1.2.2" @@ -27518,7 +27612,7 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."which-1.2.14" @@ -27575,7 +27669,7 @@ in sources."minimatch-3.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."is-stream-1.1.0" @@ -27601,7 +27695,7 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.2.0" + sources."async-2.3.0" sources."lodash-4.17.4" sources."mime-db-1.27.0" sources."assert-plus-0.2.0" @@ -27610,7 +27704,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27665,6 +27759,60 @@ in }; production = true; }; + prettier = nodeEnv.buildNodePackage { + name = "prettier"; + packageName = "prettier"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-1.1.0.tgz"; + sha1 = "9d6ad005703efefa66b6999b8916bfc6afeaf9f8"; + }; + dependencies = [ + sources."ast-types-0.9.8" + sources."babel-code-frame-6.22.0" + sources."babylon-7.0.0-beta.8" + sources."chalk-1.1.3" + sources."esutils-2.0.2" + sources."flow-parser-0.43.0" + sources."get-stdin-5.0.1" + sources."glob-7.1.1" + sources."jest-validate-19.0.0" + sources."minimist-1.2.0" + sources."js-tokens-3.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.7" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."jest-matcher-utils-19.0.0" + sources."leven-2.1.0" + (sources."pretty-format-19.0.0" // { + dependencies = [ + sources."ansi-styles-3.0.0" + ]; + }) + sources."color-convert-1.9.0" + sources."color-name-1.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Prettier is an opinionated JavaScript formatter"; + homepage = "https://github.com/prettier/prettier#readme"; + license = "MIT"; + }; + production = true; + }; react-tools = nodeEnv.buildNodePackage { name = "react-tools"; packageName = "react-tools"; @@ -27698,7 +27846,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" @@ -27802,7 +27950,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -27819,7 +27967,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -27834,7 +27982,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27909,14 +28057,14 @@ in ]; }) sources."commander-2.9.0" - sources."js-yaml-3.8.2" + sources."js-yaml-3.8.3" sources."cookies-0.7.0" sources."request-2.81.0" sources."async-0.9.2" sources."es6-shim-0.21.1" sources."semver-4.3.6" sources."minimatch-1.0.0" - sources."bunyan-1.8.9" + sources."bunyan-1.8.10" sources."handlebars-2.0.0" sources."highlight.js-8.9.1" sources."lunr-0.7.2" @@ -27929,6 +28077,7 @@ in (sources."readable-stream-1.1.14" // { dependencies = [ sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."fs-ext-0.6.0" @@ -27964,7 +28113,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."utils-merge-1.0.0" sources."vary-1.1.1" sources."mime-types-2.1.15" @@ -27994,7 +28143,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -28010,7 +28159,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -28025,7 +28174,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28056,7 +28205,7 @@ in sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."moment-2.18.1" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."ncp-2.0.0" sources."rimraf-2.4.5" (sources."glob-6.0.4" // { @@ -28068,7 +28217,7 @@ in sources."inherits-2.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."optimist-0.3.7" @@ -28088,7 +28237,7 @@ in sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.2" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" ]; }) sources."regexp-quote-0.0.0" @@ -28105,7 +28254,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."jsonparse-1.3.0" sources."through-2.3.8" @@ -28140,9 +28289,9 @@ in sources."graceful-readlink-1.0.1" sources."graceful-fs-4.1.11" sources."minimatch-3.0.3" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."buffer-shims-1.0.0" @@ -28150,7 +28299,7 @@ in sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -28249,7 +28398,7 @@ in sources."wrappy-1.0.2" sources."extsprintf-1.2.0" sources."core-util-is-1.0.2" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."mkdirp-0.5.1" @@ -28261,7 +28410,7 @@ in sources."inherits-2.0.3" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."sshpk-agent-1.2.1" @@ -28284,11 +28433,11 @@ in ]; }) sources."json-schema-0.2.3" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" @@ -28326,7 +28475,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."amdefine-1.0.1" @@ -28397,21 +28546,21 @@ in sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" sources."errno-0.1.4" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" ]; @@ -28501,7 +28650,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -28544,7 +28693,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28606,10 +28755,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.20"; + version = "2.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.22.tgz"; + sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0"; }; dependencies = [ sources."source-map-0.5.6" @@ -28640,10 +28789,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.11"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.11.tgz"; - sha1 = "a6391af1d6d132c2f995dbf9740b17b315b2f90f"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.14.tgz"; + sha1 = "e65f05f541bc8b829f9720f28e74c4a12c7b6dd2"; }; dependencies = [ sources."async-2.1.5" @@ -28654,12 +28803,24 @@ in sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" sources."diff2html-2.3.0" - sources."express-4.14.1" - sources."express-session-1.14.2" + (sources."express-4.15.2" // { + dependencies = [ + sources."debug-2.6.1" + sources."qs-6.4.0" + sources."setprototypeof-1.0.3" + sources."ms-0.7.2" + ]; + }) + (sources."express-session-1.15.2" // { + dependencies = [ + sources."debug-2.6.3" + sources."ms-0.7.2" + ]; + }) sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.2.6" + sources."ignore-3.2.7" sources."keen.io-0.1.3" sources."knockout-3.4.2" sources."lodash-4.17.4" @@ -28668,21 +28829,21 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.17.1" + sources."moment-2.18.1" sources."node-cache-4.1.1" - (sources."npm-4.1.2" // { + (sources."npm-4.5.0" // { dependencies = [ - sources."abbrev-1.0.9" + sources."bluebird-3.5.0" sources."nopt-4.0.1" - sources."request-2.79.0" + sources."request-2.81.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."qs-6.3.2" - sources."tunnel-agent-0.4.3" + sources."qs-6.4.0" + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" @@ -28690,14 +28851,12 @@ in sources."sntp-1.0.9" ]; }) - (sources."npm-registry-client-7.4.6" // { + (sources."npm-registry-client-8.1.1" // { dependencies = [ sources."request-2.81.0" - sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-4.2.1" + sources."form-data-2.1.4" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" @@ -28715,22 +28874,22 @@ in sources."os-homedir-1.0.2" sources."passport-0.3.2" sources."passport-local-1.0.0" - (sources."raven-1.1.5" // { + (sources."raven-1.2.1" // { dependencies = [ sources."json-stringify-safe-5.0.1" sources."uuid-3.0.0" ]; }) - (sources."rc-1.1.7" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."semver-5.3.0" - sources."serve-static-1.11.2" + sources."serve-static-1.12.1" sources."signals-1.0.0" - sources."snapsvg-0.4.0" + sources."snapsvg-0.5.1" (sources."socket.io-1.7.3" // { dependencies = [ sources."debug-2.3.3" @@ -28749,6 +28908,7 @@ in sources."readable-stream-1.0.27-1" sources."async-0.9.2" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) (sources."temp-0.8.3" // { @@ -28762,7 +28922,11 @@ in sources."colors-1.0.3" ]; }) - sources."yargs-6.6.0" + (sources."yargs-7.1.0" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.2.0" @@ -28772,7 +28936,7 @@ in sources."on-finished-2.3.0" sources."qs-6.2.0" sources."raw-body-2.1.7" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."ms-0.7.1" sources."inherits-2.0.3" sources."setprototypeof-1.0.2" @@ -28803,18 +28967,26 @@ in sources."content-disposition-0.5.2" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."finalhandler-0.5.1" - sources."fresh-0.3.0" + sources."etag-1.8.0" + (sources."finalhandler-1.0.1" // { + dependencies = [ + sources."debug-2.6.3" + sources."ms-0.7.2" + ]; + }) + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.4" sources."range-parser-1.2.0" - (sources."send-0.14.2" // { + (sources."send-0.15.1" // { dependencies = [ + sources."debug-2.6.1" + sources."http-errors-1.6.1" sources."ms-0.7.2" + sources."setprototypeof-1.0.3" ]; }) sources."utils-merge-1.0.0" @@ -28824,7 +28996,7 @@ in sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" sources."mime-1.3.4" - sources."crc-3.4.1" + sources."crc-3.4.4" sources."on-headers-1.0.1" sources."uid-safe-2.1.4" sources."random-bytes-1.0.0" @@ -28908,11 +29080,13 @@ in sources."underscore-1.5.2" sources."clone-2.1.1" sources."JSONStream-1.3.1" + sources."ansi-regex-2.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."archy-1.0.0" sources."asap-2.0.5" + sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" @@ -28930,22 +29104,20 @@ in }) sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.4.2" sources."iferr-0.1.5" sources."inflight-1.0.6" - (sources."init-package-json-1.9.5" // { - dependencies = [ - sources."validate-npm-package-name-3.0.0" - ]; - }) + sources."init-package-json-1.9.6" + sources."lazy-property-1.0.0" sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.5.0" sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - sources."mississippi-1.2.0" - (sources."node-gyp-3.5.0" // { + sources."mississippi-1.3.0" + sources."move-concurrently-1.0.1" + (sources."node-gyp-3.6.0" // { dependencies = [ sources."minimatch-3.0.3" sources."nopt-3.0.6" @@ -28967,7 +29139,7 @@ in sources."read-installed-4.0.3" sources."read-package-json-2.0.5" sources."read-package-tree-5.1.5" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."realize-package-specifier-3.0.3" sources."retry-0.10.1" sources."sha-2.0.1" @@ -28978,6 +29150,7 @@ in sources."from2-1.3.0" sources."readable-stream-1.1.14" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."strip-ansi-3.0.1" @@ -28986,16 +29159,12 @@ in sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unique-filename-1.1.0" + sources."update-notifier-2.1.0" sources."uuid-3.0.1" - (sources."validate-npm-package-name-2.2.2" // { - dependencies = [ - sources."builtins-0.0.7" - ]; - }) + sources."validate-npm-package-name-3.0.0" sources."which-1.2.14" sources."wrappy-1.0.2" sources."write-file-atomic-1.3.1" - sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -29020,13 +29189,12 @@ in sources."minimatch-3.0.3" ]; }) - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" - sources."builtins-1.0.3" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" sources."concat-stream-1.6.0" @@ -29039,13 +29207,17 @@ in sources."end-of-stream-1.4.0" sources."flush-write-stream-1.0.2" sources."from2-2.3.0" + sources."parallel-transform-1.1.0" sources."pump-1.0.2" sources."pumpify-1.3.5" sources."stream-each-1.2.0" sources."through2-2.0.3" sources."typedarray-0.0.6" sources."stream-shift-1.0.0" + sources."cyclist-0.2.2" sources."xtend-4.0.1" + sources."copy-concurrently-1.0.3" + sources."run-queue-1.0.3" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" sources."are-we-there-yet-1.1.2" @@ -29069,40 +29241,33 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."extend-3.0.0" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" + sources."performance-now-0.2.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.6" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."assert-plus-0.2.0" (sources."jsprim-1.4.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29130,23 +29295,70 @@ in sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" + (sources."boxen-1.0.0" // { + dependencies = [ + sources."string-width-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."chalk-1.1.3" + sources."configstore-3.0.0" + sources."is-npm-1.0.0" + sources."latest-version-3.1.0" + sources."lazy-req-2.0.0" + sources."semver-diff-2.1.0" + sources."xdg-basedir-3.0.0" + sources."ansi-align-1.1.0" + sources."camelcase-4.1.0" + sources."cli-boxes-1.0.0" + sources."term-size-0.1.1" + sources."widest-line-1.0.0" + sources."execa-0.4.0" + (sources."cross-spawn-async-2.2.5" // { + dependencies = [ + sources."lru-cache-4.0.2" + ]; + }) + sources."is-stream-1.1.0" + sources."npm-run-path-1.0.0" + sources."path-key-1.0.0" + sources."strip-eof-1.0.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."dot-prop-4.1.1" + sources."unique-string-1.0.0" + sources."is-obj-1.0.1" + sources."crypto-random-string-1.0.0" + sources."package-json-4.0.0" + sources."got-6.7.1" + sources."registry-auth-token-3.1.2" + sources."registry-url-3.1.0" + sources."create-error-class-3.0.2" + sources."duplexer3-0.1.4" + sources."get-stream-3.0.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."lowercase-keys-1.0.0" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."prepend-http-1.0.4" + sources."builtins-1.0.3" sources."isexe-2.0.0" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."performance-now-0.2.0" - sources."safe-buffer-5.0.1" - sources."ajv-4.11.5" - sources."har-schema-1.0.5" - sources."co-4.6.0" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" sources."deep-extend-0.4.1" sources."strip-json-comments-2.0.1" - sources."eve-0.4.2" + sources."eve-0.5.3" (sources."engine.io-1.8.3" // { dependencies = [ sources."debug-2.3.3" @@ -29211,7 +29423,6 @@ in sources."formidable-1.0.14" sources."cookiejar-2.0.1" sources."reduce-component-1.0.1" - sources."camelcase-3.0.0" sources."cliui-3.2.0" sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" @@ -29221,13 +29432,19 @@ in sources."require-main-filename-1.0.1" sources."which-module-1.0.0" sources."y18n-3.2.1" - sources."yargs-parser-4.2.1" + (sources."yargs-parser-5.0.0" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) sources."wrap-ansi-2.1.0" sources."lcid-1.0.0" sources."invert-kv-1.0.0" sources."find-up-1.1.2" sources."read-pkg-1.1.0" sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" sources."parse-json-2.2.0" @@ -29315,7 +29532,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."is-stream-1.1.0" @@ -29341,7 +29558,7 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.2.0" + sources."async-2.3.0" sources."lodash-4.17.4" sources."mime-db-1.27.0" sources."assert-plus-0.2.0" @@ -29350,7 +29567,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29410,29 +29627,38 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "2.3.2"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-2.3.2.tgz"; - sha1 = "7d521e6f0777a3a58985c69425263fdfe977b458"; + url = "https://registry.npmjs.org/webpack/-/webpack-2.4.1.tgz"; + sha1 = "15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a"; }; dependencies = [ - sources."acorn-4.0.11" - sources."acorn-dynamic-import-2.0.2" - sources."ajv-4.11.5" + sources."acorn-5.0.3" + (sources."acorn-dynamic-import-2.0.2" // { + dependencies = [ + sources."acorn-4.0.11" + ]; + }) + sources."ajv-4.11.6" sources."ajv-keywords-1.5.1" - sources."async-2.2.0" + sources."async-2.3.0" sources."enhanced-resolve-3.1.0" sources."interpret-1.0.2" sources."json-loader-0.5.4" + sources."json5-0.5.1" sources."loader-runner-2.3.0" sources."loader-utils-0.2.17" sources."memory-fs-0.4.1" sources."mkdirp-0.5.1" - sources."node-libs-browser-2.0.0" + (sources."node-libs-browser-2.0.0" // { + dependencies = [ + sources."string_decoder-0.10.31" + ]; + }) sources."source-map-0.5.6" sources."supports-color-3.2.3" sources."tapable-0.2.6" - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."yargs-3.10.0" ]; @@ -29453,16 +29679,15 @@ in sources."object-assign-4.1.1" sources."big.js-3.1.3" sources."emojis-list-2.1.0" - sources."json5-0.5.1" sources."errno-0.1.4" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" sources."assert-1.4.1" @@ -29480,7 +29705,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.6.3" + sources."stream-http-2.7.0" sources."timers-browserify-2.0.2" sources."tty-browserify-0.0.0" (sources."url-0.11.0" // { @@ -29520,7 +29745,7 @@ in sources."parse-asn1-5.1.0" sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" @@ -29569,7 +29794,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -29589,14 +29814,14 @@ in sources."binary-extensions-1.8.0" sources."minimatch-3.0.3" sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."node-pre-gyp-0.6.34" sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -29634,7 +29859,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -29663,7 +29888,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29729,7 +29954,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -29764,21 +29989,20 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.21.3"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz"; - sha1 = "8dda3a63c798b383cfa577452c2b3cb3e4aa87e0"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.22.0.tgz"; + sha1 = "fd8511dc29225b925be967dc185772cc59de5888"; }; dependencies = [ sources."babel-runtime-6.23.0" sources."bytes-2.5.0" - sources."camelcase-3.0.0" + sources."camelcase-4.1.0" sources."chalk-1.1.3" sources."cmd-shim-2.0.2" sources."commander-2.9.0" sources."death-1.1.0" sources."debug-2.6.3" - sources."defaults-1.0.3" sources."detect-indent-5.0.0" sources."ini-1.3.4" sources."inquirer-3.0.6" @@ -29802,6 +30026,7 @@ in sources."strip-bom-3.0.0" sources."tar-2.2.1" sources."tar-stream-1.5.2" + sources."v8-compile-cache-1.1.0" sources."validate-npm-package-license-3.0.1" sources."core-js-2.4.1" sources."regenerator-runtime-0.10.3" @@ -29814,7 +30039,6 @@ in sources."graceful-fs-4.1.11" sources."graceful-readlink-1.0.1" sources."ms-0.7.2" - sources."clone-1.0.2" sources."ansi-escapes-1.4.0" sources."cli-cursor-2.1.0" sources."cli-width-2.1.0" @@ -29840,7 +30064,7 @@ in sources."ci-info-1.0.0" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" @@ -29868,12 +30092,12 @@ in }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aproba-1.1.1" sources."has-unicode-2.0.1" @@ -29895,7 +30119,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -29913,7 +30137,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -29928,7 +30152,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30097,7 +30321,7 @@ in sources."node-status-codes-1.0.0" sources."parse-json-2.2.0" sources."read-all-stream-3.1.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."timed-out-3.1.3" sources."unzip-response-1.0.2" sources."url-parse-lax-1.0.0" @@ -30108,7 +30332,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."prepend-http-1.0.4" sources."decamelize-1.2.0" @@ -30152,7 +30376,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -30168,7 +30392,7 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -30183,7 +30407,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30219,7 +30443,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -30230,14 +30454,14 @@ in sources."strip-indent-1.0.1" sources."get-stdin-4.0.1" sources."registry-url-3.1.0" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."deep-extend-0.4.1" sources."strip-json-comments-2.0.1" - sources."registry-auth-token-3.1.0" + sources."registry-auth-token-3.1.2" sources."execall-1.0.0" sources."clone-regexp-1.0.0" sources."is-regexp-1.0.0" @@ -30310,7 +30534,7 @@ in sources."walk-2.3.9" sources."minimatch-3.0.3" sources."foreachasync-3.0.0" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."diff-2.2.3" diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 80e6383a6f47..11c4368270cd 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -49,6 +49,7 @@ , "peerflix" , "peerflix-server" , "phantomjs" +, "prettier" , "react-tools" , "s3http" , "semver" diff --git a/pkgs/development/python-modules/csscompressor.nix b/pkgs/development/python-modules/csscompressor.nix new file mode 100644 index 000000000000..a9aad8d40e5f --- /dev/null +++ b/pkgs/development/python-modules/csscompressor.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "csscompressor"; + version = "0.9.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0e12f125b88379d7b680636d94a3c8fa14bed1de2358f7f9a9e6749e222cff3b"; + }; + + doCheck = false; # No tests + + meta = { + description = "A python port of YUI CSS Compressor"; + homepage = https://pypi.python.org/pypi/csscompressor; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.ahmedtd]; + }; +} diff --git a/pkgs/development/python-modules/htmlmin.nix b/pkgs/development/python-modules/htmlmin.nix new file mode 100644 index 000000000000..35f86479a4e3 --- /dev/null +++ b/pkgs/development/python-modules/htmlmin.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "htmlmin"; + version = "0.1.10"; + name = "${pname}-${version}"; + src = fetchPypi { + inherit pname version; + sha256 = "ca5c5dfbb0fa58562e5cbc8dc026047f6cb431d4333504b11853853be448aa63"; + }; + + # Tests run fine in a normal source checkout, but not when being built by nix. + doCheck = false; + + meta = { + description = "A configurable HTML Minifier with safety features"; + homepage = https://pypi.python.org/pypi/htmlmin; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.ahmedtd]; + }; +} diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix new file mode 100644 index 000000000000..f44bb7caf3d5 --- /dev/null +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "iso-639"; + version = "0.4.5"; + + src = fetchurl { + url = "mirror://pypi/i/${pname}/${name}.tar.gz"; + sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/noumar/iso639; + description = "ISO 639 library for Python"; + license = licenses.agpl3; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix new file mode 100644 index 000000000000..4d9792ebbb82 --- /dev/null +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "iso3166"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "deactivated"; + repo = "python-iso3166"; + # repo has no version tags + rev = "f04e499447bbff10af701cf3dd81f6bcdf02f7d7"; + sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx"; + }; + + buildInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/deactivated/python-iso3166; + description = "Self-contained ISO 3166-1 country definitions"; + license = licenses.mit; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index e25cb696a656..a394105faf4b 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }: +{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre }: stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.76.1"; + version = "1.78"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1l46bmzm5syfr9m5l0bqkj8lcyrynhw8gjf95s4fwhp2b7f0zisv"; + sha256 = "1cc60y2vjq4g88183jkan91ybzqy0n6p5ncs8z5rh6rjsvvrc9p4"; }; + buildInputs = [ pcre ]; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; - makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg''; + makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg HAVE_RULES=yes''; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 7ebbc1b88e30..a2ff84108899 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gcc, scons, pkgconfig, libX11, libXcursor , libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib -, libpulseaudio, mesa, mesa_glu, zlib }: +, libpulseaudio, mesa_glu, zlib }: stdenv.mkDerivation rec { name = "godot-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gcc scons pkgconfig libX11 libXcursor libXinerama libXrandr libXrender - freetype openssl alsaLib libpulseaudio mesa mesa_glu zlib + freetype openssl alsaLib libpulseaudio mesa_glu zlib ]; patches = [ ./pkg_config_additions.patch ]; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index e7520091d1d9..f644160b9a31 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps }: +, procps, autoconf, automake }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.17"; + name = "intel-gpu-tools-1.18"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "06pvmbsbff4bsi67n6x3jjngzy2llf8bplc75447ra1fwphc9jx6"; + sha256 = "1vp4czxp8xa6qk4pg3mrxhc2yadw2rv6p8r8247mkpcbb8dzjxyz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake ]; buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps ]; preBuild = '' patchShebangs debugger/system_routine/pre_cpp.py + substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch b/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch new file mode 100644 index 000000000000..3b429c1745e4 --- /dev/null +++ b/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch @@ -0,0 +1,75 @@ +From 36c053f37670c6003f9e8dc001741f7c49e9526a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Sat, 15 Apr 2017 20:42:10 +0200 +Subject: [PATCH] use hardcoded dynamic-linker +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + src/rustup-cli/common.rs | 3 ++- + src/rustup/toolchain.rs | 22 ++++++++++++++++++++-- + 2 files changed, 22 insertions(+), 3 deletions(-) + +diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs +index 1abf345..21096e7 100644 +--- a/src/rustup-cli/common.rs ++++ b/src/rustup-cli/common.rs +@@ -220,7 +220,8 @@ pub fn rustc_version(toolchain: &Toolchain) -> String { + if toolchain.exists() { + let rustc_path = toolchain.binary_file("rustc"); + if utils::is_file(&rustc_path) { +- let mut cmd = Command::new(&rustc_path); ++ let mut cmd = Command::new("@dynamicLinker@"); ++ cmd.arg(&rustc_path); + cmd.arg("--version"); + toolchain.set_ldpath(&mut cmd); + +diff --git a/src/rustup/toolchain.rs b/src/rustup/toolchain.rs +index dc29c32..212a4ab 100644 +--- a/src/rustup/toolchain.rs ++++ b/src/rustup/toolchain.rs +@@ -315,7 +315,7 @@ impl<'a> Toolchain<'a> { + } + Path::new(&binary) + }; +- let mut cmd = Command::new(&path); ++ let mut cmd = wrap_elf_interpreter(&path); + self.set_env(&mut cmd); + Ok(cmd) + } +@@ -363,7 +363,7 @@ impl<'a> Toolchain<'a> { + } else { + src_file + }; +- let mut cmd = Command::new(exe_path); ++ let mut cmd = wrap_elf_interpreter(exe_path); + self.set_env(&mut cmd); + cmd.env("RUSTUP_TOOLCHAIN", &primary_toolchain.name); + Ok(cmd) +@@ -648,3 +648,21 @@ impl<'a> Toolchain<'a> { + path + } + } ++ ++fn wrap_elf_interpreter<S: AsRef<OsStr>>(p: S) -> Command { ++ use std::fs::File; ++ use std::io::Read; ++ let path = Path::new(&p); ++ let is_elf = File::open(path).map(|mut f| { ++ let mut buf = [0; 4]; ++ let _ = f.read(&mut buf); ++ buf == b"\x7fELF"[..] ++ }).unwrap_or(false); ++ if is_elf { ++ let mut cmd = Command::new("@dynamicLinker@"); ++ cmd.arg(&path); ++ cmd ++ } else { ++ Command::new(&path) ++ } ++} +-- +2.12.2 + diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix new file mode 100644 index 000000000000..b9e6a0e2d816 --- /dev/null +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -0,0 +1,55 @@ +{ stdenv, lib, runCommand +, fetchFromGitHub, rustPlatform +, pkgconfig, curl, Security }: + +rustPlatform.buildRustPackage rec { + name = "rustup-${version}"; + version = "1.2.0"; + + depsSha256 = "06bfz5kyj3k0yxv55dq0s1arx34sy1jjfrpgd83rf99026vcm5x2"; + + src = fetchFromGitHub { + owner = "rust-lang-nursery"; + repo = "rustup.rs"; + rev = version; + sha256 = "0qwl27wh7j03h511bd8fq5fif5xcmkiyy9rm3hri7czjqr01mw0v"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + curl + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + cargoBuildFlags = [ "--features no-self-update" ]; + + patches = lib.optionals stdenv.isLinux [ + (runCommand "0001-use-hardcoded-dynamic-linker.patch" { CC=stdenv.cc; } '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substituteAll ${./0001-use-hardcoded-dynamic-linker.patch} $out + '') + ]; + + postInstall = '' + pushd $out/bin + mv rustup-init rustup + for link in cargo rustc rustdoc rust-gdb rust-lldb; do + ln -s rustup $link + done + popd + + # tries to create .rustup + export HOME=$(mktemp -d) + mkdir -p "$out/share/"{bash-completion/completions,fish/completions,zsh/site-functions} + $out/bin/rustup completions bash > "$out/share/bash-completion/completions/rustup" + $out/bin/rustup completions fish > "$out/share/fish/completions/rustup.fish" + $out/bin/rustup completions zsh > "$out/share/zsh/site-functions/_rustup" + ''; + + meta = with stdenv.lib; { + description = "The Rust toolchain installer"; + homepage = https://www.rustup.rs/; + license = licenses.mit; + maintainer = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index f3967b0d9235..56f15d62154c 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -3,7 +3,7 @@ , makeQtWrapper, qtbase, qtx11extras , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf -, freeglut, mesa, mesa_glu +, freeglut, mesa_glu }: stdenv.mkDerivation rec { name = "vogl-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { qtbase qtx11extras libdwarf libjpeg_turbo libunwind lzma tinyxml libX11 SDL2 SDL2_gfx SDL2_image SDL2_ttf - freeglut mesa mesa_glu + freeglut mesa_glu ]; enableParallelBuilding = true; diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix new file mode 100644 index 000000000000..6515db9dab32 --- /dev/null +++ b/pkgs/games/instead-launcher/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }: + +stdenv.mkDerivation rec { + name = "instead-launcher-${version}"; + + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "instead-hub"; + repo = "instead-launcher"; + rev = version; + sha256 = "1q0hdgfy9pr48zvxr9x614ka6bd0g8sicdk2a673nwfdyd41p9cw"; + }; + + patches = [ ./path.patch ]; + + postPatch = '' + substituteInPlace platform.cpp --subst-var-by instead ${instead} + ''; + + nativeBuildInputs = [ qmake4Hook ]; + + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { + homepage = https://instead.syscall.ru/wiki/en/instead-launcher; + description = "Install and play games from INSTEAD repository"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/games/instead-launcher/path.patch b/pkgs/games/instead-launcher/path.patch new file mode 100644 index 000000000000..f63737bfb160 --- /dev/null +++ b/pkgs/games/instead-launcher/path.patch @@ -0,0 +1,39 @@ +From c7460a7fc255ef4e8e0e37798605c4d8bb50633d Mon Sep 17 00:00:00 2001 +From: Orivej Desh <orivej@gmx.fr> +Date: Sat, 1 Apr 2017 01:30:37 +0000 +Subject: [PATCH] path + +--- + mainwindow.cpp | 2 +- + platform.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mainwindow.cpp b/mainwindow.cpp +index 9687c4e..234b176 100644 +--- a/mainwindow.cpp ++++ b/mainwindow.cpp +@@ -688,7 +688,7 @@ void MainWindow::loadConfig() { + if ( args.contains( "default-gamespath" ) ) + defGamesPath = args["default-gamespath"].toString(); + +- QString insteadPath = conf.value("InsteadPath", defInsteadPath).toString(); ++ QString insteadPath = defInsteadPath; + bool autoRefresh = conf.value("AutoRefresh", "false").toString() == "true"; + bool autoRefreshSW = conf.value("AutoRefreshSW", "false").toString() == "true"; + QString lang = conf.value( "Language", "*" ).toString(); +diff --git a/platform.cpp b/platform.cpp +index bda86be..c356f1c 100644 +--- a/platform.cpp ++++ b/platform.cpp +@@ -22,7 +22,7 @@ QString getConfigPath() { + } + + QString getDefaultInterpreterPath() { +- return "/usr/local/bin/sdl-instead"; ++ return "@instead@/bin/sdl-instead"; + } + + #elif defined(Q_OS_WIN) +-- +2.12.2 + diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index c548b55105de..cb65b9d8403c 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation { ./gcc.patch (fetchpatch { name = "linux-4.8.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms"; - sha256 = "1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms&id=8c6d80fc77eb20cbb4fd0eca71fa8a03b9447c3f"; + sha256 = "0b963540gaj06q6ynfg47z8k5y3k2503yahbwawclfq4cxhl472a"; }) ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 39c19ceeff7d..2c4dbc7d20fa 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -123,6 +123,7 @@ with stdenv.lib; ${optionalString (versionOlder version "3.13") '' IPV6_PRIVACY y ''} + NETFILTER y NETFILTER_ADVANCED y IP_ROUTE_VERBOSE y IP_MROUTE_MULTIPLE_TABLES y diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 491e006378bb..932c6602842e 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.11-rc6"; - modDirVersion = "4.11.0-rc6"; + version = "4.11-rc7"; + modDirVersion = "4.11.0-rc7"; extraMeta.branch = "4.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1lrljxlx6s9rfwbzsl9ixhihf53rm7bwwah9756ar2siimrncvmr"; + sha256 = "0zifawlrc62gsqmg91858wxx7vbpz0drjbhzmmbpplj3j7pdlly5"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 138130fa82e4..5d0dca7b6bec 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, xz, zlib, pkgconfig, libxslt }: +{ stdenv, buildPackages, lib, fetchurl, autoreconfHook, pkgconfig, libxslt, xz }: let systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ]; @@ -14,13 +14,14 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; - buildInputs = [ xz /* zlib */ ]; + buildInputs = [ xz ]; + # HACK until BUG issue #21191 is addressed + crossAttrs.preUnpack = ''PATH="${buildPackages.xz}/bin''${PATH:+:}$PATH"''; configureFlags = [ "--sysconfdir=/etc" "--with-xz" "--with-modulesdirs=${modulesDirs}" - # "--with-zlib" ]; patches = [ ./module-dir.patch ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f04ff107ea66..f5e849e95e11 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,11 +22,11 @@ in }; legacy_340 = generic { - version = "340.101"; - sha256_32bit = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz"; - sha256_64bit = "02k8j0xzxp2y4vay0kf982q382ny1i4g1kai93f2h5sak6sq3kyj"; - settingsSha256 = "1mavbhff24n0jn154af152fp04njd505scdlxdm850h1ycb2i3g9"; - persistencedSha256 = "1396bmmg9b1z805dzljgi2f219ji84wfnnifdbk32dpd5mrywjk0"; + version = "340.102"; + sha256_32bit = "0a484i37j00d0rc60q0bp6fd2wfrx2c4r32di9w5svqgmrfkvcb1"; + sha256_64bit = "0nnz51d48a5fpnnmlz1znjp937k3nshdq46fw1qm8h00dkrd55ib"; + settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598"; + persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i"; useGLVND = false; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/fs52243.patch b/pkgs/os-specific/linux/nvidia-x11/fs52243.patch new file mode 100644 index 000000000000..212df64fa615 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/fs52243.patch @@ -0,0 +1,14 @@ +--- a/kernel/nv-drm.c ++++ b/kernel/nv-drm.c +@@ -115,7 +115,11 @@ + }; + + static struct drm_driver nv_drm_driver = { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY, ++#else + .driver_features = DRIVER_GEM | DRIVER_PRIME, ++#endif + .load = nv_drm_load, + .unload = nv_drm_unload, + .fops = &nv_drm_fops, diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 4573766b78ba..9441ce772c83 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -8,7 +8,7 @@ , preferGtk2 ? false }: -{ stdenv, callPackage, callPackage_i686, buildEnv, fetchurl +{ stdenv, callPackage, callPackage_i686, fetchurl , kernel ? null, xorg, zlib, perl, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -43,8 +43,20 @@ let else throw "nvidia-x11 does not support platform ${stdenv.system}"; # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10 - patches = if libsOnly || versionOlder version "375" + patches = if libsOnly then null + else if versionOlder version "340" + then null + else if versionOlder version "375" + then [ + (fetchurl { + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/4.10.0_kernel.patch?h=packages/nvidia-340xx; + sha256 = "08k2phr9kawg6a3v88d4zkj7gdlih29gm5a1gmhpgmvd926k0z5l"; + }) + # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx + # with datestamps removed + ./fs52243.patch + ] else [ (fetchurl { url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia; sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z"; }) ]; @@ -73,7 +85,7 @@ let withGtk2 = preferGtk2; withGtk3 = !preferGtk2; }; - persistenced = if persistencedSha256 == null then null else callPackage (import ./persistenced.nix self persistencedSha256) { }; + persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock index ee425b6edf97..0d01c2271458 100644 --- a/pkgs/servers/monitoring/sensu/Gemfile.lock +++ b/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -12,51 +12,54 @@ GEM em-worker (0.0.2) eventmachine eventmachine (1.2.2) - ffi (1.9.17) - oj (2.14.6) + ffi (1.9.18) + oj (2.18.1) parse-cron (0.1.4) - sensu (0.28.0) + sensu (0.29.0) em-http-server (= 0.1.8) eventmachine (= 1.2.2) parse-cron (= 0.1.4) sensu-extension (= 1.5.1) - sensu-extensions (= 1.7.1) - sensu-json (= 2.0.1) + sensu-extensions (= 1.9.0) + sensu-json (= 2.1.0) sensu-logger (= 1.2.1) - sensu-redis (= 2.1.0) - sensu-settings (= 9.9.0) + sensu-redis (= 2.1.1) + sensu-settings (= 10.0.0) sensu-spawn (= 2.2.1) sensu-transport (= 7.0.2) sensu-extension (1.5.1) eventmachine - sensu-extensions (1.7.1) + sensu-extensions (1.9.0) sensu-extension + sensu-extensions-check-dependencies (= 1.0.1) sensu-extensions-debug (= 1.0.0) sensu-extensions-json (= 1.0.0) - sensu-extensions-occurrences (= 1.1.0) + sensu-extensions-occurrences (= 1.2.0) sensu-extensions-only-check-output (= 1.0.0) sensu-extensions-ruby-hash (= 1.0.0) sensu-json (>= 1.1.0) sensu-logger sensu-settings + sensu-extensions-check-dependencies (1.0.1) + sensu-extension sensu-extensions-debug (1.0.0) sensu-extension sensu-extensions-json (1.0.0) sensu-extension - sensu-extensions-occurrences (1.1.0) + sensu-extensions-occurrences (1.2.0) sensu-extension sensu-extensions-only-check-output (1.0.0) sensu-extension sensu-extensions-ruby-hash (1.0.0) sensu-extension - sensu-json (2.0.1) - oj (= 2.14.6) + sensu-json (2.1.0) + oj (= 2.18.1) sensu-logger (1.2.1) eventmachine sensu-json - sensu-redis (2.1.0) + sensu-redis (2.1.1) eventmachine - sensu-settings (9.9.0) + sensu-settings (10.0.0) parse-cron sensu-json (>= 1.1.0) sensu-spawn (2.2.1) @@ -76,4 +79,4 @@ DEPENDENCIES sensu BUNDLED WITH - 1.14.4 + 1.14.6 diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix index 273496e2fb42..1df8d419cb63 100644 --- a/pkgs/servers/monitoring/sensu/gemset.nix +++ b/pkgs/servers/monitoring/sensu/gemset.nix @@ -50,18 +50,18 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7"; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; }; - version = "1.9.17"; + version = "1.9.18"; }; oj = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pa9vmbxivplphad4ddjy30ylbb3bi61y13vmwx4llz3svl8r8kk"; + sha256 = "147whmq8h2n04chskl3v4a132xhz5i6kk6vhnz83jwng4vihin5f"; type = "gem"; }; - version = "2.14.6"; + version = "2.18.1"; }; parse-cron = { source = { @@ -74,10 +74,10 @@ sensu = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1dbyc1wylg9ligr1slv60myhbzdbja96v3srb3xrirv6vl33npqx"; + sha256 = "0931qccqhwmvqf4jj3jwip25xwkg7rf1yxxpkdhiyi2yndyfb8x7"; type = "gem"; }; - version = "0.28.0"; + version = "0.29.0"; }; sensu-extension = { source = { @@ -90,10 +90,18 @@ sensu-extensions = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0axjqak7yhhznhs9f4q8km7ikha5khglwqsc33scck13hsvw9l6g"; + sha256 = "1r09mdbbnh5cg9yvqw78sxbhlb8xqld1vwbr4hsjw6k3x1xpnnr9"; type = "gem"; }; - version = "1.7.1"; + version = "1.9.0"; + }; + sensu-extensions-check-dependencies = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0clgvf2abvwz549f28ny3zd6q7z6y7m49i8pp91ll10jp1vsy4b2"; + type = "gem"; + }; + version = "1.0.1"; }; sensu-extensions-debug = { source = { @@ -114,10 +122,10 @@ sensu-extensions-occurrences = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xi9888gp3lz5fik1k32bc1c6sjp7rr551p8dr5i3hsm5ii7blja"; + sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; sensu-extensions-only-check-output = { source = { @@ -138,10 +146,10 @@ sensu-json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08bn8a5fscbhc9mcjg5avwjjbwxn28b48336bdxx87yng0wyafm4"; + sha256 = "02qkh86jddv7gha39vjx6g9hi7vkq7r433dr86bwmm9c7lqkgyl9"; type = "gem"; }; - version = "2.0.1"; + version = "2.1.0"; }; sensu-logger = { source = { @@ -154,18 +162,18 @@ sensu-redis = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10axrjg2q569bjdchpjsdillzszifkgkayaz390hnf876mssqwcg"; + sha256 = "1nqk2046g6nldpiqy40f805gms8r856v2zxm53j0c8ni03sgz2a3"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; sensu-settings = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0bs66zmhs7yrwywvfhbld051d83f3nypmk2rf8dfn19ijzk4ch9i"; + sha256 = "0fb3wgqll5cq5akgmqhx6vgjvmcpcjyx68qqs8hb106b07gdpmli"; type = "gem"; }; - version = "9.9.0"; + version = "10.0.0"; }; sensu-spawn = { source = { diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 122d5bd7dc9c..618bc17d0a76 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.3.3.3148"; - vsnHash = "b38628e"; - sha256 = "1dx8z27l1dwigr3ipcdzn25hnj0206255ihxh9rnh2qchrcqmb5y"; + version = "1.5.5.3634"; + vsnHash = "995f1dead"; + sha256 = "0zk2zv7r4mf582gfbv4ahxzl8pbspzkf3514qmqhhx2z4grng49h"; }; in stdenv.mkDerivation rec { @@ -36,7 +36,14 @@ in stdenv.mkDerivation rec { # Now we need to patch up the executables and libraries to work on Nix. # Side note: PLEASE don't put spaces in your binary names. This is stupid. - for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner" "Plex Script Host" "Plex Transcoder" "Plex Relay"; do + for bin in "Plex Media Server" \ + "Plex DLNA Server" \ + "Plex Media Scanner" \ + "Plex Media Server Tests" \ + "Plex Relay" \ + "Plex Script Host" \ + "Plex Transcoder" \ + "Plex Tuner Service" ; do patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" done @@ -67,7 +74,7 @@ in stdenv.mkDerivation rec { homepage = http://plex.tv/; license = licenses.unfree; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice pjones ]; description = "Media / DLNA server"; longDescription = '' Plex is a media server which allows you to store your media and play it diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 446927745a90..a2b8a072fa29 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.535"; + version = "0.2.0.596"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "1ccvblklqn5iki7gc16bzzbwms28mv4kxzv1nwhlm9vf0cw4qxbr"; + sha256 = "0pcvd41ls90h12j0kfxn9yrcap5dhb22vjm87xa5pg031fca7xy0"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 3e340ba7df4b..535571f46e20 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -6,9 +6,10 @@ }: let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; + mkFlag = trueStr: falseStr: cond: name: val: "--" + + (if cond then trueStr else falseStr) + + name + + stdenv.lib.optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix index 9781414895b8..37471e9ce426 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix @@ -1,12 +1,12 @@ { busybox = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/busybox; - sha256 = "03i90dwkly1j2a7i12qixkybjz2b24ixjrl7zsr17s1sv6m27zba"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/busybox; + sha256 = "00mxas5xg2j9n1g0q0nklr0dy87qqxk0jja5qz1yi7xl7zzsnpnw"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/bootstrap-tools.tar.xz; - sha256 = "1sikiydjlbv8v35fgjvr5swgvj6bc83gmrbjrhpi0hyzyfcinxbn"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/bootstrap-tools.tar.xz; + sha256 = "0fhiy9l3mbmlhpkby31c2s63bhjiqx25qqr3wdp8cb7fxz8ayx2f"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix index 76fe900b9ae9..447189756821 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix @@ -1,12 +1,12 @@ { busybox = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/busybox; - sha256 = "1vl1nx7ccalp2w8d5ymj6i2vs0s9w80xvxpsxl2l24k5ibbspcy0"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/busybox; + sha256 = "06n8dy8y2v28yx9ws8x64wxrvn9pszgpd299hc90nv9x21m79jzd"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/bootstrap-tools.tar.xz; - sha256 = "106f3r1ndl9h1cbxn44vwn3kkhgi8a937xx1v9n40zfx6dzzfv25"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/bootstrap-tools.tar.xz; + sha256 = "1gg2q3sw81vi65g1gmpvx0nnd6hxb76vlz73wfp292m90z1mym7f"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix index 91452d639c47..b97fd9967eae 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix @@ -1,12 +1,12 @@ { busybox = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/busybox; - sha256 = "0kb439p37rzlascp6ldm4kwf5kwd6p3lv17c41zwj20wbv8sdilq"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/busybox; + sha256 = "187xwzsng5lpak1nanrk88y4mlydmrbhx6la00rrd6kjx376s565"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/bootstrap-tools.tar.xz; - sha256 = "0h75xbpkyzhvmjzhj9i598p0cq60py7v0b8lryrvcqw7qjlbgrsd"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/bootstrap-tools.tar.xz; + sha256 = "05ayki2kak3i5lw97qidd5h9jv00dmlhx9h7l771bj331yamyqdn"; }; } diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index bb2df52f84c5..3cfb9a05b2dc 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig , libjack2, alsaLib, libpulseaudio , faac, lame, libogg, libopus, libvorbis, libsamplerate }: diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix new file mode 100644 index 000000000000..e98667b8c04a --- /dev/null +++ b/pkgs/tools/audio/glyr/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake +, curl, glib, sqlite, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.0.10"; + name = "glyr-${version}"; + + src = fetchFromGitHub { + owner = "sahib"; + repo = "glyr"; + rev = "${version}"; + sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ sqlite glib curl ]; + + configurePhase = '' + cmake -DCMAKE_INSTALL_PREFIX=$out + ''; + + meta = with stdenv.lib; { + license = licenses.lgpl3; + description = "A music related metadata searchengine"; + homepage = https://github.com/sahib/glyr; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.linux; # TODO macOS would be possible + }; +} + + diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index d21d790dac81..e4c8b0f33bcd 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -31,11 +31,10 @@ with stdenv; with stdenv.lib; let inherit (python2Packages) python; - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}" - + "${if val != null && cond != false then "=${val}" else ""}"; - + mkFlag = trueStr: falseStr: cond: name: val: "--" + + (if cond then trueStr else falseStr) + + name + + optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix new file mode 100644 index 000000000000..9fd8711a3d08 --- /dev/null +++ b/pkgs/tools/misc/clac/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchFromGitHub}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "clac"; + version = "0.0.0.20170416"; + + src = fetchFromGitHub { + owner = "soveran"; + repo = "clac"; + rev = "828600b01e80166bc435d4d73506f0c3e16f2459"; + sha256 = "08fhhvjrc7rn5fjjdqlallr76m6ybj3wm5gx407jbgfbky0fj7mb"; + }; + + buildInputs = []; + makeFlags = ["PREFIX=$(out)"]; + + postInstall = '' + mkdir -p "$out/share/doc/${pname}" + cp README* LICENSE "$out/share/doc/${pname}" + ''; + + meta = { + inherit version; + description = "Interactive stack-based calculator"; + license = stdenv.lib.licenses.bsd2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/soveran/clac"; + }; +} diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 455937f3a67c..d87976cbc5e8 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ++ optional aclSupport acl.crossDrv ++ optional attrSupport attr.crossDrv ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] - ++ optional (stdenv.ccCross.libc ? libiconv) + ++ optional (stdenv ? ccCross.libc.libiconv) stdenv.ccCross.libc.libiconv.crossDrv; # Prevents attempts of running 'help2man' on cross-built binaries. diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 84b074de6cc9..6001a785c7a3 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.16.4"; + version = "0.16.6"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0kq4j6q1xk17ryzzcb8s6l2zqsjkk75lrwalias9gwcriqs6k6yn"; + sha256 = "0nzjbm40c4w9d0d34s5qnr9jkrh1vkn508xl2lfwfvmnzsnb9xbn"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix index 170761078c9e..2f033c5b1c2b 100644 --- a/pkgs/tools/misc/fzf/deps.nix +++ b/pkgs/tools/misc/fzf/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/junegunn/go-runewidth"; - rev = "63c378b851290989b19ca955468386485f118c65"; - sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"; + rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50"; + sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "854ae91cdcbf914b499b1d7641d07859f3653481"; - sha256 = "19hj2nv2awc6zhpiapv8xv2yjdwfpxhvx5wnr99if6kg0y1ybsa7"; + rev = "abc5fa7ad02123a41f02bf1391c9760f7586e608"; + sha256 = "1kdfbz46jnpm2hip79db6jvw5m4z4vh7x7rr798mzqdn6fsad7jb"; }; } ] diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix new file mode 100644 index 000000000000..98489358738c --- /dev/null +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: + +let + version = "0.92.1-unstable"; +in +stdenv.mkDerivation rec { + name = "osm2pgsql-${version}"; + + src = fetchgit { + url = "https://github.com/openstreetmap/osm2pgsql.git"; + rev = "2b72b2121e91b72b0db6911d65c5165ca46d9d66"; + # Still waiting on release after: + # https://github.com/openstreetmap/osm2pgsql/pull/684 + # https://github.com/openstreetmap/osm2pgsql/issues/634 + #rev = "refs/tags/${version}"; + sha256 = "1v6s863zsv9p2mni35gfamawj0xr2cv2p8a31z7sijf8m6fn0vpy"; + }; + nativeBuildInputs = [cmake]; + buildInputs = [expat proj bzip2 zlib boost postgresql lua]; + + meta = { + description = "OpenStreetMap data to PostgreSQL converter"; + version = "0.92.1-unstable"; + homepage = https://github.com/openstreetmap/osm2pgsql; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 3000aacafa38..3f2d81249d11 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,20 +1,14 @@ { stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }: -let version = "18"; in +let version = "19.1"; in stdenv.mkDerivation { name = "cjdns-"+version; src = fetchurl { url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; - sha256 = "1as7n730ppn93cpal7s6r6iq1qx46m0c45iwy8baypbpp42zxrap"; + sha256 = "53c568a500215b055a9894178eb4477bd93a6e1abf751d0bc5ef2a03ea01a188"; }; - patches = [(fetchpatch { - name = "glibc-2.25.diff"; - url = https://github.com/cjdelisle/cjdns/pull/1017.diff; - sha256 = "1k05d1w04lngcki56b6brkwg9xakzsbr5ibkcba8112v6jdzw51f"; - })]; - buildInputs = [ which python27 nodejs ] ++ # for flock stdenv.lib.optional stdenv.isLinux utillinux; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index b1f726ad27d6..aeace91df191 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, zlib, enableStatic ? false, -sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: +{ stdenv, lib, fetchurl, glibc, zlib +, enableStatic ? false +, sftpPath ? "/run/current-system/sw/libexec/sftp-server" +}: stdenv.mkDerivation rec { name = "dropbear-2016.74"; @@ -11,7 +13,7 @@ stdenv.mkDerivation rec { dontDisableStatic = enableStatic; - configureFlags = stdenv.lib.optional enableStatic "LDFLAGS=-static"; + configureFlags = lib.optional enableStatic "LDFLAGS=-static"; CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\""; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { ./pass-path.patch ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ]; meta = with stdenv.lib; { homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html"; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index d6ae4a0e5a94..ae62195342f6 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "lftp-${version}"; - version = "4.7.6"; + version = "4.7.7"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.bz2" "http://lftp.yar.ru/ftp/old/${name}.tar.bz2" ]; - sha256 = "6b46389e9c2e67af9029a783806facea4c8f0b4d6adca5c1088e948d2fd68ae7"; + sha256 = "104jvzmvbmblfg8n8ffrnrrg8za5l25n53lbkawwy5x3m4h1yi7y"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 9933b512006f..ef539cbb51fd 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ pkgconfig libbsd ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libbsd ]; + sourceRoot = name; patches = [ "../debian/patches/*.patch" ]; diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 3be1d194d82b..8ccc924d9f6e 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "sivel"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "160m1liinbpbmjxi3cvdw5x3k9sb4j51ly92lynylpamcqcv8m83"; + sha256 = "13i7bvhvwv8h2lxnz9pfxq6jv915lb948d6xjiy5p7rqbki40ng2"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix new file mode 100644 index 000000000000..4a34e62322d2 --- /dev/null +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, zlib, openssl }: + +with rustPlatform; + +buildRustPackage rec { + name = "cargo-edit-${version}"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "killercup"; + repo = "cargo-edit"; + rev = "v${version}"; + sha256 = "16wvix2zkpzl1hhlsvd6mkps8fw5k4n2dvjk9m10gg27pixmiync"; + }; + + buildInputs = [ zlib openssl ]; + + depsSha256 = "1v7ir56j6biximnnhyvadd98azcj3i5hc8aky0am2nf0swq0jimq"; + + meta = with stdenv.lib; { + description = "A utility for managing cargo dependencies from the command line"; + homepage = https://github.com/killercup/cargo-edit; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ jb55 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 629c9b685360..eaab261adef8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -131,12 +131,13 @@ in rec { sha256 = "69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67"; }; - # 1.11.8 doesn't yet have the patch to work on LLVM 4, so we patch it for now. Take this out once - # we move to a higher version. I'd pull the specific patch from upstream but it doesn't apply cleanly. + # Until 1.11.9 is released, we do this :) patchPhase = '' substituteInPlace src/libexpr/json-to-value.cc \ --replace 'std::less<Symbol>, gc_allocator<Value *>' \ 'std::less<Symbol>, gc_allocator<std::pair<const Symbol, Value *> >' + + sed -i '/if (settings.readOnlyMode) {/a curSchema = getSchema();' src/libstore/local-store.cc ''; }) // { perl-bindings = nixStable; }; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 6c3a63119b06..78d815eb7c19 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, autoreconfHook }: +{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, binutils, autoreconfHook }: stdenv.mkDerivation rec { - name = "rpm-4.13.0-rc1"; + name = "rpm-${version}"; + version = "4.13.0.1"; src = fetchurl { - url = "http://www.rpm.org/releases/testing/rpm-4.13.0-rc1.tar.bz2"; - sha256 = "097mc0kkrf09c01hrgi71df7maahmvayfgsvspnxigvl3xysv8hp"; + url = "http://ftp.rpm.org/releases/rpm-4.13.x/rpm-${version}.tar.bz2"; + sha256 = "27fc7ba7d419622b1ce34d6507aa70b0808bc344021d298072a0c2ec165f9b0d"; }; outputs = [ "out" "dev" "man" ]; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements - propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive ]; + propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive binutils ]; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; + patches = [ ./rpm-4.13.0.1-bfd-config.patch ]; + postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} @@ -43,6 +46,10 @@ stdenv.mkDerivation rec { for tool in ld nm objcopy objdump strip; do sed -i $out/lib/rpm/macros -e "s/^%__$tool.*/%__$tool $tool/" done + + # symlinks produced by build are incorrect + ln -sf $out/bin/{rpm,rpmquery} + ln -sf $out/bin/{rpm,rpmverify} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch new file mode 100644 index 000000000000..b8192b24f134 --- /dev/null +++ b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch @@ -0,0 +1,11 @@ +diff -ru rpm-4.13.0.1/tools/sepdebugcrcfix.c rpm-4.13.0.1.new/tools/sepdebugcrcfix.c +--- rpm-4.13.0.1/tools/sepdebugcrcfix.c 2017-02-16 10:40:09.988649399 +0100 ++++ rpm-4.13.0.1.new/tools/sepdebugcrcfix.c 2017-04-15 00:02:21.151359876 +0200 +@@ -28,6 +28,7 @@ + #include <error.h> + #include <libelf.h> + #include <gelf.h> ++#include <config.h> + #include <bfd.h> + + #define _(x) x diff --git a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch index 74e466069d93..7acd7239b392 100644 --- a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch +++ b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch @@ -1,57 +1,11 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -251,23 +251,23 @@ - # ${CMAKE_SOURCE_DIR}/data/icons/48x48 - # ${CMAKE_SOURCE_DIR}/data/icons/128x128 - ${CMAKE_SOURCE_DIR}/data/icons/ -- DESTINATION usr/share/icons/ -+ DESTINATION share/icons/ - ) - - install(FILES - ${CMAKE_SOURCE_DIR}/data/nitrokey-app.desktop -- DESTINATION usr/share/applications -+ DESTINATION share/applications - ) - - install(FILES - ${CMAKE_SOURCE_DIR}/data/icons/hicolor/128x128/apps/nitrokey-app.png -- DESTINATION usr/share/pixmaps -+ DESTINATION share/pixmaps - ) - - # Install Nitrokey udev rules - install(FILES - ${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules -- DESTINATION usr/lib/udev/rules.d -+ DESTINATION lib/udev/rules.d - ) - +@@ -273,7 +273,7 @@ # Install autocompletion scripts -@@ -278,7 +278,7 @@ - install(FILES - ${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo -- DESTINATION usr/share/locale/de_DE/LC_MESSAGES -+ DESTINATION share/locale/de_DE/LC_MESSAGES + ${CMAKE_SOURCE_DIR}/data/bash-autocomplete/nitrokey-app +- DESTINATION /etc/bash_completion.d ++ DESTINATION etc/bash_completion.d ) install(FILES -@@ -286,7 +286,7 @@ - ${CMAKE_SOURCE_DIR}/images/quit.png - ${CMAKE_SOURCE_DIR}/images/safe_zahlenkreis.png - ${CMAKE_SOURCE_DIR}/images/settings.png -- DESTINATION usr/share/nitrokey -+ DESTINATION share/nitrokey - ) - - ENDIF () # NOT WIN32 -@@ -299,7 +299,7 @@ - ${resources_ouput} - ) - --INSTALL(TARGETS nitrokey-app DESTINATION usr/bin) -+INSTALL(TARGETS nitrokey-app DESTINATION bin) - - TARGET_LINK_LIBRARIES(nitrokey-app - ${QT_LIBRARIES} diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 91d5e75272bc..5e1baa4f57bf 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -2,27 +2,29 @@ stdenv.mkDerivation rec { name = "nitrokey-app"; - version = "0.5.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nitrokey-app"; rev = "v${version}"; - sha256 = "0acb2502r3wa0mry6h8sz1k16zaa4bgnhxwxqd1vd1y42xc6g9bw"; + sha256 = "1l5l4lwxmyd3jrafw19g12sfc42nd43sv7h7i4krqxnkk6gfx11q"; }; buildInputs = [ - cmake libusb1 - pkgconfig qt5.qtbase ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; patches = [ ./FixInstallDestination.patch ./HeaderPath.patch ]; cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO"; - meta = { + meta = with stdenv.lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; longDescription = '' The nitrokey-app provides a QT system tray widget with wich you can @@ -31,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/Nitrokey/nitrokey-app; repositories.git = https://github.com/Nitrokey/nitrokey-app.git; - license = stdenv.lib.licenses.gpl3; - maintainer = stdenv.lib.maintainers.kaiha; + license = licenses.gpl3; + maintainer = maintainers.kaiha; }; } diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 9c2a42eeb5ae..40cee73dcd29 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { Logcheck helps spot problems and security violations in your logfiles automatically and will send the results to you by e-mail. Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; - homepage = http://logcheck.org; + homepage = http://logcheck.alioth.debian.org/; license = licenses.gpl2; maintainers = [ maintainers.bluescreen303 ]; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix new file mode 100644 index 000000000000..38eadf40ae37 --- /dev/null +++ b/pkgs/tools/text/fanficfare/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, python27Packages }: + +python27Packages.buildPythonApplication rec { + version = "2.9.0"; + name = "fanficfare-${version}"; + nameprefix = ""; + + src = fetchurl { + url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; + sha256 = "781e9095d8152345a6106135e87c46eb306ff234b847de5073faca2f78544398"; + }; + + propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; + + meta = with stdenv.lib; { + description = "FanFicFare is a tool for making eBooks from fanfiction web sites"; + homepage = "https://github.com/JimmXinu/FanFicFare"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ lucas8 ]; + inherit version; + }; +} diff --git a/pkgs/tools/video/atomicparsley/casts.patch b/pkgs/tools/video/atomicparsley/casts.patch deleted file mode 100644 index b70a3cbcf854..000000000000 --- a/pkgs/tools/video/atomicparsley/casts.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- AtomicParsley-source-0.9.0/AtomicParsley.cpp.orig 2015-03-13 15:38:16.817904490 -0600 -+++ AtomicParsley-source-0.9.0/AtomicParsley.cpp 2015-03-13 15:48:07.595273416 -0600 -@@ -1447,7 +1447,7 @@ - uint32_t atom_offsets = 0; - char* uuid_outfile = (char*)calloc(1, sizeof(char)*MAXPATHLEN+1); //malloc a new string because it may be a cli arg for a specific output path - if (output_path == NULL) { -- char* orig_suffix = strrchr(originating_file, '.'); -+ char* orig_suffix = strrchr((char*)originating_file, (int)'.'); - if (orig_suffix == NULL) { - fprintf(stdout, "AP warning: a file extension for the input file was not found.\n\tGlobbing onto original filename...\n"); - path_len = strlen(originating_file); -@@ -4464,7 +4464,7 @@ - void APar_DeriveNewPath(const char *filePath, char* temp_path, int output_type, const char* file_kind, char* forced_suffix, bool random_filename = true) { - char* suffix = NULL; - if (forced_suffix == NULL) { -- suffix = strrchr(filePath, '.'); -+ suffix = strrchr((char*)filePath, (int)'.'); - } else { - suffix = forced_suffix; - } -@@ -4480,7 +4480,7 @@ - memcpy(temp_path, filePath, base_len); - memcpy(temp_path + base_len, file_kind, strlen(file_kind)); - #else -- char* file_name = strrchr(filePath, '/'); -+ char* file_name = strrchr((char*)filePath, (int)'/'); - size_t file_name_len = strlen(file_name); - memcpy(temp_path, filePath, filepath_len-file_name_len+1); - memcpy(temp_path + strlen(temp_path), ".", 1); -@@ -5006,7 +5006,7 @@ - free_modified_name = true; - if (forced_suffix_type == FORCE_M4B_TYPE) { //using --stik Audiobook with --overWrite will change the original file's extension - uint16_t filename_len = strlen(m4aFile); -- char* suffix = strrchr(m4aFile, '.'); -+ char* suffix = strrchr((char*)m4aFile, (int)'.'); - memcpy(originating_file, m4aFile, filename_len+1 ); - memcpy(originating_file + (filename_len - strlen(suffix) ), ".m4b", 5 ); - } diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index b2eb53666181..701850758bcb 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,39 +1,32 @@ -{ stdenv, fetchurl, unzip, darwin }: +{ stdenv, fetchhg, autoreconfHook, zlib, darwin }: stdenv.mkDerivation rec { name = "atomicparsley-${version}"; - product = "AtomicParsley"; - version = "0.9.0"; + version = "0.9.6"; - src = fetchurl { - url = "mirror://sourceforge/atomicparsley/${product}-source-${version}.zip"; - sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; + src = fetchhg { + url = "https://bitbucket.org/wez/atomicparsley"; + sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm"; }; - patches = stdenv.lib.optional (!stdenv.cc.isClang) ./casts.patch; + buildInputs = + [ autoreconfHook + zlib + ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - buildInputs = [ unzip ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - - setSourceRoot = "sourceRoot=${product}-source-${version}"; - - buildPhase = "bash build"; installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; - postPatch = '' - substituteInPlace build \ - --replace 'g++' 'c++' - substituteInPlace AP_NSImage.mm \ - --replace '_NSBitmapImageFileType' 'NSBitmapImageFileType' - ''; - meta = with stdenv.lib; { description = '' A lightweight command line program for reading, parsing and setting metadata into MPEG-4 files ''; - homepage = http://atomicparsley.sourceforge.net/; + longDescription = '' + This is a maintained fork of the original AtomicParsley. + ''; + + homepage = https://bitbucket.org/wez/atomicparsley; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ pjones ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85557b15e3d2..39fef3a2f6b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -303,7 +303,7 @@ with pkgs; composableDerivation = callPackage ../../lib/composable-derivation.nix { }; - platforms = import ./platforms.nix; + inherit (lib.systems) platforms; setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh; @@ -539,6 +539,8 @@ with pkgs; gcsfuse = callPackage ../tools/filesystems/gcsfuse { }; + glyr = callPackage ../tools/audio/glyr { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; @@ -652,6 +654,8 @@ with pkgs; blink = callPackage ../applications/networking/instant-messengers/blink { }; + quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; + tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; blink1-tool = callPackage ../tools/misc/blink1-tool { }; @@ -768,6 +772,8 @@ with pkgs; ckbcomp = callPackage ../tools/X11/ckbcomp { }; + clac = callPackage ../tools/misc/clac {}; + clasp = callPackage ../tools/misc/clasp { }; cli53 = callPackage ../tools/admin/cli53 { }; @@ -826,6 +832,8 @@ with pkgs; daemontools = callPackage ../tools/admin/daemontools { }; + dale = callPackage ../development/compilers/dale { }; + dante = callPackage ../servers/dante { }; datamash = callPackage ../tools/misc/datamash { }; @@ -940,6 +948,8 @@ with pkgs; gdrivefs = python27Packages.gdrivefs; + gdrive = callPackage ../applications/networking/gdrive { }; + go-dependency-manager = callPackage ../development/tools/gdm { }; gencfsm = callPackage ../tools/security/gencfsm { }; @@ -1717,6 +1727,8 @@ with pkgs; pillow; }; + fanficfare = callPackage ../tools/text/fanficfare { }; + fastd = callPackage ../tools/networking/fastd { }; fatsort = callPackage ../tools/filesystems/fatsort { }; @@ -2481,6 +2493,8 @@ with pkgs; jsduck = callPackage ../development/tools/jsduck { }; + jucipp = callPackage ../applications/editors/jucipp { }; + jwhois = callPackage ../tools/networking/jwhois { }; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; @@ -5230,6 +5244,8 @@ with pkgs; all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { }; purescript = haskell.lib.justStaticExecutables haskellPackages.purescript; + psc-package = haskell.lib.justStaticExecutables + (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); inherit (ocamlPackages) haxe; @@ -5245,6 +5261,10 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; + fsharp41 = callPackage ../development/compilers/fsharp41 { + mono = mono46; + }; + fstar = callPackage ../development/compilers/fstar { ocamlPackages = ocaml-ng.ocamlPackages_4_02; }; @@ -5578,6 +5598,8 @@ with pkgs; cargo = rust.cargo; rustc = rust.rustc; + cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + rustPlatform = recurseIntoAttrs (makeRustPlatform rust); makeRustPlatform = rust: lib.fix (self: @@ -5598,6 +5620,9 @@ with pkgs; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; + rustup = callPackage ../development/tools/rust/rustup { + inherit (darwin.apple_sdk.frameworks) Security; + }; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; @@ -9067,10 +9092,12 @@ with pkgs; in mo.drivers ); + # Please, avoid using this attribute. It was meant as transitional hack + # for packages that assume that libGLU and libGL live in the same prefix. + # Otherwise it's better to use mesa_glu or mesa_noglu, depending on whether + # you need libGLU or not (_glu propagates _noglu). mesa = mesaDarwinOr (buildEnv { name = "mesa-${mesa_noglu.version}"; - # FIXME: this causes mesa to have a runtime dependency on - # mesa_noglu.dev. paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ]; meta = { platforms = lib.platforms.unix; @@ -9565,6 +9592,10 @@ with pkgs; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; + libqtav = callPackage ../development/libraries/libqtav { + libva = libva-full; # also wants libva-x11 + }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { ffmpeg = ffmpeg_2; }; @@ -9713,6 +9744,8 @@ with pkgs; sad = callPackage ../applications/science/logic/sad { }; + safefile = callPackage ../development/libraries/safefile {}; + sbc = callPackage ../development/libraries/sbc { }; schroedinger = callPackage ../development/libraries/schroedinger { }; @@ -13834,6 +13867,8 @@ with pkgs; getxbook = callPackage ../applications/misc/getxbook {}; + ghq = gitAndTools.ghq; + gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { inherit (gnome2) libart_lgpl; webkit = null; @@ -14775,6 +14810,8 @@ with pkgs; oroborus = callPackage ../applications/window-managers/oroborus {}; + osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; + ostinato = callPackage ../applications/networking/ostinato { }; panamax_api = callPackage ../applications/networking/cluster/panamax/api { @@ -16670,6 +16707,8 @@ with pkgs; lua = lua5; }; + instead-launcher = callPackage ../games/instead-launcher { }; + ja2-stracciatella = callPackage ../games/ja2-stracciatella { }; klavaro = callPackage ../games/klavaro {}; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 3e3ecdeea6cb..5d3da35c54fb 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -40,6 +40,7 @@ let # Rename the function arguments configExpr = config; + crossSystem0 = crossSystem; in let lib = import ../../lib; @@ -52,12 +53,15 @@ in let then configExpr { inherit pkgs; } else configExpr; - # Allow setting the platform in the config file. Otherwise, let's use a - # reasonable default. - localSystem = - { platform = (import ./platforms.nix).selectPlatformBySystem args.localSystem.system; } - // builtins.intersectAttrs { platform = null; } config - // args.localSystem; + # From a minimum of `system` or `config` (actually a target triple, *not* + # nixpkgs configuration), infer the other one and platform as needed. + localSystem = lib.systems.elaborate ( + # Allow setting the platform in the config file. This take precedence over + # the inferred platform, but not over an explicitly passed-in onw. + builtins.intersectAttrs { platform = null; } config + // args.localSystem); + + crossSystem = lib.mapNullable lib.systems.elaborate crossSystem0; # A few packages make a new package set to draw their dependencies from. # (Currently to get a cross tool chain, or forced-i686 package.) Rather than diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 71f2326b9379..ac4c5eaac64c 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -46,6 +46,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net40/*" ]; }; + FSharpCore = fetchNuGet { + baseName = "FSharp.Core"; + version = "4.0.0.1"; + sha256 = "01nhjcxdz8l1r5vvdzhmgy5x7z5fqppab3ki34qg14axgf8jjygn"; + outputFiles = [ "*" ]; + }; + + FSharpData225 = fetchNuGet { + baseName = "FSharp.Data"; + version = "2.2.5"; + sha256 = "1c9l6bk0d2srccash2980y9phq3kmfm0m76k4wghnysnq94vm724"; + outputFiles = [ "*" ]; + }; + FSharpDataSQLProvider = fetchNuGet { baseName = "SQLProvider"; version = "0.0.9-alpha"; @@ -60,6 +74,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net45/*" ]; }; + FsCheck262 = fetchNuGet { + baseName = "FsCheck"; + version = "2.6.2"; + sha256 = "0fh9yvsc4i61z31qf00d6gjv6xxd54pv1ykf5bpv95a5crc3qfvl"; + outputFiles = [ "*" ]; + }; + FsCheckNunit = fetchNuGet { baseName = "FsCheck.Nunit"; version = "1.0.4"; @@ -67,6 +88,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net45/*" ]; }; + FSharpCompilerTools = fetchNuGet { + baseName = "FSharp.Compiler.Tools"; + version = "4.1.4"; + sha256 = "0vsp0khlnwh15ibg8s161rw6a6i8rlriclpq53paga447jllf0m8"; + outputFiles = [ "*" ]; + }; + FsLexYacc = fetchNuGet { baseName = "FsLexYacc"; version = "6.1.0"; @@ -74,6 +102,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "build/*" ]; }; + FsLexYacc704 = fetchNuGet { + baseName = "FsLexYacc"; + version = "7.0.4"; + sha256 = "01zpdb0pybdf0by02rwd7pb1g0cmnn8jxm2pibzxjxw6f4l43ywi"; + outputFiles = [ "*" ]; + }; + FsPickler = fetchNuGet { baseName = "FsPickler"; version = "1.2.9"; @@ -102,6 +137,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/*" ]; }; + NUnit350 = fetchNuGet { + baseName = "NUnit"; + version = "3.5.0"; + sha256 = "19fxq9cf754ygda5c8rn1zqs71pfxi7mb96jwqhlichnqih6i16z"; + outputFiles = [ "*" ]; + }; + NUnit2 = fetchNuGet { baseName = "NUnit"; version = "2.6.4"; @@ -153,6 +195,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "tools/*" ]; }; + SystemValueTuple = fetchNuGet { + baseName = "System.ValueTuple"; + version = "4.3.0"; + sha256 = "00p5s753xh5417arw3k6npf1pc1k3m1s9mrlkw5vmc7pg8lm6n88"; + outputFiles = [ "*" ]; + }; + RestSharp = fetchNuGet { baseName = "RestSharp"; version = "105.2.3"; @@ -195,6 +244,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/*" ]; }; + MicrosoftDiaSymReader = fetchNuGet { + baseName = "Microsoft.DiaSymReader"; + version = "1.1.0"; + sha256 = "04dgwy6nyxksd1nb24k5c5vz8naggg7hryadvwqnm2v3alkh6g88"; + outputFiles = [ "*" ]; + }; + + MicrosoftDiaSymReaderPortablePdb = fetchNuGet { + baseName = "Microsoft.DiaSymReader.PortablePdb"; + version = "1.2.0"; + sha256 = "0qa8sqg0lzz9galkkfyi8rkbkali0nxm3qd5y4dlxp96ngrq5ldz"; + outputFiles = [ "*" ]; + }; + NUnitRunners = fetchNuGet { baseName = "NUnit.Runners"; version = "2.6.4"; @@ -210,6 +273,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ]; }; + SystemCollectionsImmutable131 = fetchNuGet { + baseName = "System.Collections.Immutable"; + version = "1.3.1"; + sha256 = "149fcp7k7r9iw24dv5hbaij0c38kcv28dyhzbkggilfh4x2hy8c2"; + outputFiles = [ "*" ]; + }; + + SystemReflectionMetadata = fetchNuGet { + baseName = "System.Reflection.Metadata"; + version = "1.4.2"; + sha256 = "19fhdgd35yg52gyckhgwrphq07nv7v7r73hcg69ns94xfg1i6r7i"; + outputFiles = [ "*" ]; + }; + Suave = fetchNuGet { baseName = "Suave"; version = "0.29.0"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59bf5fa1007e..5bde08d5c12a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2524,6 +2524,8 @@ in { doCheck = false; # lazy packager }; + csscompressor = callPackage ../development/python-modules/csscompressor.nix {}; + csvkit = buildPythonPackage rec { name = "csvkit-${version}"; version = "0.9.1"; @@ -7747,6 +7749,9 @@ in { }; }); + + htmlmin = callPackage ../development/python-modules/htmlmin.nix {}; + httpauth = buildPythonPackage rec { version = "0.3"; name = "httpauth-${version}"; @@ -13273,6 +13278,10 @@ in { license = with licenses; [ lgpl21 ]; }; }; + + iso-639 = callPackage ../development/python-modules/iso-639 {}; + + iso3166 = callPackage ../development/python-modules/iso3166 {}; iso8601 = buildPythonPackage rec { name = "iso8601-${version}"; @@ -22330,7 +22339,7 @@ in { }; buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; - propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt4]; + propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5]; # : cannot connect to X server doCheck = false; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index f9382985fcd1..824289726995 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -1,4 +1,3 @@ - { # The platforms for which we build Nixpkgs. supportedSystems ? [ builtins.currentSystem ] , # Strip most of attributes when evaluating to spare memory usage @@ -8,8 +7,6 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; let - inherit (pkgs) lib; - nativePlatforms = linux; /* Basic list of packages to cross-build */ @@ -50,11 +47,11 @@ in # cause false negatives. testEqualOne = path: system: let f = path: attrs: builtins.toString (lib.getAttrFromPath path (allPackages attrs)); - in assert + in assertTrue ( f path { inherit system; } == - f (["buildPackages"] ++ path) { inherit system crossSystem; }; - true; + f (["buildPackages"] ++ path) { inherit system crossSystem; } + ); testEqual = path: systems: forAllSupportedSystems systems (testEqualOne path); @@ -80,7 +77,7 @@ in arch = "arm"; float = "soft"; withTLS = true; - platform = pkgs.platforms.sheevaplug; + platform = lib.systems.platforms.sheevaplug; libc = "glibc"; openssl.system = "linux-generic32"; }; @@ -139,16 +136,7 @@ in float = "hard"; withTLS = true; libc = "glibc"; - platform = { - name = "fuloong-minipc"; - kernelMajor = "2.6"; - kernelBaseConfig = "lemote2f_defconfig"; - kernelHeadersBaseConfig = "fuloong2e_defconfig"; - uboot = null; - kernelArch = "mips"; - kernelAutoModules = false; - kernelTarget = "vmlinux"; - }; + platform = lib.systems.platforms.fuloong2f_n32; openssl.system = "linux-generic32"; gcc = { arch = "loongson2f"; @@ -172,7 +160,7 @@ in fpu = "vfp"; withTLS = true; libc = "glibc"; - platform = pkgs.platforms.raspberrypi; + platform = lib.systems.platforms.raspberrypi; openssl.system = "linux-generic32"; gcc = { arch = "armv6"; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 59d571f0bd18..ddc449ae59c1 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -5,13 +5,16 @@ nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ../../lib; +let + lib = import ../../lib; +in with lib; rec { allPackages = args: packageSet (args // nixpkgsArgs); pkgs = pkgsFor "x86_64-linux"; + inherit lib; hydraJob' = if scrubJobs then hydraJob else id; @@ -41,6 +44,11 @@ rec { pkgs_x86_64_cygwin = allPackages { system = "x86_64-cygwin"; }; + assertTrue = bool: + if bool + then pkgs.runCommand "evaluated-to-true" {} "touch $out" + else pkgs.runCommand "evaluated-to-false" {} "false"; + /* The working or failing mails for cross builds will be sent only to the following maintainers, as most package maintainers will not be interested in the result of cross building a package. */ diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 0fbd5e50d12e..3bc252e440f7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -3,14 +3,14 @@ $ hydra-eval-jobs pkgs/top-level/release-python.nix */ -{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" ] }: -with import ../../lib; with import ./release-lib.nix {inherit supportedSystems; }; +with lib; let packagePython = mapAttrs (name: value: diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index b12eda6f150d..f329f2460d71 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -1,7 +1,7 @@ /* A small release file, with few packages to be built. The aim is to reduce the load on Hydra when testing the `stdenv-updates' branch. */ -{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] }: diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 66ff9a9e6b98..cf4d54fe0496 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -9,7 +9,7 @@ $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux */ -{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] @@ -22,16 +22,13 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; let - - lib = pkgs.lib; - jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; manual = import ../../doc; - lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; + lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs supportedSystems scrubJobs; }; darwin-tested = pkgs.releaseTools.aggregate { name = "nixpkgs-darwin-${jobs.tarball.version}"; @@ -55,7 +52,6 @@ let [ jobs.tarball jobs.metrics jobs.manual - jobs.lib-tests jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux jobs.stdenv.x86_64-darwin @@ -82,7 +78,8 @@ let jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin jobs.vim.x86_64-darwin - ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; + ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools + ++ lib.collect lib.isDerivation jobs.lib-tests; }; } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) { stdenvBootstrapTools.i686-linux = diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 77133d1e6af0..7f866f69660c 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2017-04-11"; - rev = "4dff0d079e01ca61b093c5a2fb6123378dfd0d38"; - sha256 = "1ygahq5kmagjmwhrss01134vfb8lvim9110y3abjkmp3cc4xwfhy"; + version = "2017-04-13"; + rev = "5758a926a647716bd650978ad53aeb4a0c5f9b45"; + sha256 = "1fnwh62k8fbflciv1qg3r9fsqn1xy72flyv15ii3mpja2vqzkdi2"; src = fetchFromGitHub { inherit rev; |