diff options
Diffstat (limited to 'pkgs/servers')
44 files changed, 999 insertions, 679 deletions
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 410bd23eb30e..c03ec8eb7f9a 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "An AMQP message broker and a C++ messaging API"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.page ]; + maintainers = [ stdenv.lib.maintainers.cpages ]; }; } diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 5a1c473a43d0..579cd9f4a0eb 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.0.1"; + version = "6.0.3"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "15af05h0h92z4zw546s7wwglvl0argzrj9w588gb96j5dni9lka4"; + sha256 = "0dg5sb2qv2xskvhlrxmidl25kyg1w0dp31a3k8f3las72fhmkpb7"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index d2b3cc1c4191..d0a278d2ef05 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.2.4"; + version = "7.3.0"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0admsji5wsclrjdaqyibdk74fmazhz35d4fgbrm173fgqm6p2mqa"; + sha256 = "0i2r60gzs382i6b9r9cx60j6d1xnr4hrj773d4mbbf8r7sg1n8r0"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index bf0b40e1d7ba..add92f688763 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.9.2"; + version = "0.9.5"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "1nmimyykbjfnwbrka50z15d11z0fc6abpkr0cjbj678d5r9wpz33"; + sha256 = "0z1qjmlxrsiccrl5cb0j4c48ksng4xgp5bgy11gswrijvymsbq2r"; }; buildFlagsArray = '' diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix index d7c974ecb162..49ae8fa09e89 100644 --- a/pkgs/servers/caddy/deps.nix +++ b/pkgs/servers/caddy/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/dustin/go-humanize"; - rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; - sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; + rev = "7a41df006ff9af79a29f0ffa9c5f21fbe6314a2d"; + sha256 = "0055ir369kz63x9ay0fxqpx2xby8digja6ffbc35vsqjnzfwws18"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "2d1e4548da234d9cb742cc3628556fef86aafbac"; - sha256 = "0n7af8pjjmg5rhb3104lyvn966l1p4dfblmy3g9b0plsmnzrz6g5"; + rev = "0674c7c7968d9fac5f0f678325161ec31df406af"; + sha256 = "0ql8bsxcc0rjli5cxb0jf22jaq18bd6s4pja7razir3a9zcyn3km"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-syslog"; - rev = "315de0c1920b18b942603ffdc2229e2af4803c17"; - sha256 = "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6"; + rev = "b609c7d9de4658cded34a7336b90886c56f9dbdb"; + sha256 = "1k0dqkizj4vwgdsb7x7fzmcgz9079sczhpn9whd0r3xcnqs7pkkb"; }; } { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/lucas-clemente/aes12"; - rev = "8ee5b5610baca43b60ecfad586b3c40d92a96e0c"; - sha256 = "1lnzrr7f6cyb10gqji6433fvwi8zid0k019m694xyppv4pzgrc93"; + rev = "25700e67be5c860bcc999137275b9ef8b65932bd"; + sha256 = "08zbfy5n6ki6fjaihk7y686dwksdglds9c8f1klkldvjbg8mw4vp"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/lucas-clemente/quic-go"; - rev = "8f7a96dfafd8b03eae5679702a837ed5bdf91327"; - sha256 = "12qc7y8v3g16q3klh852f3v4yvbcp6h8am1q98ds2c1zay9jl50n"; + rev = "86e02c4d2c459b70073cd5c39468e8a5a22db45a"; + sha256 = "16qrkcwllx88f6623ps5p5h62168xs6mcwybbw8862pvb0zkndz0"; }; } { @@ -91,21 +91,12 @@ }; } { - goPackagePath = "github.com/mholt/caddy"; - fetch = { - type = "git"; - url = "https://github.com/mholt/caddy"; - rev = "73916ccc3069de4720a77b6b817b0bb77bda6b44"; - sha256 = "1nmimyykbjfnwbrka50z15d11z0fc6abpkr0cjbj678d5r9wpz33"; - }; - } - { goPackagePath = "github.com/miekg/dns"; fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "db96a2b759cdef4f11a34506a42eb8d1290c598e"; - sha256 = "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6"; + rev = "ca336a1f95a6b89be9c250df26c7a41742eb4a6f"; + sha256 = "03yh1zszhspmmq0v22ckw96q8ds2a5s3nd0c6r3p3n165w28z434"; }; } { @@ -131,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "35eb537633d9950afc8ae7bdf0edb6134584e9fc"; - sha256 = "1hwi1nq5kkpcci7lf4fwhs8jj0mf6xcbdz1vgijpfyyd0zr6mphc"; + rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70"; + sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k"; }; } { @@ -149,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/xenolf/lego"; - rev = "82ac43327b01319544c050d5d78a4edeff9565d2"; - sha256 = "0zs1l4dm0srkx78a7rqq1g8g4yn84c07177zbaa286jqpzgijahi"; + rev = "f5d538caab6dc0c167d4e32990c79bbf9eff578c"; + sha256 = "026sjqinb0j4ddfh3rwhhh7a1yjkfdmdr4yflba5syp1hrjf1f37"; }; } { @@ -158,8 +149,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "6ab629be5e31660579425a738ba8870beb5b7404"; - sha256 = "1pk98j3wcxkns9whgazhid3if0dnaf57hmq0h6byq75aj9xbncxj"; + rev = "41d678d1df78cd0410143162dff954e6dc09300f"; + sha256 = "1gcw2850nghsfi3m98ibsxs8bwqzhdjsgiznrr9ymarzn58v3357"; }; } { @@ -167,8 +158,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f4fe4abe3c785295ddf81c7f1823bcd3bad391b6"; - sha256 = "0l50x533pj0sj3gnr30zxgm51y4x5a5fwc515zj93iy1z0pyf9cn"; + rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d"; + sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s"; }; } { @@ -176,8 +167,8 @@ fetch = { type = "git"; url = "https://gopkg.in/natefinch/lumberjack.v2"; - rev = "514cbda263a734ae8caac038dadf05f8f3f9f738"; - sha256 = "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"; + rev = "dd45e6a67c53f673bb49ca8a001fd3a63ceb640e"; + sha256 = "1fla2mzbwl1lxa9na3xhjmcszn8kiw051xq7i9xzbazzpgf0csg0"; }; } { @@ -185,8 +176,8 @@ fetch = { type = "git"; url = "https://gopkg.in/square/go-jose.v1"; - rev = "139276ceb5afbf13e636c44e9382f0ca75c12ba3"; - sha256 = "1f46qka0xzzkbsg01r9c9fi9zlzai7h83mp9hlwg9m5s73h8gzwj"; + rev = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d"; + sha256 = "0drajyadd6c4m5qv0jxcv748qczg8sgxz28nva1jn39f234m02is"; }; } { @@ -194,8 +185,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "31c299268d302dd0aa9a0dcf765a3d58971ac83f"; - sha256 = "14jkpa8g0s448n2x5qdi05m59ncsdscby1wy2p089zxl9nqavm8h"; + rev = "14227de293ca979cf205cd88769fe71ed96a97e2"; + sha256 = "038hnrjcnjygyi3qidfrkpkakis82qg381sr495d2s40g2dwlzah"; }; } ] diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix index a61b8baac867..caf3792e9831 100644 --- a/pkgs/servers/consul/ui.nix +++ b/pkgs/servers/consul/ui.nix @@ -4,9 +4,7 @@ let # `sass` et al gems = bundlerEnv { name = "consul-ui-deps"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; in diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix new file mode 100644 index 000000000000..a996cec0d5b5 --- /dev/null +++ b/pkgs/servers/couchpotato/default.nix @@ -0,0 +1,43 @@ +{ fetchurl, pythonPackages, lib }: + +with pythonPackages; + +buildPythonApplication rec { + name = "couchpotato-${version}"; + version = "3.0.1"; + disabled = isPy3k; + + src = fetchurl { + url = "https://github.com/CouchPotato/CouchPotatoServer/archive/build/${version}.tar.gz"; + sha256 = "1xwjis3ijh1rff32mpdsphmsclf0lkpd3phpgxkccrigq1m9r3zh"; + }; + + format = "other"; + + postPatch = '' + substituteInPlace CouchPotato.py --replace "dirname(os.path.abspath(__file__))" "os.path.join(dirname(os.path.abspath(__file__)), '../${python.sitePackages}')" + ''; + + installPhase = '' + mkdir -p $out/bin/ + mkdir -p $out/${python.sitePackages}/ + + cp -r libs/* $out/${python.sitePackages}/ + cp -r couchpotato $out/${python.sitePackages}/ + + cp CouchPotato.py $out/bin/couchpotato + chmod +x $out/bin/* + ''; + + fixupPhase = '' + wrapProgram "$out/bin/couchpotato" --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" \ + --set PATH ${python}/bin + ''; + + meta = { + description = "Automatic movie downloading via NZBs and torrents"; + license = lib.licenses.gpl3; + homepage = https://couchpota.to/; + maintainers = with lib.maintainers; [ fadenb ]; + }; +} diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index d3daad1e0cbc..fb8c9da5f8e7 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2 , libseccomp ? null }: -let version = "9.10.4-P4"; in +let version = "9.10.4-P5"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754"; + sha256 = "1sqg7wg05h66vdjc8j215r04f8pg7lphkb93nsqxvzhk6r0ppi49"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 62343666729c..07ba9cef82fb 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -4,21 +4,22 @@ # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.3.3"; + version = "2.4.0"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "a929bce3b957a81776b1db7b43b0e4473339bf16be8dbba5abb4b0593bf43c94"; + sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b"; }; outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gnutls jansson liburcu lmdb libcap_ng libidn - systemd nettle libedit + gnutls jansson liburcu lmdb libidn + nettle libedit # without sphinx &al. for developer documentation - ]; + ] + ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ]; enableParallelBuilding = true; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix new file mode 100644 index 000000000000..3c84d0942e76 --- /dev/null +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchurl, pkgconfig, utillinux, vimNox, which +, knot-dns, luajit, libuv, lmdb +, cmocka, systemd, hiredis, libmemcached +, gnutls, nettle +, luajitPackages, makeWrapper +}: + +let + inherit (stdenv.lib) optional; +in +stdenv.mkDerivation rec { + name = "knot-resolver-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; + sha256 = "b8828197dbd563e4b502571538c6d44ef2bb07dede1df884b785921f8aec77fd"; + }; + + outputs = [ "out" "dev" ]; + + configurePhase = ":"; + + nativeBuildInputs = [ pkgconfig which makeWrapper ] + ++ [(if stdenv.isLinux then utillinux.bin/*hexdump*/ else vimNox/*xxd*/)]; + + buildInputs = [ knot-dns luajit libuv gnutls ] + # TODO: lmdb needs lmdb.pc; embedded for now + ## optional dependencies + ++ optional doInstallCheck cmocka + ++ optional stdenv.isLinux systemd # socket activation + ++ [ + nettle # DNS cookies + hiredis libmemcached # additional cache backends + # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + CFLAGS = [ "-O2" "-DNDEBUG" ]; + + enableParallelBuilding = true; + + doInstallCheck = true; + installCheckTarget = "check"; + preInstallCheck = '' + export LD_LIBRARY_PATH="$out/lib" + ''; + + # optional: to allow auto-bootstrapping root trust anchor via https + postInstall = with luajitPackages; '' + wrapProgram "$out/sbin/kresd" \ + --set LUA_PATH '${ + stdenv.lib.concatStringsSep ";" + (map getLuaPath [ luasec luasocket ]) + }' \ + --set LUA_CPATH '${ + stdenv.lib.concatStringsSep ";" + (map getLuaCPath [ luasec luasocket ]) + }' + ''; + + meta = with stdenv.lib; { + description = "Caching validating DNS resolver, from .cz domain registry"; + homepage = https://knot-resolver.cz; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.vcunat /* upstream developer */ ]; + }; +} + diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix new file mode 100644 index 000000000000..70deadb74e14 --- /dev/null +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, boost +, openssl, systemd, lua, luajit, protobuf +, enableLua ? false +, enableProtoBuf ? false +}: + +assert enableLua -> lua != null && luajit != null; +assert enableProtoBuf -> protobuf != null; + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "pdns-recursor-${version}"; + version = "4.0.4"; + + src = fetchurl { + url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; + sha256 = "0k8y9zxj2lz4rq782vgzr28yd43q0hwlnvszwq0k9l6c967pff13"; + }; + + buildInputs = [ + boost openssl pkgconfig systemd + ] ++ optional enableLua [ lua luajit ] + ++ optional enableProtoBuf protobuf; + + configureFlags = [ + "--enable-reproducible" + "--with-systemd" + ]; + + meta = { + description = "A recursive DNS server"; + homepage = http://www.powerdns.com/; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 6eec9c3b3050..b1e4ec6e368e 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "1mzdj5077cn6cip51sxknz5hx0cyqlsrix39b7l30i36lvafx4fi"; + sha256 = "17b2gv7r53skj54ms4hx8rdjiggpc8bais0cy0jck1pmccxyalfh"; }; buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ]; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index cbafe16623ed..117fa8782c9b 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -2,9 +2,9 @@ , openssl , linkOpenssl? true , openldap -, withLdap ? false +, withLdap ? true , sqlite -, withSqlite ? false +, withSqlite ? true , libpcap , withPcap ? true , libcap @@ -40,9 +40,16 @@ assert withCollectd -> collectd != null; with stdenv.lib; stdenv.mkDerivation rec { name = "freeradius-${version}"; - version = "3.0.11"; + version = "3.0.12"; - buildInputs = [ autoreconfHook openssl talloc finger_bsd perl ] + src = fetchurl { + url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; + sha256 = "182xnb9pdsivlyfm471l90m37q9i04h7jadhkgm0ivvzrzpzcnja"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ openssl talloc finger_bsd perl ] ++ optional withLdap openldap ++ optional withSqlite sqlite ++ optional withPcap libpcap @@ -54,8 +61,6 @@ stdenv.mkDerivation rec { ++ optional withYubikey libyubikey ++ optional withCollectd collectd; - # NOTE: are the --with-{lib}-lib-dir and --with-{lib}-include-dir necessary with buildInputs ? - configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" @@ -70,11 +75,6 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - src = fetchurl { - url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "0naxw9b060rbp4409904j6nr2zwl6wbjrbq1839xrwhmaf8p4yxr"; - }; - meta = with stdenv.lib; { homepage = http://freeradius.org/; description = "A modular, high performance free RADIUS suite"; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix new file mode 100644 index 000000000000..a5dbf74947e2 --- /dev/null +++ b/pkgs/servers/h2/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchzip, jre, makeWrapper, unzip }: +stdenv.mkDerivation rec { + name = "h2-${version}"; + + version = "1.4.193"; + + src = fetchzip { + url = "http://www.h2database.com/h2-2016-10-31.zip"; + sha256 = "1da1qcfwi5gvh68i6w6y0qpcqp3rbgakizagkajmjxk2ryc4b3z9"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = + let + h2ToolScript = '' + #!/usr/bin/env bash + dir=$(dirname "$0") + + if [ -n "$1" ]; then + ${jre}/bin/java -cp "$dir/h2-${version}.jar:$H2DRIVERS:$CLASSPATH" $1 "''${@:2}" + else + echo "You have to provide the full java class path for the h2 tool you want to run. E.g. 'org.h2.tools.Server'" + fi + ''; + in '' + mkdir -p $out + cp -R * $out + + echo '${h2ToolScript}' > $out/bin/h2tool.sh + + substituteInPlace $out/bin/h2.sh --replace "java" "${jre}/bin/java" + + chmod +x $out/bin/*.sh + ''; + + meta = with stdenv.lib; { + description = "The Java SQL database"; + homepage = http://www.h2database.com/html/main.html; + license = licenses.mpl20; + platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ mahe ]; + }; +} diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 56b71ef969c8..dcd81fa44b05 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { name = "hbase-${version}"; - version = "0.98.19"; + version = "0.98.24"; src = fetchurl { url = "mirror://apache/hbase/${version}/hbase-${version}-hadoop2-bin.tar.gz"; - sha256 = "0g7y38cw09fydbf4fbs1anyilhfgxpbfs41f0aignli5i3hd1pgx"; + sha256 = "0kz72wqsii09v9hxkw10mzyvjhji5sx3l6aijjalgbybavpcxglb"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index c6f88c24509c..87efc41b1d68 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null; assert enableMysql -> mysql != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.44"; + name = "lighttpd-1.4.45"; src = fetchurl { url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "08jlgcy08w1gd8hkmz0bccipv4dzxdairj89nbz5f6b5hnlnrdmd"; + sha256 = "0grsqh7pdqnjx6xicd96adsx84vryb7c4n21dnxfygm3xrfj55qw"; }; buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 0e688b0c0c46..5d976a33488c 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.11.8"; - sha256 = "0d3bcrgj2ykky2yk06y0ihv6832s30mqzcfwq8a560brbmqz7bjk"; + version = "1.11.9"; + sha256 = "0j2pcara9ir2xj3m2mjzf7wz46mdy51c0kal61cp0ldm2qgvf8nw"; }) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index fef4d55b36c1..e7b6fff1b664 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "minio-${shortVersion}"; - shortVersion = "20160821"; - longVersion = "2016-08-21T02:44:47Z"; + shortVersion = "20161213"; + longVersion = "2016-12-13T17:19:42Z"; src = fetchurl { url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "159196bnb4b7f00jh9gll9kqqxq1ifxv1kg5bd6yjpqf5qca4pkn"; + sha256 = "1x23arrah54q2zqhgpyag531mimvs0wx6ap0hdrn4mygy5dahrqs"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index aa14af89c32d..f2ce7822b8af 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.0.2"; - ts = "1481203731"; + version = "4.1.1"; + ts = "1484211277"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -10,12 +10,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1z71nb4qmp1qavsc101k86hc4yyis3mlqb1csrymkhgl94qpiiqm"; + sha256 = "028s8fq8akv509kqw49865qpccxmhskaxcm51nn3c0i7vask2ivs"; }; srcStatic = fetchurl { url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz"; - sha256 = "1jnh2hn95r1ik0z31b4p0niq7apykppf8jcjjhsbqf8yp8i2b737"; + sha256 = "1srscjlm9m08z7shydhkl4wnhv19by7pqfd7qvbvz2v3d5slqiji"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index e3da9dfa75f2..3e4e778e238b 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, makeWrapper, which, coreutils, rrdtool, perl, perlPackages +{ stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perl, perlPackages , python, ruby, jre, nettools }: stdenv.mkDerivation rec { - version = "2.0.25"; + version = "2.0.30"; name = "munin-${version}"; - src = fetchurl { - url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz"; - sha256 = "1ig67l3p5fnx44fcvbbinajxlin9i7g9cbac93h2hcvb2qhzzzra"; + src = fetchFromGitHub { + owner = "munin-monitoring"; + repo = "munin"; + rev = version; + sha256 = "1sxsdfq9a5d8b13jigr06gs7n4m3c95645sfyyl49bkfy0n5cxrg"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix index 1ab8b119ba0d..ac1cb1a5398e 100644 --- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix +++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, openssh }: +{ stdenv, fetchurl, openssh, openssl }: stdenv.mkDerivation rec { name = "nagios-plugins-${version}"; - version = "2.1.4"; + version = "2.2.0"; src = fetchurl { url = "http://nagios-plugins.org/download/${name}.tar.gz"; - sha256 = "146hrpcwciz0niqsv4k5yvkhaggs9mr5v02xnnxp5yp0xpdbama3"; + sha256 = "074yia04py5y07sbgkvri10dv8nf41kqq1x6kmwqcix5vvm9qyy3"; }; # !!! Awful hack. Grrr... this of course only works on NixOS. @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s libexec $out/bin"; # !!! make openssh a runtime dependency only - buildInputs = [ openssh ]; + buildInputs = [ openssh openssl ]; meta = { description = "Official plugins for Nagios"; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 00292afb8ce9..1eaef1010d35 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.3.0"; + version = "0.4.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "0imn7ggxl5zqp8i4i8pnsipacx28dirm1mdmmxxbxc5aal3b656m"; + sha256 = "1wx3lbhg8ljq6ryl1yji0fkrl6hcsda9i5cw042nhqy29q0ymqsh"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix deleted file mode 100644 index 39bd3f12e957..000000000000 --- a/pkgs/servers/monitoring/prometheus/cli.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "prometheus_cli-${version}"; - version = "0.3.0"; - rev = version; - - goPackagePath = "github.com/prometheus/prometheus_cli"; - - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "prometheus_cli"; - sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; - }; - - goDeps = ./cli_deps.nix; - - meta = with stdenv.lib; { - description = "Command line tool for querying the Prometheus HTTP API"; - homepage = https://github.com/prometheus/prometheus_cli; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.nix b/pkgs/servers/monitoring/prometheus/cli_deps.nix deleted file mode 100644 index 192b6917bf0f..000000000000 --- a/pkgs/servers/monitoring/prometheus/cli_deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } -] diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 5d6534749619..64585de51ff3 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { name = "riemann-${version}"; - version = "0.2.9"; + version = "0.2.12"; src = fetchurl { - url = "http://aphyr.com/riemann/${name}.tar.bz2"; - sha256 = "10zz92sg9ak8g7xsfc05p4kic6hzwj7nqpkjgsd8f7f3slvfjqw3"; + url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2"; + sha256 = "1x57gi301rg6faxm4q5scq9dpp0v9nqiwjpsgigdb8whmjr1zwkr"; }; + nativeBuildInputs = [ makeWrapper ]; + phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - sed -i 's#lib/riemann.jar#$out/share/java/riemann.jar#' bin/riemann + substituteInPlace bin/riemann --replace '$top/lib/riemann.jar' "$out/share/java/riemann.jar" mkdir -p $out/share/java $out/bin $out/etc mv lib/riemann.jar $out/share/java/ mv bin/riemann $out/bin/ mv etc/riemann.config $out/etc/ + + wrapProgram "$out/bin/riemann" --prefix PATH : "${jre}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index 2bb81d833372..ecc1d4109843 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -4,9 +4,7 @@ name = "sensu-0.17.1"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 996c839acff9..a3c0e3c9226f 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.1.2"; + version = "1.2.0"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "0dgrbdyz261j28wcq636125ha4xmfgh4y9shlg8m1y6jqdqd2zf2"; + sha256 = "0kijg3j2jnz7jfybycv2scvpsfmxg83jh8wl95p2bw322ypqlks1"; }; goDeps = ./. + builtins.toPath "/deps-${version}.nix"; diff --git a/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix b/pkgs/servers/monitoring/telegraf/deps-1.2.0.nix index b62ae44dbc92..a866881e53d9 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.2.0.nix @@ -199,15 +199,6 @@ }; } { - goPackagePath = "github.com/gonuts/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/gonuts/go-shellquote"; - rev = "e842a11b24c6abfb3dd27af69a17f482e4b483c2"; - sha256 = "19lbz7wl241bsyzsv2ai40b2vnj8c9nl107b6jf9gid3i6h0xydg"; - }; - } - { goPackagePath = "github.com/gorilla/context"; fetch = { type = "git"; @@ -307,6 +298,15 @@ }; } { + goPackagePath = "github.com/kballard/go-shellquote"; + fetch = { + type = "git"; + url = "https://github.com/kballard/go-shellquote"; + rev = "d8ec1a69a250a17bb0e419c386eac1f3711dc142"; + sha256 = "1a57hm0zwyi70am670s0pkglnkk1ilddnmfxz1ba7innpkf5z6s7"; + }; + } + { goPackagePath = "github.com/klauspost/crc32"; fetch = { type = "git"; @@ -446,8 +446,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08"; - sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni"; + rev = "1516eb9ddc5e61ba58874047a98f8b44b5e585e8"; + sha256 = "1pnl1g2l1y5vmnraq97rbm0nirprqvfzxsp6h4xacn1429jdl5bv"; }; } { @@ -491,8 +491,8 @@ fetch = { type = "git"; url = "https://github.com/wvanbergen/kafka"; - rev = "46f9a1cf3f670edec492029fadded9c2d9e18866"; - sha256 = "1czmbilprffdbwnrq4wcllaqknbq91l6p0ni6b55fkaggnwck694"; + rev = "bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee"; + sha256 = "0x86gnkpsr6gsc6mk2312ay8yqrzscvvdra2knhvwgaws6rzvj2l"; }; } { diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0d5d0a46e4e5..d37b53398b6d 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0a8lc85jihlw326w0irykw5fbwcbz2mlq0vrcsd0niygqlvcppsv"; + sha256 = "0aa6gzcbpjkk7ss3c1sg0scinhczvg4lgb59wv5jljliaks2n5h0"; }; installPhase = '' diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index efa5d71a76f1..09be8c7c587b 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook , json_c, libsndfile, libtool , xorg, libcap, alsaLib, glib , avahi, libjack2, libasyncns, lirc, dbus @@ -30,6 +30,8 @@ , # Whether to build only the library. libOnly ? false + +, CoreServices, AudioUnit, Cocoa }: stdenv.mkDerivation rec { @@ -41,7 +43,11 @@ stdenv.mkDerivation rec { sha256 = "11j682g2mn723sz3bh4i44ggq29z053zcggy0glzn63zh9mxdly3"; }; - patches = [ ./caps-fix.patch ]; + patches = [ ./caps-fix.patch ] + ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { + url = "https://bugs.freedesktop.org/attachment.cgi?id=127889"; + sha256 = "063h5vmh4ykgxjbxyxjlj6qhyyxhazbh3p18p1ik69kq24nkny9m"; + }); outputs = [ "out" "dev" ]; @@ -53,6 +59,7 @@ stdenv.mkDerivation rec { buildInputs = [ json_c libsndfile speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] + ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix index b45d66fd1415..35b6ee92cdcd 100644 --- a/pkgs/servers/search/elasticsearch/2.x.nix +++ b/pkgs/servers/search/elasticsearch/2.x.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.4"; name = "elasticsearch-${version}"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz"; - sha256 = "1jglmj1dnh1n2niyds6iyrpf6x6ppqgkivzy6qabkjvvmr013q1s"; + sha256 = "1qjq04sfqb35pf2xpvr8j5p27chfxpjp8ymrp1h5bfk5rbk9444q"; }; patches = [ ./es-home-2.x.patch ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # don't want to have binary with name plugin mv $out/bin/plugin $out/bin/elasticsearch-plugin - wrapProgram $out/bin/elasticsearch ${if (!stdenv.isDarwin) + wrapProgram $out/bin/elasticsearch ${if (!stdenv.isDarwin) then ''--prefix PATH : "${utillinux}/bin/"'' else ''--prefix PATH : "${getopt}/bin"''} \ --set JAVA_HOME "${jre}" diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 8dce24948fe3..6e3ab5a4eaea 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,46 +1,42 @@ { stdenv, fetchurl, mecab, kytea, libedit, pkgconfig , suggestSupport ? false, zeromq, libevent, libmsgpack -, lz4Support ? false, lz4 +, lz4Support ? false, lz4 , zlibSupport ? false, zlib }: stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "6.1.1"; + version = "6.1.5"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "03h65gycy0j2q4n5h62x3sw76ibdywdvmiciys5a7ppxb2mncabz"; + sha256 = "0phh4qp7ky5rw8xgxv3gjzw2cadkjl604xrdyxxbpd30i354sh5x"; }; - buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++ - optional lz4Support lz4 ++ - optional zlibSupport zlib ++ - optional suggestSupport [ zeromq libevent libmsgpack ]; + buildInputs = with stdenv.lib; + [ pkgconfig mecab kytea libedit ] + ++ optional lz4Support lz4 + ++ optional zlibSupport zlib + ++ optionals suggestSupport [ zeromq libevent libmsgpack ]; - configureFlags = with stdenv.lib; '' - ${optionalString zlibSupport "--with-zlib"} - ${optionalString lz4Support "--with-lz4"} - ''; - - doInstallCheck = true; + configureFlags = with stdenv.lib; + optional zlibSupport "--with-zlib" + ++ optional lz4Support "--with-lz4"; + doInstallCheck = true; installCheckPhase = "$out/bin/groonga --version"; meta = with stdenv.lib; { - homepage = http://groonga.org/; + homepage = http://groonga.org/; description = "An open-source fulltext search engine and column store"; - + license = licenses.lgpl21; + maintainers = [ maintainers.ericsagnes ]; + platforms = platforms.linux; longDescription = '' Groonga is an open-source fulltext search engine and column store. It lets you write high-performance applications that requires fulltext search. ''; - - license = licenses.lgpl21; - - maintainers = [ maintainers.ericsagnes ]; - platforms = platforms.linux; }; } diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index f50a97afd20d..4f64afe3d92b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.1.19"; + version = "10.1.21"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "108s4mimdbmgmmn5pcr9a405j70cyny9adzv49s75lg22krp74sv"; + sha256 = "144lcm5awcf0k6a7saqfr4p2kg8r5wbdhdm4cmn2m8hyg1an70as"; }; prePatch = '' @@ -161,4 +161,3 @@ everything = stdenv.mkDerivation (common // { }); in mariadb - diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix new file mode 100644 index 000000000000..52fcad7ff958 --- /dev/null +++ b/pkgs/servers/squid/4.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap +, expat, libxml2, openssl }: + +stdenv.mkDerivation rec { + name = "squid-4.0.17"; + + src = fetchurl { + url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; + sha256 = "1713fqw59r3d892p5hpbkhmfcaw6jzfnngfn5f4h46sx963k87wb"; + }; + + buildInputs = [ + perl openldap pam db cyrus_sasl libcap expat libxml2 openssl + ]; + + configureFlags = [ + "--enable-ipv6" + "--disable-strict-error-checking" + "--disable-arch-native" + "--with-openssl" + "--enable-ssl-crtd" + "--enable-linux-netfilter" + "--enable-storeio=ufs,aufs,diskd,rock" + "--enable-removal-policies=lru,heap" + "--enable-delay-pools" + "--enable-x-accelerator-vary" + ]; + + meta = with stdenv.lib; { + description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; + homepage = "http://www.squid-cache.org"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz raskin ]; + }; +} diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 4994894a0388..6d29c7456974 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -4,7 +4,7 @@ , pam, withPAM ? false , systemd, withSystemd ? false , python2, python3, ncurses -, ruby +, ruby, php-embed }: let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else "3"}" { @@ -26,9 +26,16 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else inputs = [ ruby ]; }) (lib.nameValuePair "cgi" { + # usage: https://uwsgi-docs.readthedocs.io/en/latest/CGI.html?highlight=cgi path = "plugins/cgi"; inputs = [ ]; }) + (lib.nameValuePair "php" { + # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx + path = "plugins/php"; + preBuild = "touch unix.h"; + inputs = [ php-embed php-embed.nativeBuildInputs ]; + }) ]; getPlugin = name: @@ -74,7 +81,7 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p $pluginDir python3 uwsgiconfig.py --build nixos - ${lib.concatMapStringsSep ";" (x: "${x.interpreter or "python3"} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed} + ${lib.concatMapStringsSep ";" (x: "${x.preBuild or ""}\n ${x.interpreter or "python3"} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed} ''; installPhase = '' @@ -88,7 +95,7 @@ stdenv.mkDerivation rec { homepage = "http://uwsgi-docs.readthedocs.org/en/latest/"; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar schneefux ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index fb3331768014..fc5a744ad46d 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, python -, pythonPackages }: +{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit +, python, pythonPackages }: stdenv.mkDerivation rec { - version = "4.0.3"; + version = "5.0.0"; name = "varnish-${version}"; src = fetchurl { url = "http://repo.varnish-cache.org/source/${name}.tar.gz"; - sha256 = "01l2iypajkdanxpbvzfxm6vs4jay4dgw7lmchqidnivz15sa3fcl"; + sha256 = "0jizha1mwqk42zmkrh80y07vfl78mg1d9pp5w83qla4xn9ras0ai"; }; - buildInputs = [ pcre libxslt groff ncurses pkgconfig readline python - pythonPackages.docutils]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + pcre libxslt groff ncurses readline python libedit + pythonPackages.docutils + ]; buildFlags = "localstatedir=/var/spool"; - meta = { + outputs = [ "out" "dev" "man" ]; + + meta = with stdenv.lib; { description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ garbas fpletz ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix index 644d9e6e9e55..d413475389fc 100644 --- a/pkgs/servers/web-apps/pump.io/composition.nix +++ b/pkgs/servers/web-apps/pump.io/composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.0. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,11 +6,11 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix index ec05cc8c13b9..ab3022b95123 100644 --- a/pkgs/servers/web-apps/pump.io/node-packages.nix +++ b/pkgs/servers/web-apps/pump.io/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.0. Do not edit! +# This file has been generated by node2nix 1.1.1. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -13,13 +13,13 @@ let sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; }; }; - "bunyan-1.8.1" = { + "bunyan-1.8.5" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.1"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.1.tgz"; - sha1 = "68c6a4a502d5620bc9f72d6736810c1b1898097f"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz"; + sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a"; }; }; "connect-2.30.2" = { @@ -85,13 +85,13 @@ let sha1 = "051806a88a6cc18ffb25adf13eda232e354ebcb6"; }; }; - "dompurify-0.8.3" = { + "dompurify-0.8.4" = { name = "dompurify"; packageName = "dompurify"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.3.tgz"; - sha1 = "06bdc074b91306d09f7f150bfeb96a11e0be64c1"; + url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.4.tgz"; + sha1 = "93cabe8b6b84f3cf83f63b985ff71ef05f8cdeb6"; }; }; "emailjs-1.0.8" = { @@ -112,13 +112,13 @@ let sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; }; }; - "express-session-1.14.1" = { + "express-session-1.14.2" = { name = "express-session"; packageName = "express-session"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.14.1.tgz"; - sha1 = "600364f0f6bf5dce32649e006770bdeee80aec99"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz"; + sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275"; }; }; "gm-1.23.0" = { @@ -130,13 +130,13 @@ let sha1 = "80a2fe9cbf131515024846444658461269f52661"; }; }; - "helmet-2.2.0" = { + "helmet-2.3.0" = { name = "helmet"; packageName = "helmet"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-2.2.0.tgz"; - sha1 = "fa0737d113fba4bd29d1b39650ac679ad673b948"; + url = "https://registry.npmjs.org/helmet/-/helmet-2.3.0.tgz"; + sha1 = "d655c85b55b0a3bf722a4c2c66e48b78b4161b91"; }; }; "jankyqueue-0.1.1" = { @@ -202,13 +202,13 @@ let sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; }; }; - "sanitize-html-1.13.0" = { + "sanitize-html-1.14.1" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.13.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz"; - sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631"; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz"; + sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8"; }; }; "schlock-0.2.1" = { @@ -229,22 +229,22 @@ let sha1 = "765e7607c8055452bba6f0b052595350986036de"; }; }; - "showdown-1.4.3" = { + "showdown-1.6.0" = { name = "showdown"; packageName = "showdown"; - version = "1.4.3"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/showdown/-/showdown-1.4.3.tgz"; - sha1 = "91d29f4728dbdf76034b7555355e9b30974df447"; + url = "https://registry.npmjs.org/showdown/-/showdown-1.6.0.tgz"; + sha1 = "4a3cd2b73c45914f8cc00a388303be78b9f3e2a4"; }; }; - "sockjs-0.3.17" = { + "sockjs-0.3.18" = { name = "sockjs"; packageName = "sockjs"; - version = "0.3.17"; + version = "0.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.17.tgz"; - sha1 = "ef1b88f5d73e6278fad8e9476ac91064382f3b44"; + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz"; + sha1 = "d9b289316ca7df77595ef299e075f0f937eb4207"; }; }; "step-0.0.6" = { @@ -256,13 +256,13 @@ let sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; }; }; - "ua-parser-js-0.7.10" = { + "ua-parser-js-0.7.12" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.10"; + version = "0.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.10.tgz"; - sha1 = "917559ddcce07cbc09ece7d80495e4c268f4ef9f"; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz"; + sha1 = "04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"; }; }; "underscore-1.8.3" = { @@ -364,13 +364,13 @@ let sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; }; }; - "dtrace-provider-0.6.0" = { + "dtrace-provider-0.8.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.6.0"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz"; - sha1 = "0b078d5517937d873101452d9146737557b75e51"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz"; + sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625"; }; }; "mv-2.1.1" = { @@ -391,22 +391,22 @@ let sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; }; }; - "moment-2.15.0" = { + "moment-2.17.1" = { name = "moment"; packageName = "moment"; - version = "2.15.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.15.0.tgz"; - sha1 = "cc9e33958bf4a99dea7111d5e62ed3c13fc96440"; + url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; + sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; }; }; - "nan-2.4.0" = { + "nan-2.5.0" = { name = "nan"; packageName = "nan"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; - sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; + sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; }; }; "ncp-2.0.0" = { @@ -436,13 +436,13 @@ let sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; }; }; - "inflight-1.0.5" = { + "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"; - sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a"; + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; "inherits-2.0.3" = { @@ -472,13 +472,13 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "path-is-absolute-1.0.0" = { + "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; - sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; "wrappy-1.0.2" = { @@ -670,13 +670,13 @@ let sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "method-override-2.3.6" = { + "method-override-2.3.7" = { name = "method-override"; packageName = "method-override"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz"; - sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e"; + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; + sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; }; }; "morgan-1.6.1" = { @@ -733,22 +733,22 @@ let sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "response-time-2.3.1" = { + "response-time-2.3.2" = { name = "response-time"; packageName = "response-time"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz"; - sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797"; + url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; + sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; }; }; - "serve-favicon-2.3.0" = { + "serve-favicon-2.3.2" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz"; - sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz"; + sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; }; }; "serve-index-1.7.3" = { @@ -769,13 +769,13 @@ let sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; }; }; - "type-is-1.6.13" = { + "type-is-1.6.14" = { name = "type-is"; packageName = "type-is"; - version = "1.6.13"; + version = "1.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"; - sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; + sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; }; }; "utils-merge-1.0.0" = { @@ -868,13 +868,13 @@ let sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; }; }; - "compressible-2.0.8" = { + "compressible-2.0.9" = { name = "compressible"; packageName = "compressible"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz"; - sha1 = "7162e6c46d3b9d200ffb45cb4e4a0f7832732503"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz"; + sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425"; }; }; "vary-1.0.1" = { @@ -886,13 +886,13 @@ let sha1 = "99e4981566a286118dfb2b817357df7993376d10"; }; }; - "mime-types-2.1.11" = { + "mime-types-2.1.14" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.11"; + version = "2.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"; - sha1 = "c259c471bda808a85d6cd193b430a5fae4473b3c"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; + sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; }; }; "negotiator-0.5.3" = { @@ -904,13 +904,13 @@ let sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; }; - "mime-db-1.23.0" = { + "mime-db-1.26.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.23.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"; - sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; + sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; }; }; "ms-0.7.1" = { @@ -922,22 +922,22 @@ let sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; - "csrf-3.0.3" = { + "csrf-3.0.4" = { name = "csrf"; packageName = "csrf"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz"; - sha1 = "69d13220de95762808bb120f7533a994fc4293b5"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz"; + sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; }; }; - "base64-url-1.2.2" = { + "base64-url-1.3.3" = { name = "base64-url"; packageName = "base64-url"; - version = "1.2.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz"; - sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3"; + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; + sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; }; }; "rndm-1.2.0" = { @@ -958,13 +958,13 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "uid-safe-2.1.1" = { + "uid-safe-2.1.3" = { name = "uid-safe"; packageName = "uid-safe"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz"; - sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666"; + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz"; + sha1 = "077e264a00b3187936b270bb7376a26473631071"; }; }; "random-bytes-1.0.0" = { @@ -1039,13 +1039,22 @@ let sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; }; }; - "statuses-1.3.0" = { + "statuses-1.3.1" = { name = "statuses"; packageName = "statuses"; - version = "1.3.0"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; + }; + }; + "debug-2.3.3" = { + name = "debug"; + packageName = "debug"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"; - sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a"; + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; "methods-1.1.2" = { @@ -1066,6 +1075,15 @@ let sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; }; }; + "ms-0.7.2" = { + name = "ms"; + packageName = "ms"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + }; + }; "basic-auth-1.0.4" = { name = "basic-auth"; packageName = "basic-auth"; @@ -1120,6 +1138,15 @@ let sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; }; }; + "depd-1.1.0" = { + name = "depd"; + packageName = "depd"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; + sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; + }; + }; "etag-1.7.0" = { name = "etag"; packageName = "etag"; @@ -1255,6 +1282,15 @@ let sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; }; }; + "debug-2.6.0" = { + name = "debug"; + packageName = "debug"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; + sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; + }; + }; "mime-1.2.11" = { name = "mime"; packageName = "mime"; @@ -1399,13 +1435,13 @@ let sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; }; }; - "object-assign-4.1.0" = { + "object-assign-4.1.1" = { name = "object-assign"; packageName = "object-assign"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; - sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; "read-pkg-up-1.0.1" = { @@ -1453,22 +1489,22 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "signal-exit-3.0.1" = { + "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; - sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; - "array-find-index-1.0.1" = { + "array-find-index-1.0.2" = { name = "array-find-index"; packageName = "array-find-index"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz"; - sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af"; + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; "hosted-git-info-2.1.5" = { @@ -1525,13 +1561,13 @@ let sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; }; }; - "spdx-expression-parse-1.0.3" = { + "spdx-expression-parse-1.0.4" = { name = "spdx-expression-parse"; packageName = "spdx-expression-parse"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.3.tgz"; - sha1 = "ca3c3828c4fea8aa44997884b398fc5d67436442"; + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; + sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; }; }; "spdx-license-ids-1.2.2" = { @@ -1606,13 +1642,13 @@ let sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "graceful-fs-4.1.6" = { + "graceful-fs-4.1.11" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.6"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz"; - sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; "parse-json-2.2.0" = { @@ -1696,22 +1732,22 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; - "is-finite-1.0.1" = { + "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; - sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; }; }; - "number-is-nan-1.0.0" = { + "number-is-nan-1.0.1" = { name = "number-is-nan"; packageName = "number-is-nan"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; - sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; "underscore-1.5.2" = { @@ -1786,6 +1822,15 @@ let sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607"; }; }; + "iconv-lite-0.4.15" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; + sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; + }; + }; "connect-1.9.2" = { name = "connect"; packageName = "connect"; @@ -1840,40 +1885,13 @@ let sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; - "crc-3.4.0" = { + "crc-3.4.1" = { name = "crc"; packageName = "crc"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz"; - sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f"; - }; - }; - "depd-1.1.0" = { - name = "depd"; - packageName = "depd"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; - sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; - }; - }; - "uid-safe-2.1.2" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.2.tgz"; - sha1 = "c934b3caead0fdcd0fb2cff3a8876d06fe0ee0fd"; - }; - }; - "base64-url-1.3.2" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.2.tgz"; - sha1 = "4b08113b49d23889f306be64372762d31412f7a8"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz"; + sha1 = "65d5830b1a2569557cfb324c0e679998521473ee"; }; }; "array-parallel-0.1.3" = { @@ -1894,31 +1912,31 @@ let sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; }; }; - "cross-spawn-4.0.0" = { + "cross-spawn-4.0.2" = { name = "cross-spawn"; packageName = "cross-spawn"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.0.tgz"; - sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; }; }; - "lru-cache-4.0.1" = { + "lru-cache-4.0.2" = { name = "lru-cache"; packageName = "lru-cache"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz"; - sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"; + sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; }; }; - "which-1.2.11" = { + "which-1.2.12" = { name = "which"; packageName = "which"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; - sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; + url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz"; + sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; }; }; "pseudomap-1.0.2" = { @@ -2002,13 +2020,13 @@ let sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b"; }; }; - "hpkp-1.1.0" = { + "hpkp-1.2.0" = { name = "hpkp"; packageName = "hpkp"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hpkp/-/hpkp-1.1.0.tgz"; - sha1 = "77bdff1f331847fb9f40839d00a45032baed4df4"; + url = "https://registry.npmjs.org/hpkp/-/hpkp-1.2.0.tgz"; + sha1 = "83f2cb38b26cff21daf26e2ff4b57126921dec65"; }; }; "hsts-1.0.0" = { @@ -2164,13 +2182,13 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; - "nwmatcher-1.3.8" = { + "nwmatcher-1.3.9" = { name = "nwmatcher"; packageName = "nwmatcher"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.8.tgz"; - sha1 = "34edb93de1aa6cb4448b573c9f2a059300241157"; + url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz"; + sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a"; }; }; "parse5-1.5.1" = { @@ -2182,13 +2200,13 @@ let sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"; }; }; - "request-2.74.0" = { + "request-2.79.0" = { name = "request"; packageName = "request"; - version = "2.74.0"; + version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; - sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; + url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; "sax-1.2.1" = { @@ -2200,22 +2218,22 @@ let sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; }; }; - "symbol-tree-3.1.4" = { + "symbol-tree-3.2.1" = { name = "symbol-tree"; packageName = "symbol-tree"; - version = "3.1.4"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.1.4.tgz"; - sha1 = "02b279348d337debc39694c5c95f882d448a312a"; + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.1.tgz"; + sha1 = "8549dd1d01fa9f893c18cc9ab0b106b4d9b168cb"; }; }; - "tough-cookie-2.3.1" = { + "tough-cookie-2.3.2" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; - sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"; + sha1 = "f081f76e4c85720e6c37a5faced737150d84072a"; }; }; "webidl-conversions-2.0.1" = { @@ -2272,13 +2290,13 @@ let sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; }; }; - "optionator-0.8.1" = { + "optionator-0.8.2" = { name = "optionator"; packageName = "optionator"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz"; - sha1 = "e31b4932cdd5fb862a8b0d10bc63d3ee1ec7d78b"; + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; }; }; "source-map-0.2.0" = { @@ -2335,22 +2353,22 @@ let sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; }; }; - "fast-levenshtein-1.1.4" = { + "fast-levenshtein-2.0.6" = { name = "fast-levenshtein"; packageName = "fast-levenshtein"; - version = "1.1.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"; - sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"; + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "amdefine-1.0.0" = { + "amdefine-1.0.1" = { name = "amdefine"; packageName = "amdefine"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"; - sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33"; + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; "aws-sign2-0.6.0" = { @@ -2362,22 +2380,13 @@ let sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "aws4-1.4.1" = { + "aws4-1.5.0" = { name = "aws4"; packageName = "aws4"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"; - sha1 = "fde7d5292466d230e5ee0f4e038d9dfaab08fc61"; - }; - }; - "bl-1.1.2" = { - name = "bl"; - packageName = "bl"; - version = "1.1.2"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; - sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; + sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; }; }; "caseless-0.11.0" = { @@ -2416,13 +2425,13 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "form-data-1.0.1" = { + "form-data-2.1.2" = { name = "form-data"; packageName = "form-data"; - version = "1.0.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; - sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; + sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; }; "har-validator-2.0.6" = { @@ -2488,13 +2497,13 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.2.1" = { + "qs-6.3.0" = { name = "qs"; packageName = "qs"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; - sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; + url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"; + sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; }; }; "stringstream-0.0.5" = { @@ -2515,40 +2524,13 @@ let sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "readable-stream-2.0.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; + "uuid-3.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; + sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; }; }; "delayed-stream-1.0.0" = { @@ -2560,22 +2542,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.0.1" = { - name = "async"; - packageName = "async"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz"; - sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; - }; - }; - "lodash-4.15.0" = { - name = "lodash"; - packageName = "lodash"; - version = "4.15.0"; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz"; - sha1 = "3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9"; + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; "chalk-1.1.3" = { @@ -2596,13 +2569,13 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "is-my-json-valid-2.13.1" = { + "is-my-json-valid-2.15.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.13.1"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; - sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"; + sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b"; }; }; "ansi-styles-2.2.1" = { @@ -2650,13 +2623,13 @@ let sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; }; }; - "ansi-regex-2.0.0" = { + "ansi-regex-2.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; - sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; "graceful-readlink-1.0.1" = { @@ -2686,13 +2659,13 @@ let sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; }; }; - "jsonpointer-2.0.0" = { + "jsonpointer-4.0.1" = { name = "jsonpointer"; packageName = "jsonpointer"; - version = "2.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"; - sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9"; + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; + sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; }; }; "xtend-4.0.1" = { @@ -2767,13 +2740,13 @@ let sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; }; }; - "sshpk-1.10.0" = { + "sshpk-1.10.2" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.0"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.0.tgz"; - sha1 = "104d6ba2afb2ac099ab9567c0d193977f29c6dfa"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"; + sha1 = "d5a804ce22695515638e798dbe23273de070a5fa"; }; }; "extsprintf-1.0.2" = { @@ -2821,13 +2794,13 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "dashdash-1.14.0" = { + "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"; - sha1 = "29e486c5418bf0f356034a993d51686a33e84141"; + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; "getpass-0.1.6" = { @@ -2848,13 +2821,13 @@ let sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; }; }; - "tweetnacl-0.13.3" = { + "tweetnacl-0.14.5" = { name = "tweetnacl"; packageName = "tweetnacl"; - version = "0.13.3"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"; - sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56"; + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; "jodid25519-1.0.2" = { @@ -2884,13 +2857,13 @@ let sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; }; }; - "tweetnacl-0.14.3" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.3"; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; - sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; "tr46-0.0.3" = { @@ -2929,13 +2902,13 @@ let sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; }; }; - "glob-7.0.6" = { + "glob-7.1.1" = { name = "glob"; packageName = "glob"; - version = "7.0.6"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; - sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; + sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; }; }; "fs.realpath-1.0.0" = { @@ -2947,13 +2920,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "htmlparser2-3.9.1" = { + "htmlparser2-3.9.2" = { name = "htmlparser2"; packageName = "htmlparser2"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.1.tgz"; - sha1 = "621b7a58bc9acd003f7af0a2c9a00aa67c8505d2"; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz"; + sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"; }; }; "regexp-quote-0.0.0" = { @@ -3001,13 +2974,13 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "readable-stream-2.1.5" = { + "readable-stream-2.2.2" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.1.5"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; - sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; + sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; }; }; "dom-serializer-0.1.0" = { @@ -3037,6 +3010,33 @@ let sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; }; }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -3073,13 +3073,22 @@ let sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; }; }; - "yargs-3.32.0" = { + "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; - version = "3.32.0"; + version = "6.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; - sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; }; }; "cliui-3.2.0" = { @@ -3091,6 +3100,15 @@ let sha1 = "120601537a916d29940f934da3b48d585a39213d"; }; }; + "get-caller-file-1.0.2" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; + sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; + }; + }; "os-locale-1.4.0" = { name = "os-locale"; packageName = "os-locale"; @@ -3100,6 +3118,33 @@ let sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; }; }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; @@ -3109,13 +3154,13 @@ let sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; }; }; - "window-size-0.1.4" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.4"; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; - sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; }; }; "y18n-3.2.1" = { @@ -3127,13 +3172,22 @@ let sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; }; }; - "wrap-ansi-2.0.0" = { + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + }; + }; + "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz"; - sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f"; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; }; }; "lcid-1.0.0" = { @@ -3154,13 +3208,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "code-point-at-1.0.0" = { + "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"; - sha1 = "f69b192d3f7d91e382e4b71bddb77878619ab0c6"; + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -3181,13 +3235,13 @@ let sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; }; }; - "uuid-2.0.2" = { + "uuid-2.0.3" = { name = "uuid"; packageName = "uuid"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz"; - sha1 = "48bd5698f0677e3c7901a1c46ef15b1643794726"; + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; "websocket-driver-0.6.5" = { @@ -3226,13 +3280,13 @@ let sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; }; }; - "mongodb-2.2.10" = { + "mongodb-2.2.21" = { name = "mongodb"; packageName = "mongodb"; - version = "2.2.10"; + version = "2.2.21"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.10.tgz"; - sha1 = "d11273a5a53b08e17bcc4c8a295ded0f151ccae6"; + url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.21.tgz"; + sha1 = "f7ee56489600e0ac8024c062c0857ac04ddb5f48"; }; }; "es6-promise-3.2.1" = { @@ -3244,22 +3298,31 @@ let sha1 = "ec56233868032909207170c39448e24449dd1fc4"; }; }; - "mongodb-core-2.0.12" = { + "mongodb-core-2.1.6" = { name = "mongodb-core"; packageName = "mongodb-core"; - version = "2.0.12"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.12.tgz"; - sha1 = "bb66aad550e252731f8ad49276815264a91c337c"; + url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.6.tgz"; + sha1 = "9d179e7487767c58993bb7c8d6685d035c346a42"; }; }; - "bson-0.5.5" = { + "readable-stream-2.1.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + }; + "bson-1.0.4" = { name = "bson"; packageName = "bson"; - version = "0.5.5"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-0.5.5.tgz"; - sha1 = "1d6725d400f0fbf0271bf6bafc8fa1126c29983b"; + url = "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz"; + sha1 = "93c10d39eaa5b58415cbc4052f3e53e562b0b72c"; }; }; "require_optional-1.0.0" = { @@ -3392,11 +3455,11 @@ let sources."nan-2.3.5" ]; }) - (sources."bunyan-1.8.1" // { + (sources."bunyan-1.8.5" // { dependencies = [ - (sources."dtrace-provider-0.6.0" // { + (sources."dtrace-provider-0.8.0" // { dependencies = [ - sources."nan-2.4.0" + sources."nan-2.5.0" ]; }) (sources."mv-2.1.1" // { @@ -3406,7 +3469,7 @@ let dependencies = [ (sources."glob-6.0.4" // { dependencies = [ - (sources."inflight-1.0.5" // { + (sources."inflight-1.0.6" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -3427,7 +3490,7 @@ let sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -3435,7 +3498,7 @@ let ]; }) sources."safe-json-stringify-1.0.3" - sources."moment-2.15.0" + sources."moment-2.17.1" ]; }) (sources."connect-2.30.2" // { @@ -3466,17 +3529,17 @@ let dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.5.3" ]; }) - (sources."compressible-2.0.8" // { + (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) sources."vary-1.0.1" @@ -3490,12 +3553,12 @@ let sources."content-type-1.0.2" (sources."csurf-1.8.3" // { dependencies = [ - (sources."csrf-3.0.3" // { + (sources."csrf-3.0.4" // { dependencies = [ - sources."base64-url-1.2.2" + sources."base64-url-1.3.3" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - (sources."uid-safe-2.1.1" // { + (sources."uid-safe-2.1.3" // { dependencies = [ sources."random-bytes-1.0.0" ]; @@ -3514,9 +3577,9 @@ let dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) sources."negotiator-0.6.1" @@ -3550,11 +3613,16 @@ let (sources."http-errors-1.3.1" // { dependencies = [ sources."inherits-2.0.3" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) - (sources."method-override-2.3.6" // { + (sources."method-override-2.3.7" // { dependencies = [ + (sources."debug-2.3.3" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."methods-1.1.2" sources."vary-1.1.0" ]; @@ -3586,11 +3654,15 @@ let sources."parseurl-1.3.1" sources."pause-0.1.0" sources."qs-4.0.0" - sources."response-time-2.3.1" - (sources."serve-favicon-2.3.0" // { + (sources."response-time-2.3.2" // { + dependencies = [ + sources."depd-1.1.0" + ]; + }) + (sources."serve-favicon-2.3.2" // { dependencies = [ sources."etag-1.7.0" - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."serve-index-1.7.3" // { @@ -3602,9 +3674,9 @@ let }) sources."batch-0.5.3" sources."escape-html-1.0.3" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -3614,12 +3686,12 @@ let sources."escape-html-1.0.3" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) ]; @@ -3646,9 +3718,9 @@ let sources."bytes-0.2.0" sources."fresh-0.1.0" sources."pause-0.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.6.0" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) ]; @@ -3690,10 +3762,10 @@ let dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.1" + sources."signal-exit-3.0.2" ]; }) sources."map-obj-1.0.1" @@ -3714,12 +3786,12 @@ let sources."spdx-license-ids-1.2.2" ]; }) - sources."spdx-expression-parse-1.0.3" + sources."spdx-expression-parse-1.0.4" ]; }) ]; }) - sources."object-assign-4.1.0" + sources."object-assign-4.1.1" (sources."read-pkg-up-1.0.1" // { dependencies = [ (sources."find-up-1.1.2" // { @@ -3736,7 +3808,7 @@ let dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.11" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -3761,7 +3833,7 @@ let }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.11" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -3780,9 +3852,9 @@ let dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -3802,7 +3874,7 @@ let sources."underscore-1.5.2" ]; }) - sources."dompurify-0.8.3" + sources."dompurify-0.8.4" (sources."emailjs-1.0.8" // { dependencies = [ sources."addressparser-0.3.2" @@ -3810,7 +3882,7 @@ let dependencies = [ (sources."encoding-0.1.12" // { dependencies = [ - sources."iconv-lite-0.4.13" + sources."iconv-lite-0.4.15" ]; }) sources."addressparser-0.2.1" @@ -3833,11 +3905,11 @@ let sources."mkdirp-0.3.0" ]; }) - (sources."express-session-1.14.1" // { + (sources."express-session-1.14.2" // { dependencies = [ sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."crc-3.4.0" + sources."crc-3.4.1" (sources."debug-2.2.0" // { dependencies = [ sources."ms-0.7.1" @@ -3846,9 +3918,9 @@ let sources."depd-1.1.0" sources."on-headers-1.0.1" sources."parseurl-1.3.1" - (sources."uid-safe-2.1.2" // { + (sources."uid-safe-2.1.3" // { dependencies = [ - sources."base64-url-1.3.2" + sources."base64-url-1.3.3" sources."random-bytes-1.0.0" ]; }) @@ -3859,15 +3931,15 @@ let dependencies = [ sources."array-parallel-0.1.3" sources."array-series-0.1.5" - (sources."cross-spawn-4.0.0" // { + (sources."cross-spawn-4.0.2" // { dependencies = [ - (sources."lru-cache-4.0.1" // { + (sources."lru-cache-4.0.2" // { dependencies = [ sources."pseudomap-1.0.2" sources."yallist-2.0.0" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -3881,7 +3953,7 @@ let }) ]; }) - (sources."helmet-2.2.0" // { + (sources."helmet-2.3.0" // { dependencies = [ (sources."connect-3.4.1" // { dependencies = [ @@ -3921,7 +3993,7 @@ let ]; }) sources."hide-powered-by-1.0.0" - sources."hpkp-1.1.0" + sources."hpkp-1.2.0" (sources."hsts-1.0.0" // { dependencies = [ sources."core-util-is-1.0.2" @@ -3950,43 +4022,29 @@ let sources."estraverse-1.9.3" sources."esutils-2.0.2" sources."esprima-2.7.3" - (sources."optionator-0.8.1" // { + (sources."optionator-0.8.2" // { dependencies = [ sources."prelude-ls-1.1.2" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" sources."type-check-0.3.2" sources."levn-0.3.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.6" ]; }) (sources."source-map-0.2.0" // { dependencies = [ - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" ]; }) ]; }) - sources."nwmatcher-1.3.8" + sources."nwmatcher-1.3.9" sources."parse5-1.5.1" - (sources."request-2.74.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.4.1" - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."aws4-1.5.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -3995,13 +4053,9 @@ let }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.1.2" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -4012,12 +4066,12 @@ let sources."escape-string-regexp-1.0.5" (sources."has-ansi-2.0.0" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."supports-color-2.0.0" @@ -4028,7 +4082,7 @@ let sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.15.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -4036,7 +4090,7 @@ let sources."is-property-1.0.2" ]; }) - sources."jsonpointer-2.0.0" + sources."jsonpointer-4.0.1" sources."xtend-4.0.1" ]; }) @@ -4065,21 +4119,17 @@ let sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.2" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" + sources."dashdash-1.14.1" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -4087,20 +4137,25 @@ let sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.14" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.26.0" ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.1" ]; }) sources."sax-1.2.1" - sources."symbol-tree-3.1.4" - sources."tough-cookie-2.3.1" + sources."symbol-tree-3.2.1" + (sources."tough-cookie-2.3.2" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."webidl-conversions-2.0.1" (sources."whatwg-url-compat-0.6.5" // { dependencies = [ @@ -4125,10 +4180,10 @@ let }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.1" // { dependencies = [ sources."fs.realpath-1.0.0" - (sources."inflight-1.0.5" // { + (sources."inflight-1.0.6" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -4149,14 +4204,14 @@ let sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; }) - (sources."sanitize-html-1.13.0" // { + (sources."sanitize-html-1.14.1" // { dependencies = [ - (sources."htmlparser2-3.9.1" // { + (sources."htmlparser2-3.9.2" // { dependencies = [ sources."domelementtype-1.3.0" sources."domhandler-2.3.0" @@ -4171,7 +4226,7 @@ let }) sources."entities-1.1.1" sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -4212,22 +4267,23 @@ let sources."statuses-1.2.1" ]; }) - (sources."showdown-1.4.3" // { + (sources."showdown-1.6.0" // { dependencies = [ - (sources."yargs-3.32.0" // { + (sources."yargs-6.6.0" // { dependencies = [ - sources."camelcase-2.1.1" + sources."camelcase-3.0.0" (sources."cliui-3.2.0" // { dependencies = [ (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) - sources."wrap-ansi-2.0.0" + sources."wrap-ansi-2.1.0" ]; }) sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" (sources."os-locale-1.4.0" // { dependencies = [ (sources."lcid-1.0.0" // { @@ -4237,32 +4293,107 @@ let }) ]; }) - (sources."string-width-1.0.2" // { + (sources."read-pkg-up-1.0.1" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."find-up-1.1.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) ]; }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.1.5" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + sources."semver-5.3.0" + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.4" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."strip-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-2.0.0" + sources."ansi-regex-2.1.1" ]; }) ]; }) - sources."window-size-0.1.4" + sources."which-module-1.0.0" sources."y18n-3.2.1" + sources."yargs-parser-4.2.1" ]; }) ]; }) - (sources."sockjs-0.3.17" // { + (sources."sockjs-0.3.18" // { dependencies = [ (sources."faye-websocket-0.10.0" // { dependencies = [ @@ -4273,11 +4404,11 @@ let }) ]; }) - sources."uuid-2.0.2" + sources."uuid-2.0.3" ]; }) sources."step-0.0.6" - sources."ua-parser-js-0.7.10" + sources."ua-parser-js-0.7.12" sources."underscore-1.8.3" (sources."underscore-contrib-0.3.0" // { dependencies = [ @@ -4297,17 +4428,17 @@ let }) (sources."databank-mongodb-0.19.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.6.0" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) - (sources."mongodb-2.2.10" // { + (sources."mongodb-2.2.21" // { dependencies = [ sources."es6-promise-3.2.1" - (sources."mongodb-core-2.0.12" // { + (sources."mongodb-core-2.1.6" // { dependencies = [ - sources."bson-0.5.5" + sources."bson-1.0.4" (sources."require_optional-1.0.0" // { dependencies = [ sources."semver-5.3.0" diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 4eed952f8042..4efb1ca9de6e 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.1.4"; + version = "2.1.6"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://framabag.org/wallabag-release-${version}.tar.gz"; - sha256 = "0s4p9jls7jqq9jbcac21ibz9k5yxx0ifv2yhxlkia5kw9md20r7b"; + sha256 = "0znywkrjlmxhacfkdyba2cjhgmrh509mayrfsrnc0rx3haxam7fx"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 07243682283f..d5a3bea67a61 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -602,17 +602,6 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; - intelgputools = (mkDerivation "intelgputools" { - name = "intel-gpu-tools-1.15"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/app/intel-gpu-tools-1.15.tar.bz2; - sha256 = "1gb22hvj4gdjj92iqbwcp44kf2znk2l1fvbcrr4sm4i65l8mdwnw"; - }; - buildInputs = [pkgconfig dri2proto libdrm udev libpciaccess python libX11 libXext libXrandr libXv ]; - meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto libdrm udev libpciaccess python libX11 libXext libXrandr libXv ;}; - kbproto = (mkDerivation "kbproto" { name = "kbproto-1.0.7"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 3129e090e6b6..56a7b1f76a98 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -9,4 +9,3 @@ http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 mirror://xorg/individual/app/appres-1.0.4.tar.bz2 -mirror://xorg/individual/app/intel-gpu-tools-1.15.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8d6817441315..889dd58c01bc 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -57,10 +57,6 @@ in tradcpp = if stdenv.isDarwin then args.tradcpp else null; }; - intelgputools = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ args.cairo args.libunwind ]; - }; - mkfontdir = attrs: attrs // { preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin"; }; @@ -456,15 +452,14 @@ in "--with-default-font-path=" # there were only paths containing "${prefix}", # and there are no fonts in this package anyway "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" + "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" + "--with-xkb-output=$out/share/X11/xkb/compiled" "--enable-glamor" ]; postInstall = '' rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it - wrapProgram $out/bin/Xephyr \ - --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" wrapProgram $out/bin/Xvfb \ - --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri \ - --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" + --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others cd "$dev" for f in include/xorg/*.h; do @@ -592,4 +587,9 @@ in preBuild = "sed -i 's|gcc -E|gcc -E -P|' man/Makefile"; }; + xrandr = attrs: attrs // { + postInstall = '' + rm $out/bin/xkeystone + ''; + }; } diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 2fc012dc6c9d..0357c8c17f1d 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby -, openssl, quartz-wm, fontconfig, xkeyboard_config, xlsfonts, xfontsel +, openssl, quartz-wm, fontconfig, xlsfonts, xfontsel , ttf_bitstream_vera, freefont_ttf, liberation_ttf_binary , shell ? "${bashInteractive}/bin/bash" }: @@ -126,7 +126,6 @@ in stdenv.mkDerivation { --replace "@DEFAULT_CLIENT@" "${xterm}/bin/xterm" \ --replace "@XINIT@" "$out/bin/xinit" \ --replace "@XINITRC@" "$out/etc/X11/xinit/xinitrc" \ - --replace "@XKEYBOARD_CONFIG@" "${xkeyboard_config}/etc/X11/xkb" \ --replace "@FONTCONFIG_FILE@" "$fontsConfPath" wrapProgram $out/bin/Xquartz \ diff --git a/pkgs/servers/x11/xquartz/startx b/pkgs/servers/x11/xquartz/startx index 131fbc43b8b6..e908e1042d78 100755 --- a/pkgs/servers/x11/xquartz/startx +++ b/pkgs/servers/x11/xquartz/startx @@ -217,7 +217,7 @@ EOF done fi -eval @XINIT@ \"$client\" $clientargs -- \"$server\" $display $serverargs "-xkbdir" "@XKEYBOARD_CONFIG@" +eval @XINIT@ \"$client\" $clientargs -- \"$server\" $display $serverargs retval=$? if [ x"$enable_xauth" = x1 ] ; then |