diff options
Diffstat (limited to 'pkgs/tools')
47 files changed, 825 insertions, 607 deletions
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 23b406c2d43f..6f1335593621 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -28,18 +28,17 @@ stdenv.mkDerivation rec { postInstall = stdenv.lib.optionalString mimiSupport '' cp ${mimisrc}/xdg-open $out/bin/xdg-open - substituteInPlace $out/bin/xdg-open --replace "awk " "${gawk}/bin/awk " - substituteInPlace $out/bin/xdg-open --replace "sort " "${coreutils}/bin/sort " - substituteInPlace $out/bin/xdg-open --replace "(file " "(${file}/bin/file " - '' + '' - for item in $out/bin/*; do - substituteInPlace $item --replace "cut " "${coreutils}/bin/cut " - substituteInPlace $item --replace "sed " "${gnused}/bin/sed " - substituteInPlace $item --replace "egrep " "${gnugrep}/bin/egrep " - sed -i $item -re "s#([^e])grep #\1${gnugrep}/bin/grep #g" # Don't replace 'egrep' - substituteInPlace $item --replace "which " "type -P " - substituteInPlace $item --replace "/usr/bin/file" "${file}/bin/file" + '' + + '' + for tool in "${coreutils}/bin/cut" "${gnused}/bin/sed" \ + "${gnugrep}"/bin/{e,}grep "${file}/bin/file" \ + ${stdenv.lib.optionalString mimiSupport + '' "${gawk}/bin/awk" "${coreutils}/bin/sort" ''} ; + do + sed "s# $(basename "$tool") # $tool #g" -i "$out"/bin/* done + + sed 's# which # type -P #g' -i "$out"/bin/* ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index e0e12051bffd..b0c79342d42a 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -6,12 +6,11 @@ , libfakeXinerama }: buildPythonApplication rec { - name = "xpra-0.15.3"; + name = "xpra-0.16.2"; namePrefix = ""; - src = fetchurl { - url = "https://www.xpra.org/src/${name}.tar.xz"; - sha256 = "1671r4ah2h0i3qbp27csck506n5y1zr9fv0869cv09knspa358i4"; + url = "http://xpra.org/src/${name}.tar.xz"; + sha256 = "0h55rv46byzv2g8g77bm0a0py8jpz3gbr5fhr5jy9sisyr0vk6ff"; }; buildInputs = [ @@ -36,7 +35,7 @@ buildPythonApplication rec { preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" ''; - setupPyBuildFlags = ["--with-Xdummy"]; + setupPyBuildFlags = ["--with-Xdummy" "--without-strict"]; preInstall = '' # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix @@ -52,6 +51,8 @@ buildPythonApplication rec { --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin ''; + preCheck = "exit 0"; + #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though #postFixup = '' # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 5b81ec0a7edc..7fd24a510d5d 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -6,14 +6,19 @@ , libfakeXinerama }: buildPythonApplication rec { - name = "xpra-0.14.19"; + name = "xpra-0.16.2"; namePrefix = ""; src = fetchurl { - url = "https://www.xpra.org/src/${name}.tar.xz"; - sha256 = "0jifaysz4br1v0zibnzgd0k02rgybbsysvwrgbar1452sjb3db5m"; + url = "http://xpra.org/src/${name}.tar.xz"; + sha256 = "0h55rv46byzv2g8g77bm0a0py8jpz3gbr5fhr5jy9sisyr0vk6ff"; }; + patchPhase = '' + substituteInPlace setup.py --replace 'pycairo' 'py3cairo' + substituteInPlace xpra/client/gtk3/cairo_workaround.pyx --replace 'pycairo/pycairo.h' 'py3cairo.h' + ''; + buildInputs = [ pkgconfig @@ -36,8 +41,7 @@ buildPythonApplication rec { preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)" ''; - setupPyBuildFlags = [ "--with-gtk3" "--without-gtk2" "--with-Xdummy" ]; - + setupPyBuildFlags = [ "--without-strict" "--with-gtk3" "--without-gtk2" "--with-Xdummy" ]; preInstall = '' # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix @@ -53,6 +57,9 @@ buildPythonApplication rec { --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin ''; + preCheck = "exit 0"; + doInstallCheck = false; + #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though #postFixup = '' # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index d27c0a2da816..78ae1953ad71 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "simp_le-2016-01-09"; + name = "simp_le-2016-02-06"; src = fetchFromGitHub { owner = "kuba"; repo = "simp_le"; - rev = "b9d95e862536d1242e1ca6d7dac5691f32f11373"; - sha256 = "0l4qs0y4cbih76zrpbkn77xj17iwsm5fi83zc3p048x4hj163805"; + rev = "8f258bc098a84b7a20c2732536d0740244d814f7"; + sha256 = "1r2c31bhj91n3cjyf01spx52vkqxi5475zzkc9s1aliy3fs3lc4r"; }; propagatedBuildInputs = with pythonPackages; [ acme_0_1 ]; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index cbfced7aa6b2..768c7afd7eb7 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0qw77gvr57azjbn76cjlm4sv1hf2hh90g7n7n33gfvlpnbs7mf3p"; }; + postPatch = '' + sed 's/^CXX=g++/#CXX/' -i makefile + ''; + buildPhase = '' make unrar make clean diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index eeebea5d7475..318bb2859e54 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { homepage = http://liquidsoap.fm/; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index b34c62514058..5a7c35e460fe 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex -, readline ? null, openssl ? null, python ? null, ncurses ? null +, readline ? null, openssl ? null, python ? null, ncurses ? null, rocksdb , sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ nettools gettext readline openssl python flex ncurses sqlite postgresql - libmysql zlib lzo jansson acl glusterfs libceph libcap + libmysql zlib lzo jansson acl glusterfs libceph libcap rocksdb ]; postPatch = '' diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index f2ae4e83ad1a..95823bedad6f 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "tarsnap-${version}"; - version = "1.0.36.1"; + version = "1.0.37"; src = fetchurl { url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; - sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452"; + sha256 = "1ynv323qi6775lzjb6hvifl8ajkv2bizy43sajadjfqvcl9r96gs"; }; preConfigure = '' diff --git a/pkgs/tools/compression/brotli/unstable.nix b/pkgs/tools/compression/brotli/unstable.nix new file mode 100644 index 000000000000..59eb1e1d469a --- /dev/null +++ b/pkgs/tools/compression/brotli/unstable.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub }: + +# ?TODO: there's also python lib in there + +stdenv.mkDerivation rec { + name = "brotli-20160112"; + version = "bed93862"; + + src = fetchFromGitHub { + owner = "google"; + repo = "brotli"; + rev = "bed93862608d4d232ebe6d229f04e48399775e8b"; + sha256 = "0g94kqh984qkbqbj4fpkkyji9wnbrb9cs32r9d6niw1sqfnfkd6f"; + }; + + preConfigure = "cd tools"; + + # Debian installs "brotli" instead of "bro" but let's keep upstream choice for now. + installPhase = '' + mkdir -p "$out/bin" + mv ./bro "$out/bin/" + ''; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + + description = "A generic-purpose lossless compression algorithm and tool"; + + longDescription = + '' Brotli is a generic-purpose lossless compression algorithm that + compresses data using a combination of a modern variant of the LZ77 + algorithm, Huffman coding and 2nd order context modeling, with a + compression ratio comparable to the best currently available + general-purpose compression methods. It is similar in speed with + deflate but offers more dense compression. + + The specification of the Brotli Compressed Data Format is defined + in the following internet draft: + http://www.ietf.org/id/draft-alakuijala-brotli + ''; + + license = licenses.mit; + maintainers = []; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index 2ce126d7169f..3ed145c82f2d 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -3,11 +3,12 @@ stdenv.mkDerivation rec { name = "pyblock-${version}"; version = "0.53"; + md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = fetchurl rec { url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" - + "${name}.tar.bz2/${md5}/${name}.tar.bz2"; - md5 = "f6d33a8362dee358517d0a9e2ebdd044"; + + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; + sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; postPatch = '' diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 86479126d393..f13ad14aded8 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -3,11 +3,12 @@ buildPythonApplication rec { name = "pykickstart-${version}"; version = "1.99.39"; + md5_path = "d249f60aa89b1b4facd63f776925116d"; src = fetchurl rec { url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" - + "${name}.tar.gz/${md5}/${name}.tar.gz"; - md5 = "d249f60aa89b1b4facd63f776925116d"; + + "${name}.tar.gz/${md5_path}/${name}.tar.gz"; + sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; }; postPatch = '' diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index fce383dcc9c4..3c7af45f81dd 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -2,7 +2,7 @@ , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText , libXdmcp, libXau, lib, openssl, zlib }: let - version = "1.8.2"; + version = "1.8.3"; in stdenv.mkDerivation rec { name = "argyllcms-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "http://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "0hnsciwak5chy4a421l8fz7amxzg8kbmy57a07dn460gdg6r63cy"; + sha256 = "00ggh47qzb3xyl8rnppwxa6j113lr38aiwvsfyxwgs51aqmvq7bd"; # The argyllcms web server doesn't like curl ... curlOpts = "--user-agent 'Mozilla/5.0'"; diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix index 34ffa1568b98..a421ca16e8ca 100644 --- a/pkgs/tools/inputmethods/anthy/default.nix +++ b/pkgs/tools/inputmethods/anthy/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation { homepace = http://sourceforge.jp/projects/anthy/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index 88ba436207c3..9d8427e533cb 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Fcitx Wrapper for anthy"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ericsagnes ]; + maintainers = with maintainers; [ ericsagnes ]; }; } diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index 8cdcabf3693a..d2e46f704c83 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "A Flexible Input Method Framework"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [iyzsong ericsagnes]; + maintainers = with stdenv.lib.maintainers; [ ericsagnes ]; }; } diff --git a/pkgs/tools/misc/colord-kde/0.5.nix b/pkgs/tools/misc/colord-kde/0.5.nix new file mode 100644 index 000000000000..9df8ace38f66 --- /dev/null +++ b/pkgs/tools/misc/colord-kde/0.5.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchgit +, extra-cmake-modules, ki18n +, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils +, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem +, kitemviews, lcms2, libXrandr, qtx11extras +}: + +stdenv.mkDerivation { + name = "colord-kde-0.5.0.20160224"; + src = fetchgit { + url = "git://anongit.kde.org/colord-kde"; + rev = "3729d1348c57902b74283bc8280ffb5561b221db"; + sha256 = "03ww8nskgxl38dwkbb39by18gxvrcm6w2zg9s7q05i76rpl6kkkw"; + }; + + nativeBuildInputs = [ extra-cmake-modules ki18n ]; + + buildInputs = [ + kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes + kcmutils kio knotifications plasma-framework kwidgetsaddons + kwindowsystem kitemviews lcms2 libXrandr qtx11extras + ]; + + meta = with lib; { + homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 606595f46057..52e1845b300f 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation { buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ]; + patches = [ ./fix_check_include_files.patch ]; + patchFlags = [ "-p0" ]; + enableParallelBuilding = true; meta = { diff --git a/pkgs/tools/misc/colord-kde/fix_check_include_files.patch b/pkgs/tools/misc/colord-kde/fix_check_include_files.patch new file mode 100644 index 000000000000..16d14a6a647a --- /dev/null +++ b/pkgs/tools/misc/colord-kde/fix_check_include_files.patch @@ -0,0 +1,9 @@ +--- CMakeLists.txt.orig 2013-05-01 05:04:34.000000000 +1000 ++++ CMakeLists.txt 2015-12-10 20:43:51.351800988 +1100 +@@ -9,6 +9,7 @@ + include(FindPkgConfig) + include(KDE4Defaults) ++include(CheckIncludeFiles) + include(ConfigureChecks.cmake) + + message(STATUS "X randr is required, found: " ${XRANDR_1_3_FOUND}) \ No newline at end of file diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 3ba5a138e5a7..7e6c3f30784e 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, fetchgit, bashCompletion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus , automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms -, libgudev }: +, libgudev, sane-backends }: stdenv.mkDerivation rec { name = "colord-1.2.12"; @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ - "--with-udevrulesdir=$out/lib/udev/rules.d" + "--enable-sane" + "--with-udevrulesdir=$(out)/lib/udev/rules.d" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--localstatedir=/var" "--disable-bash-completion" @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection - bashCompletion argyllcms automake autoconf libgudev ]; + bashCompletion argyllcms automake autoconf libgudev sane-backends ]; postInstall = '' mkdir -p $out/etc/bash_completion.d diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index 5969c9562369..f973f3d22645 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { homepage = http://www.brain-dump.org/projects/dvtm; license = stdenv.lib.licenses.mit; platfroms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index f7d8d1d4e69a..ff64b65a89b8 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation { homepage = "http://live.gnome.org/OSTree/"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 0f85a47b9e1b..9cd8c28c7f07 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -15,6 +15,5 @@ stdenv.mkDerivation rec { homepage = "http://parcellite.sourceforge.net"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index d6789bf52bc5..a411f8a2fc25 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,29 +1,32 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages, glibcLocales }: +# Packaging documentation at: +# https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst pythonPackages.buildPythonApplication rec { - version = "0.9.0"; + version = "0.9.2"; name = "vdirsyncer-${version}"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz"; - sha256 = "0s9awjr9v60rr80xcpwmdhkf4v1yqnydahjmxwvxmh64565is465"; + sha256 = "1g1107cz4sk41d2z6k6pn9n2fzd26m72j8aj33zn483vfvmyrc4q"; }; propagatedBuildInputs = with pythonPackages; [ click click-log click-threading lxml - setuptools - setuptools_scm requests_toolbelt requests2 atomicwrites ]; - # Unfortunately, checking this package seems a bit too complex - # https://github.com/NixOS/nixpkgs/pull/13098#issuecomment-185914025 - # https://github.com/untitaker/vdirsyncer/issues/334#issuecomment-185872854 - doCheck = false; + buildInputs = with pythonPackages; [hypothesis pytest pytest-localserver pytest-subtesthack setuptools_scm ] ++ [ glibcLocales ]; + + LC_ALL = "en_US.utf8"; + + checkPhase = '' + make DETERMINISTIC_TESTS=true test + ''; meta = with stdenv.lib; { homepage = https://github.com/untitaker/vdirsyncer; diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix new file mode 100644 index 000000000000..cdc2af195011 --- /dev/null +++ b/pkgs/tools/misc/xiccd/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }: + +stdenv.mkDerivation rec { + name = "xiccd-${version}"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "agalakhov"; + repo = "xiccd"; + rev = "v${version}"; + sha256 = "17p3vngmmjk52r5p8y41s19nwp7w25bgff68ffd50zdlicd33rsy"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libX11 libXrandr glib colord ]; + + meta = with stdenv.lib; { + description = "X color profile daemon"; + homepage = https://github.com/agalakhov/xiccd; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index b98570a7341b..380dd6764119 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -1,25 +1,29 @@ { stdenv, fetchurl, libsodium, pkgconfig, systemd }: +with stdenv.lib; + stdenv.mkDerivation rec { name = "dnscrypt-proxy-${version}"; version = "1.6.1"; src = fetchurl { - url = "http://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2"; + url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2"; sha256 = "16lif3qhyfjpgg54vjlwpslxk90akmbhlpnn1szxm628bmpw6nl9"; }; configureFlags = '' - ${stdenv.lib.optionalString stdenv.isLinux "--with-systemd"} + ${optionalString stdenv.isLinux "--with-systemd"} ''; - buildInputs = [ pkgconfig libsodium ] ++ stdenv.lib.optional stdenv.isLinux systemd; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libsodium ] ++ optional stdenv.isLinux systemd; meta = { description = "A tool for securing communications between a client and a DNS resolver"; - homepage = http://dnscrypt.org/; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ joachifm jgeerds ]; - platforms = stdenv.lib.platforms.all; + homepage = https://dnscrypt.org/; + license = licenses.isc; + maintainers = with maintainers; [ joachifm jgeerds ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index f443e5450482..03204d6ccf31 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchurl, libsodium, libevent, pkgconfig, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libsodium, libevent }: stdenv.mkDerivation rec { name = "dnscrypt-wrapper-${version}"; version = "0.2"; - src = fetchurl { - url = "https://github.com/Cofyc/dnscrypt-wrapper/releases/download/v0.2/dnscrypt-wrapper-v0.2.tar.bz2"; - sha256 = "0kh52dc0v9lxwi39y88z0ab6bwa5bcw8b24psnz72fv555irsvyj"; + src = fetchFromGitHub { + owner = "Cofyc"; + repo = "dnscrypt-wrapper"; + rev = "v${version}"; + sha256 = "06m6p79y0p6f1knk40fbi7dnc5hnq066kafvrq74fxrl51nywjbg"; }; - buildInputs = [ pkgconfig autoreconfHook libsodium libevent ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ libsodium libevent ]; - meta = { + meta = with stdenv.lib; { description = "A tool for adding dnscrypt support to any name resolver"; - homepage = http://dnscrypt.org/; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - platforms = stdenv.lib.platforms.linux; + homepage = https://dnscrypt.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ tstrobel joachifm ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index c76c6d0dd7f4..1f3a09e63f9c 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2015.71"; + name = "dropbear-2016.72"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "1bw3lzmisn6gs6zy9vcqbfnicl437ydskqcayklpw60fkhb18qip"; + sha256 = "10fnlaf6rm537v3rml1gnd58d42plv2q5cp7svbrysap69npc8wk"; }; dontDisableStatic = enableStatic; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 2d490b917a4e..454d3b418187 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.4.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1nkf3dplvyg2lgygd3jd4bqh5s4nm6ppyks3a05a1dcbwm8ws42y"; + sha256 = "17qf2pbxf05iw2gzyc5bc2zg3a4ns6zf1pm8q9j7nqhchh1rv4cm"; }; buildInputs = [ boost zlib openssl ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 00061b3aeff1..9c305791bda8 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildPythonApplication, sqlite3 }: buildPythonApplication rec { - version = "6.6.1"; + version = "6.7.0"; name = "offlineimap-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0nn1qkxqy84h0a2acd1yx861wslh2fjfznkcq15856npbd34yqy5"; + sha256 = "127d7zy8h2h67bvrc4x98wcfskmkxislsv9qnvpgxlc56vnsrg54"; }; doCheck = false; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 6c6c479a4fd3..11ea1de89cf4 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -2,12 +2,13 @@ , etcDir ? null , hpnSupport ? false , withKerberos ? false -, withGssapiPatches ? withKerberos +, withGssapiPatches ? false , kerberos , linkOpenssl? true }: assert withKerberos -> kerberos != null; +assert withGssapiPatches -> withKerberos; let @@ -17,18 +18,20 @@ let }; gssapiSrc = fetchpatch { - url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/7.1p2-2"; - sha256 = "05nsch879nlpyyiwm240wlq9rasy71j9d03j1rfi8kp865zhjfbm"; + url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=46961f5704f8e86cea3e99253faad55aef4d8f35"; + sha256 = "01mf2vx1gavypbdx06mcbmcrkm2smff0h3jfmr61k6h6j3xk88y5"; }; in with stdenv.lib; stdenv.mkDerivation rec { - name = "openssh-7.2p1"; + # Please ensure that openssh_with_kerberos still builds when + # bumping the version here! + name = "openssh-7.2p2"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1hsa1f3641pdj57a55gmnvcya3wwww2fc2cvb77y95rm5xxw6g4p"; + sha256 = "132lh9aanb0wkisji1d6cmsxi520m8nh7c7i9wi6m1s3l38q29x7"; }; prePatch = optionalString hpnSupport @@ -81,7 +84,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://www.openssh.org/"; + homepage = "http://www.openssh.com/"; description = "An implementation of the SSH protocol"; license = stdenv.lib.licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 10b35298461b..80bcb7ae9879 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,12 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "0.3.1"; - namePrefix = ""; + version = "0.3.4"; src = fetchurl { url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz"; - sha256 = "0ln2grbskh39ph79lhcim2axm7hp4xhzbrag8xfqbfihq7jdm6ya"; + sha256 = "19i671cd815fcv0x7h2m0a493slzwkzn7r926g8myx1srkss0q6d"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix new file mode 100644 index 000000000000..28d3f2c16336 --- /dev/null +++ b/pkgs/tools/networking/uget/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, gstreamer, + gst_plugins_base, gst_plugins_good, gnome3, makeWrapper, aria2 ? null }: + +stdenv.mkDerivation rec { + name = "uget-${version}"; + version = "2.0.5"; + + src = fetchurl { + url = "mirror://sourceforge/urlget/${name}.tar.gz"; + sha256 = "0cqz8cd8dyciam07w6ipgzj52zhf9q0zvg6ag6wz481sxkpdnfh3"; + }; + + nativeBuildInputs = [ pkgconfig intltool makeWrapper ]; + + buildInputs = [ + openssl curl libnotify gstreamer gst_plugins_base gst_plugins_good + gnome3.gtk gnome3.dconf + ] + ++ (stdenv.lib.optional (aria2 != null) aria2); + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram $out/bin/uget-gtk \ + ${stdenv.lib.optionalString (aria2 != null) ''--suffix PATH : "${aria2}/bin"''} \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" + ''; + + meta = with stdenv.lib; { + description = "Download manager using gtk+ and libcurl"; + longDescription = '' + uGet is a VERY Powerful download manager application with a large + inventory of features but is still very light-weight and low on + resources, so don't let the impressive list of features scare you into + thinking that it "might be too powerful" because remember power is good + and lightweight power is uGet! + ''; + license = licenses.lgpl21; + homepage = http://www.ugetdm.com; + maintainers = with maintainers; [ romildo ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index 9bd71467f0ea..d875413cc791 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { builder = writeScript "gnupg1compat-builder" '' # First symlink all top-level dirs ${coreutils}/bin/mkdir -p $out - ${coreutils}/bin/ln -s ${gnupg}/* $out + ${coreutils}/bin/ln -s "${gnupg}/"* $out # Replace bin with directory and symlink it contents ${coreutils}/bin/rm $out/bin ${coreutils}/bin/mkdir -p $out/bin - ${coreutils}/bin/ln -s ${gnupg}/bin/* $out/bin + ${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin # Add gpg->gpg2 and gpgv->gpgv2 symlinks ${coreutils}/bin/ln -s gpg2 $out/bin/gpg diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index 480ef5bf3e7e..e9929cb2e6fc 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { cp gpgstats $out/bin ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.is64bit) + [ "-D_FILE_OFFSET_BITS=64" "-DLARGEFILE_SOURCE=1" ]; + meta = with stdenv.lib; { description = "Calculates statistics on the keys in your gpg key-ring"; longDescription = '' diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 01495156810b..bfd1343f5e58 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lastpass-cli-${version}"; - version = "0.7.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lastpass"; repo = "lastpass-cli"; rev = "v${version}"; - sha256 = "18dn4sx173666w6aaqhwcya5x2z3q0fmhg8h76lgdmx8adrhzdzc"; + sha256 = "1iaz36bcyss2kahhlm92l7yh26rxvs12wnkkh1289yarl5wi0yld"; }; buildInputs = [ diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index 781ca6ca6005..373ebc1e6ff9 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "029g8ian72fy07k73nf451dw1yggav6crjjc2x6kv4nfpq3pl9pj"; }; - buildInputs = [ cmake libsodium ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libsodium ]; meta = with stdenv.lib; { description = "A simple tool for signing files and verifying signatures"; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index b78eb43782ed..4a8d7518e9c2 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -3,10 +3,10 @@ pythonPackages.buildPythonApplication rec { name = "sshuttle-${version}"; - version = "0.76"; + version = "0.77.2"; src = fetchurl { - sha256 = "1q0hr0vhdvv23cw5dqndsmf61283mvs6b14662ci00xj6zp5v48b"; + sha256 = "1fwlhr5r9pl3pns65nn4mxf5ivypmd2a12gv3vpyznfy5f097k10"; url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz"; }; diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix new file mode 100644 index 000000000000..f4a14155d689 --- /dev/null +++ b/pkgs/tools/system/awstats/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, perlPackages, jdk }: + +perlPackages.buildPerlPackage rec { + name = "awstats-${version}"; + version = "7.4"; + + src = fetchurl { + url = "mirror://sourceforge/awstats/${name}.tar.gz"; + sha256 = "0mdbilsl8g9a84qgyws4pakhqr3mfhs5g5dqbgsn9gn285rzxas3"; + }; + + postPatch = '' + substituteInPlace wwwroot/cgi-bin/awstats.pl \ + --replace /usr/share/awstats/ "$out/wwwroot/cgi-bin/" + ''; + + outputs = [ "out" "bin" "doc" ]; + + buildInputs = with perlPackages; [ ]; # plugins will need some + + preConfigure = '' + touch Makefile.PL + patchShebangs . + ''; + + # build our own JAR + preBuild = '' + ( + cd wwwroot/classes/src + rm ../*.jar + PATH="${jdk}/bin" "$(type -P perl)" Makefile.pl + test -f ../*.jar + ) + ''; + + doCheck = false; + + installPhase = '' + mkdir "$out" + mv wwwroot "$out/wwwroot" + rm -r "$out/wwwroot/classes/src/" + + mkdir -p "$bin/bin" + ln -s "$out/wwwroot/cgi-bin/awstats.pl" "$bin/bin/awstats" + + mkdir -p "$doc/share/" + mv README.md docs/ + mv docs "$doc/share/awstats" + ''; + + meta = with stdenv.lib; { + description = "Real-time logfile analyzer to get advanced statistics"; + homepage = http://awstats.org; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix new file mode 100644 index 000000000000..728b15bb2988 --- /dev/null +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "rowhammer-test-20150811"; + + src = fetchFromGitHub { + owner = "google"; + repo = "rowhammer-test"; + rev = "c1d2bd9f629281402c10bb10e52bc1f1faf59cc4"; # 2015-08-11 + sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; + }; + + buildPhase = "sh -e make.sh"; + + installPhase = '' + mkdir -p $out/bin + cp rowhammer_test double_sided_rowhammer $out/bin + ''; + + meta = with stdenv.lib; { + description = "Test DRAM for bit flips caused by the rowhammer problem"; + homepage = https://github.com/google/rowhammer-test; + license = licenses.asl20; + maintainers = [ maintainers.viric ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/tools/system/yeshup/default.nix new file mode 100644 index 000000000000..806d6cc5b945 --- /dev/null +++ b/pkgs/tools/system/yeshup/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "yeshup-${builtins.substring 0 7 rev}"; + rev = "5461a8f957c686ccd0240be3f0fd8124d7381b08"; + + src = fetchFromGitHub { + owner = "RhysU"; + repo = "yeshup"; + inherit rev; + sha256 = "1wwbc158y46jsmdi1lp0m3dlbr9kvzvwxfvzj6646cpy9d6h21v9"; + }; + + installPhase = '' + mkdir -p $out/bin + cp -v yeshup $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/RhysU/yeshup; + platforms = platforms.all; + license = licenses.cc-by-sa-30; # From Stackoverflow answer + maintainers = with maintainers; [ obadz ]; + }; +} diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix new file mode 100644 index 000000000000..51366c36bc61 --- /dev/null +++ b/pkgs/tools/text/diction/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "diction-1.11"; + + src = fetchurl { + url = "mirror://gnu/diction/${name}.tar.gz"; + sha256 = "1xi4l1x1vvzmzmbhpx0ghmfnwwrhabjwizrpyylmy3fzinzz3him"; + }; + + meta = { + description = "GNU style and diction utilities"; + longDescription = '' + Diction and style are two old standard Unix commands. Diction identifies + wordy and commonly misused phrases. Style analyses surface + characteristics of a document, including sentence length and other + readability measures. + ''; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix index b73654da4054..b6b647b43982 100644 --- a/pkgs/tools/text/kakasi/default.nix +++ b/pkgs/tools/text/kakasi/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { homepage = "http://kakasi.namazu.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index 6b177b8b37be..c2b845064d91 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2"; }; - buildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake ]; preConfigure = "./bootstrap"; diff --git a/pkgs/tools/typesetting/pygmentex/default.nix b/pkgs/tools/typesetting/pygmentex/default.nix new file mode 100644 index 000000000000..da029639c3d2 --- /dev/null +++ b/pkgs/tools/typesetting/pygmentex/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchzip, python2Packages }: + +python2Packages.buildPythonApplication rec { + name = "pygmentex-${version}"; + version = "0.8"; + + src = fetchzip { + url = "http://mirrors.ctan.org/macros/latex/contrib/pygmentex.zip"; + sha256 = "1nm19pvhlv51mv2sdankndhw64ys9r7ch6szzd6i4jz8zr86kn9v"; + }; + + pythonPath = [ python2Packages.pygments python2Packages.chardet ]; + + buildPhase = ":"; + + doCheck = false; + + installPhase = '' + + mkdir -p $out/bin + cp -a pygmentex.py $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://www.ctan.org/pkg/pygmentex; + description = "Auxiliary tool for typesetting code listings in LaTeX documents using Pygments"; + longDescription = '' + PygmenTeX is a Python-based LaTeX package that can be used for + typesetting code listings in a LaTeX document using Pygments. + + Pygments is a generic syntax highlighter for general use in all kinds of + software such as forum systems, wikis or other applications that need to + prettify source code. + + This package installs just the script needed to process code listings + snippets extracted from the a LaTeX document by the pygmentex LaTeX + package. In order to use it effectivelly the texlive package pygmentex + also has to be installed. This can be done by adding pygmentex to + texlive.combine. + ''; + license = licenses.lppl13c; + maintainers = with maintainers; [ romildo ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 5cd5515400de..ce5c025475a0 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -17,7 +17,9 @@ rec { assert generatePDF -> !generatePS; let - tex = pkgs.texlive.combine texPackages; + tex = pkgs.texlive.combine + # always include basic stuff you need for LaTeX + ({inherit (pkgs.texlive) scheme-basic;} // texPackages); in pkgs.stdenv.mkDerivation { diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index dbda4e117708..65bc240af001 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -1,28 +1,15 @@ -{ stdenv, fetchurl, ruby }: +{ buildRubyGem, lib, ruby_2_2 }: -stdenv.mkDerivation rec { - name = "flvtool2-1.0.6"; - - src = fetchurl { - url = "http://rubyforge.org/frs/download.php/17497/${name}.tgz"; - sha256 = "1pbsf0fvqrs6xzfkqal020bplb68dfiz6c5sfcz36k255v7c5w9a"; - }; - - buildInputs = [ ruby ]; - - configurePhase = - '' - substituteInPlace bin/flvtool2 --replace "/usr/bin/env ruby" "ruby -I$out/lib/ruby/site_ruby/1.8" - ruby setup.rb config --prefix=$out --siterubyver=$out/lib/ruby/site_ruby/1.8 - ''; - - installPhase = - '' - ruby setup.rb install - ''; +buildRubyGem rec { + ruby = ruby_2_2; + name = "${gemName}-${version}"; + gemName = "flvtool2"; + version = "1.0.6"; + sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; meta = { - homepage = http://www.inlet-media.de/flvtool2/; + homepage = https://github.com/unnu/flvtool2; description = "A tool to manipulate Macromedia Flash Video files"; + platforms = ruby.meta.platforms; }; } diff --git a/pkgs/tools/virtualization/azure-cli/node-packages.nix b/pkgs/tools/virtualization/azure-cli/node-packages.nix index 2cf7380caee7..84379ae4c4a8 100644 --- a/pkgs/tools/virtualization/azure-cli/node-packages.nix +++ b/pkgs/tools/virtualization/azure-cli/node-packages.nix @@ -14,7 +14,7 @@ }; deps = { "date-utils-1.2.18" = self.by-version."date-utils"."1.2.18"; - "jws-3.1.1" = self.by-version."jws"."3.1.1"; + "jws-3.1.3" = self.by-version."jws"."3.1.3"; "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; "request-2.69.0" = self.by-version."request"."2.69.0"; "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; @@ -41,7 +41,7 @@ }; deps = { "date-utils-1.2.18" = self.by-version."date-utils"."1.2.18"; - "jws-3.1.1" = self.by-version."jws"."3.1.1"; + "jws-3.1.3" = self.by-version."jws"."3.1.3"; "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; "request-2.69.0" = self.by-version."request"."2.69.0"; "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; @@ -94,17 +94,18 @@ cpu = [ ]; }; by-spec."ansi-styles"."^2.1.0" = - self.by-version."ansi-styles"."2.1.0"; - by-version."ansi-styles"."2.1.0" = self.buildNodePackage { - name = "ansi-styles-2.1.0"; - version = "2.1.0"; + self.by-version."ansi-styles"."2.2.0"; + by-version."ansi-styles"."2.2.0" = self.buildNodePackage { + name = "ansi-styles-2.2.0"; + version = "2.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"; - name = "ansi-styles-2.1.0.tgz"; - sha1 = "990f747146927b559a932bf92959163d60c0d0e2"; + url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz"; + name = "ansi-styles-2.2.0.tgz"; + sha1 = "c59191936e6ed1c1315a4b6b6b97f3acfbfa68b0"; }; deps = { + "color-convert-1.0.0" = self.by-version."color-convert"."1.0.0"; }; optionalDependencies = { }; @@ -190,6 +191,25 @@ }; by-spec."assert-plus"."^0.2.0" = self.by-version."assert-plus"."0.2.0"; + by-spec."assert-plus"."^1.0.0" = + self.by-version."assert-plus"."1.0.0"; + by-version."assert-plus"."1.0.0" = self.buildNodePackage { + name = "assert-plus-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + name = "assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."async"."0.1.x" = self.by-version."async"."0.1.22"; by-version."async"."0.1.22" = self.buildNodePackage { @@ -326,40 +346,18 @@ cpu = [ ]; }; by-spec."aws4"."^1.2.1" = - self.by-version."aws4"."1.2.1"; - by-version."aws4"."1.2.1" = self.buildNodePackage { - name = "aws4-1.2.1"; - version = "1.2.1"; + self.by-version."aws4"."1.3.2"; + by-version."aws4"."1.3.2" = self.buildNodePackage { + name = "aws4-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/aws4/-/aws4-1.2.1.tgz"; - name = "aws4-1.2.1.tgz"; - sha1 = "52b5659a4d32583d405f65e1124ac436d07fe5ac"; + url = "http://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz"; + name = "aws4-1.3.2.tgz"; + sha1 = "d39e0bee412ced0e8ed94a23e314f313a95b9fd1"; }; deps = { - "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-apiapp"."0.1.3" = - self.by-version."azure-arm-apiapp"."0.1.3"; - by-version."azure-arm-apiapp"."0.1.3" = self.buildNodePackage { - name = "azure-arm-apiapp-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-apiapp/-/azure-arm-apiapp-0.1.3.tgz"; - name = "azure-arm-apiapp-0.1.3.tgz"; - sha1 = "5fcc896027965655e27b63bfba7c5592db44ee91"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "moment-2.6.0" = self.by-version."moment"."2.6.0"; + "lru-cache-4.0.0" = self.by-version."lru-cache"."4.0.0"; }; optionalDependencies = { }; @@ -408,20 +406,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-arm-compute"."0.14.0" = - self.by-version."azure-arm-compute"."0.14.0"; - by-version."azure-arm-compute"."0.14.0" = self.buildNodePackage { - name = "azure-arm-compute-0.14.0"; - version = "0.14.0"; + by-spec."azure-arm-compute"."0.15.0" = + self.by-version."azure-arm-compute"."0.15.0"; + by-version."azure-arm-compute"."0.15.0" = self.buildNodePackage { + name = "azure-arm-compute-0.15.0"; + version = "0.15.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.14.0.tgz"; - name = "azure-arm-compute-0.14.0.tgz"; - sha1 = "5c2d2b981541b703335294a60718bd96a19cd285"; + url = "http://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.15.0.tgz"; + name = "azure-arm-compute-0.15.0.tgz"; + sha1 = "a057ba240bd5ee9972c8813066d925204af09e27"; }; deps = { - "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0"; - "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; }; optionalDependencies = { }; @@ -442,7 +440,7 @@ }; deps = { "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "moment-2.11.2" = self.by-version."moment"."2.11.2"; + "moment-2.12.0" = self.by-version."moment"."2.12.0"; "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; }; @@ -557,20 +555,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-arm-network"."0.12.0" = - self.by-version."azure-arm-network"."0.12.0"; - by-version."azure-arm-network"."0.12.0" = self.buildNodePackage { - name = "azure-arm-network-0.12.0"; - version = "0.12.0"; + by-spec."azure-arm-network"."0.12.1" = + self.by-version."azure-arm-network"."0.12.1"; + by-version."azure-arm-network"."0.12.1" = self.buildNodePackage { + name = "azure-arm-network-0.12.1"; + version = "0.12.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.12.0.tgz"; - name = "azure-arm-network-0.12.0.tgz"; - sha1 = "676f042f643c49d2af0071dd809789b53a70162b"; + url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.12.1.tgz"; + name = "azure-arm-network-0.12.1.tgz"; + sha1 = "57c659e9d25f35e2ac0b79a0f78f7d025ceb20b8"; }; deps = { - "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0"; - "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; }; optionalDependencies = { }; @@ -578,20 +576,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-arm-rediscache"."0.2.0" = - self.by-version."azure-arm-rediscache"."0.2.0"; - by-version."azure-arm-rediscache"."0.2.0" = self.buildNodePackage { - name = "azure-arm-rediscache-0.2.0"; - version = "0.2.0"; + by-spec."azure-arm-rediscache"."0.2.1" = + self.by-version."azure-arm-rediscache"."0.2.1"; + by-version."azure-arm-rediscache"."0.2.1" = self.buildNodePackage { + name = "azure-arm-rediscache-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.0.tgz"; - name = "azure-arm-rediscache-0.2.0.tgz"; - sha1 = "cd9a25e4a2e0e58accdba5064811ddaa62eafeef"; + url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz"; + name = "azure-arm-rediscache-0.2.1.tgz"; + sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02"; }; deps = { - "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0"; - "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; }; optionalDependencies = { }; @@ -599,20 +597,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-arm-resource"."0.10.7" = - self.by-version."azure-arm-resource"."0.10.7"; - by-version."azure-arm-resource"."0.10.7" = self.buildNodePackage { - name = "azure-arm-resource-0.10.7"; - version = "0.10.7"; + by-spec."azure-arm-resource"."1.0.0-preview" = + self.by-version."azure-arm-resource"."1.0.0-preview"; + by-version."azure-arm-resource"."1.0.0-preview" = self.buildNodePackage { + name = "azure-arm-resource-1.0.0-preview"; + version = "1.0.0-preview"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-0.10.7.tgz"; - name = "azure-arm-resource-0.10.7.tgz"; - sha1 = "f637acc4c1f1ea17fc52a31164c75f6b4f7c70be"; + url = "http://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.0.0-preview.tgz"; + name = "azure-arm-resource-1.0.0-preview.tgz"; + sha1 = "c664d4d0f3c4394680106f34359340e3c6a0cac2"; }; deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; }; optionalDependencies = { }; @@ -620,20 +618,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-arm-storage"."0.12.1-preview" = - self.by-version."azure-arm-storage"."0.12.1-preview"; - by-version."azure-arm-storage"."0.12.1-preview" = self.buildNodePackage { - name = "azure-arm-storage-0.12.1-preview"; - version = "0.12.1-preview"; + by-spec."azure-arm-storage"."0.12.2-preview" = + self.by-version."azure-arm-storage"."0.12.2-preview"; + by-version."azure-arm-storage"."0.12.2-preview" = self.buildNodePackage { + name = "azure-arm-storage-0.12.2-preview"; + version = "0.12.2-preview"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.12.1-preview.tgz"; - name = "azure-arm-storage-0.12.1-preview.tgz"; - sha1 = "e793fe390348d809763623bbdc7ab5a7d1dd0d27"; + url = "http://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.12.2-preview.tgz"; + name = "azure-arm-storage-0.12.2-preview.tgz"; + sha1 = "ecdfe608b58fe7e136f47cd2f4139ee010a724e6"; }; deps = { - "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0"; - "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; }; optionalDependencies = { }; @@ -683,16 +681,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-asm-compute"."0.11.0" = - self.by-version."azure-asm-compute"."0.11.0"; - by-version."azure-asm-compute"."0.11.0" = self.buildNodePackage { - name = "azure-asm-compute-0.11.0"; - version = "0.11.0"; + by-spec."azure-asm-compute"."0.13.0" = + self.by-version."azure-asm-compute"."0.13.0"; + by-version."azure-asm-compute"."0.13.0" = self.buildNodePackage { + name = "azure-asm-compute-0.13.0"; + version = "0.13.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.11.0.tgz"; - name = "azure-asm-compute-0.11.0.tgz"; - sha1 = "348ffae392ac0ce4aade50be99b8c89fd89701a0"; + url = "http://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.13.0.tgz"; + name = "azure-asm-compute-0.13.0.tgz"; + sha1 = "321999c92fcabb7da852a251cd97f461a0758065"; }; deps = { "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; @@ -891,45 +889,44 @@ cpu = [ ]; }; by-spec."azure-cli"."*" = - self.by-version."azure-cli"."0.9.15"; - by-version."azure-cli"."0.9.15" = self.buildNodePackage { - name = "azure-cli-0.9.15"; - version = "0.9.15"; + self.by-version."azure-cli"."0.9.17"; + by-version."azure-cli"."0.9.17" = self.buildNodePackage { + name = "azure-cli-0.9.17"; + version = "0.9.17"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/azure-cli/-/azure-cli-0.9.15.tgz"; - name = "azure-cli-0.9.15.tgz"; - sha1 = "c629199efd96c217c8b4341c5b8489c119fdbe4a"; + url = "http://registry.npmjs.org/azure-cli/-/azure-cli-0.9.17.tgz"; + name = "azure-cli-0.9.17.tgz"; + sha1 = "1f1cd28719c5fb8e201c01bf2a257a0880e743eb"; }; deps = { "adal-node-0.1.17" = self.by-version."adal-node"."0.1.17"; "async-1.4.2" = self.by-version."async"."1.4.2"; "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "azure-arm-apiapp-0.1.3" = self.by-version."azure-arm-apiapp"."0.1.3"; "azure-arm-authorization-2.0.0" = self.by-version."azure-arm-authorization"."2.0.0"; "azure-arm-commerce-0.1.1" = self.by-version."azure-arm-commerce"."0.1.1"; - "azure-arm-compute-0.14.0" = self.by-version."azure-arm-compute"."0.14.0"; + "azure-arm-compute-0.15.0" = self.by-version."azure-arm-compute"."0.15.0"; "azure-arm-hdinsight-0.1.0" = self.by-version."azure-arm-hdinsight"."0.1.0"; "azure-arm-hdinsight-jobs-0.1.0" = self.by-version."azure-arm-hdinsight-jobs"."0.1.0"; "azure-arm-insights-0.10.2" = self.by-version."azure-arm-insights"."0.10.2"; - "azure-arm-network-0.12.0" = self.by-version."azure-arm-network"."0.12.0"; + "azure-arm-network-0.12.1" = self.by-version."azure-arm-network"."0.12.1"; "azure-arm-trafficmanager-0.10.5" = self.by-version."azure-arm-trafficmanager"."0.10.5"; "azure-arm-dns-0.10.1" = self.by-version."azure-arm-dns"."0.10.1"; "azure-arm-website-0.10.0" = self.by-version."azure-arm-website"."0.10.0"; - "azure-arm-rediscache-0.2.0" = self.by-version."azure-arm-rediscache"."0.2.0"; + "azure-arm-rediscache-0.2.1" = self.by-version."azure-arm-rediscache"."0.2.1"; "azure-arm-datalake-analytics-0.1.2" = self.by-version."azure-arm-datalake-analytics"."0.1.2"; "azure-arm-datalake-store-0.1.2" = self.by-version."azure-arm-datalake-store"."0.1.2"; "azure-extra-0.2.12" = self.by-version."azure-extra"."0.2.12"; "azure-gallery-2.0.0-pre.18" = self.by-version."azure-gallery"."2.0.0-pre.18"; "azure-keyvault-0.10.1" = self.by-version."azure-keyvault"."0.10.1"; - "azure-asm-compute-0.11.0" = self.by-version."azure-asm-compute"."0.11.0"; + "azure-asm-compute-0.13.0" = self.by-version."azure-asm-compute"."0.13.0"; "azure-asm-hdinsight-0.10.2" = self.by-version."azure-asm-hdinsight"."0.10.2"; "azure-asm-trafficmanager-0.10.3" = self.by-version."azure-asm-trafficmanager"."0.10.3"; "azure-asm-mgmt-0.10.1" = self.by-version."azure-asm-mgmt"."0.10.1"; "azure-monitoring-0.10.2" = self.by-version."azure-monitoring"."0.10.2"; "azure-asm-network-0.10.2" = self.by-version."azure-asm-network"."0.10.2"; - "azure-arm-resource-0.10.7" = self.by-version."azure-arm-resource"."0.10.7"; - "azure-arm-storage-0.12.1-preview" = self.by-version."azure-arm-storage"."0.12.1-preview"; + "azure-arm-resource-1.0.0-preview" = self.by-version."azure-arm-resource"."1.0.0-preview"; + "azure-arm-storage-0.12.2-preview" = self.by-version."azure-arm-storage"."0.12.2-preview"; "azure-asm-sb-0.10.1" = self.by-version."azure-asm-sb"."0.10.1"; "azure-asm-sql-0.10.1" = self.by-version."azure-asm-sql"."0.10.1"; "azure-asm-storage-0.10.1" = self.by-version."azure-asm-storage"."0.10.1"; @@ -943,14 +940,11 @@ "event-stream-3.1.5" = self.by-version."event-stream"."3.1.5"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; "github-0.1.6" = self.by-version."github"."0.1.6"; - "image-size-0.3.5" = self.by-version."image-size"."0.3.5"; "js2xmlparser-1.0.0" = self.by-version."js2xmlparser"."1.0.0"; "jsrsasign-4.8.2" = self.by-version."jsrsasign"."4.8.2"; - "jszip-2.5.0" = self.by-version."jszip"."2.5.0"; "kuduscript-1.0.6" = self.by-version."kuduscript"."1.0.6"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; "moment-2.6.0" = self.by-version."moment"."2.6.0"; - "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; "node-forge-0.6.23" = self.by-version."node-forge"."0.6.23"; "node-uuid-1.2.0" = self.by-version."node-uuid"."1.2.0"; "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0"; @@ -961,14 +955,10 @@ "ssh-key-to-pem-0.11.0" = self.by-version."ssh-key-to-pem"."0.11.0"; "streamline-0.10.17" = self.by-version."streamline"."0.10.17"; "streamline-streams-0.1.5" = self.by-version."streamline-streams"."0.1.5"; - "swagger-schema-official-2.0.0-a33091a" = self.by-version."swagger-schema-official"."2.0.0-a33091a"; "through-2.3.4" = self.by-version."through"."2.3.4"; - "tmp-0.0.25" = self.by-version."tmp"."0.0.25"; "tunnel-0.0.2" = self.by-version."tunnel"."0.0.2"; - "tv4-1.2.7" = self.by-version."tv4"."1.2.7"; "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; "validator-3.1.0" = self.by-version."validator"."3.1.0"; - "walk-2.3.9" = self.by-version."walk"."2.3.9"; "winston-0.6.2" = self.by-version."winston"."0.6.2"; "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; "xml2js-0.1.14" = self.by-version."xml2js"."0.1.14"; @@ -980,7 +970,7 @@ os = [ ]; cpu = [ ]; }; - "azure-cli" = self.by-version."azure-cli"."0.9.15"; + "azure-cli" = self.by-version."azure-cli"."0.9.17"; by-spec."azure-common"."0.9.12" = self.by-version."azure-common"."0.9.12"; by-version."azure-common"."0.9.12" = self.buildNodePackage { @@ -1176,35 +1166,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."base64url"."~0.0.4" = - self.by-version."base64url"."0.0.6"; - by-version."base64url"."0.0.6" = self.buildNodePackage { - name = "base64url-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz"; - name = "base64url-0.0.6.tgz"; - sha1 = "9597b36b330db1c42477322ea87ea8027499b82b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."base64url"."~1.0.4" = - self.by-version."base64url"."1.0.5"; - by-version."base64url"."1.0.5" = self.buildNodePackage { - name = "base64url-1.0.5"; - version = "1.0.5"; + self.by-version."base64url"."1.0.6"; + by-version."base64url"."1.0.6" = self.buildNodePackage { + name = "base64url-1.0.6"; + version = "1.0.6"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/base64url/-/base64url-1.0.5.tgz"; - name = "base64url-1.0.5.tgz"; - sha1 = "c54bcb4f9a2b7da422bca549e71c1640b533b825"; + url = "http://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz"; + name = "base64url-1.0.6.tgz"; + sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681"; }; deps = { "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10"; @@ -1237,15 +1208,15 @@ cpu = [ ]; }; by-spec."bl"."~1.0.0" = - self.by-version."bl"."1.0.2"; - by-version."bl"."1.0.2" = self.buildNodePackage { - name = "bl-1.0.2"; - version = "1.0.2"; + self.by-version."bl"."1.0.3"; + by-version."bl"."1.0.3" = self.buildNodePackage { + name = "bl-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bl/-/bl-1.0.2.tgz"; - name = "bl-1.0.2.tgz"; - sha1 = "8c66490d825ba84d560de1f62196a29555b3a0c4"; + url = "http://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + name = "bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; }; deps = { "readable-stream-2.0.5" = self.by-version."readable-stream"."2.0.5"; @@ -1501,10 +1472,10 @@ sha1 = "509afb67066e7499f7eb3535c77445772ae2d019"; }; deps = { - "ansi-styles-2.1.0" = self.by-version."ansi-styles"."2.1.0"; - "escape-string-regexp-1.0.4" = self.by-version."escape-string-regexp"."1.0.4"; + "ansi-styles-2.2.0" = self.by-version."ansi-styles"."2.2.0"; + "escape-string-regexp-1.0.5" = self.by-version."escape-string-regexp"."1.0.5"; "has-ansi-2.0.0" = self.by-version."has-ansi"."2.0.0"; - "strip-ansi-3.0.0" = self.by-version."strip-ansi"."3.0.0"; + "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1"; "supports-color-2.0.0" = self.by-version."supports-color"."2.0.0"; }; optionalDependencies = { @@ -1515,6 +1486,25 @@ }; by-spec."chalk"."^1.1.1" = self.by-version."chalk"."1.1.1"; + by-spec."color-convert"."^1.0.0" = + self.by-version."color-convert"."1.0.0"; + by-version."color-convert"."1.0.0" = self.buildNodePackage { + name = "color-convert-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/color-convert/-/color-convert-1.0.0.tgz"; + name = "color-convert-1.0.0.tgz"; + sha1 = "3c26fcd885d272d45beacf6e41baba75c89a8579"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."colors"."0.x.x" = self.by-version."colors"."0.6.2"; by-version."colors"."0.6.2" = self.buildNodePackage { @@ -1781,18 +1771,18 @@ cpu = [ ]; }; by-spec."dashdash".">=1.10.1 <2.0.0" = - self.by-version."dashdash"."1.12.2"; - by-version."dashdash"."1.12.2" = self.buildNodePackage { - name = "dashdash-1.12.2"; - version = "1.12.2"; + self.by-version."dashdash"."1.13.0"; + by-version."dashdash"."1.13.0" = self.buildNodePackage { + name = "dashdash-1.13.0"; + version = "1.13.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/dashdash/-/dashdash-1.12.2.tgz"; - name = "dashdash-1.12.2.tgz"; - sha1 = "1c6f70588498d047b8cd5777b32ba85a5e25be36"; + url = "http://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz"; + name = "dashdash-1.13.0.tgz"; + sha1 = "a5aae6fd9d8e156624eb0dd9259eb12ba245385a"; }; deps = { - "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0"; + "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0"; }; optionalDependencies = { }; @@ -1993,15 +1983,15 @@ cpu = [ ]; }; by-spec."escape-string-regexp"."^1.0.2" = - self.by-version."escape-string-regexp"."1.0.4"; - by-version."escape-string-regexp"."1.0.4" = self.buildNodePackage { - name = "escape-string-regexp-1.0.4"; - version = "1.0.4"; + self.by-version."escape-string-regexp"."1.0.5"; + by-version."escape-string-regexp"."1.0.5" = self.buildNodePackage { + name = "escape-string-regexp-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz"; - name = "escape-string-regexp-1.0.4.tgz"; - sha1 = "b85e679b46f72d03fbbe8a3bf7259d535c21b62f"; + url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + name = "escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; deps = { }; @@ -2116,34 +2106,15 @@ by-spec."eyes"."0.x.x" = self.by-version."eyes"."0.1.8"; by-spec."fibers"."^1.0.1" = - self.by-version."fibers"."1.0.8"; - by-version."fibers"."1.0.8" = self.buildNodePackage { - name = "fibers-1.0.8"; - version = "1.0.8"; + self.by-version."fibers"."1.0.10"; + by-version."fibers"."1.0.10" = self.buildNodePackage { + name = "fibers-1.0.10"; + version = "1.0.10"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/fibers/-/fibers-1.0.8.tgz"; - name = "fibers-1.0.8.tgz"; - sha1 = "cbffda427c4e588a6f8601c2a07d134b092077f2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."foreachasync"."^3.0.0" = - self.by-version."foreachasync"."3.0.0"; - by-version."foreachasync"."3.0.0" = self.buildNodePackage { - name = "foreachasync-3.0.0"; - version = "3.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; - name = "foreachasync-3.0.0.tgz"; - sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; + url = "http://registry.npmjs.org/fibers/-/fibers-1.0.10.tgz"; + name = "fibers-1.0.10.tgz"; + sha1 = "0ccea7287e5dafd2626c2c9d3f15113a1b5829cd"; }; deps = { }; @@ -2251,7 +2222,7 @@ deps = { "async-1.5.2" = self.by-version."async"."1.5.2"; "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; - "mime-types-2.1.9" = self.by-version."mime-types"."2.1.9"; + "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10"; }; optionalDependencies = { }; @@ -2408,7 +2379,7 @@ "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2"; "chalk-1.1.1" = self.by-version."chalk"."1.1.1"; "commander-2.9.0" = self.by-version."commander"."2.9.0"; - "is-my-json-valid-2.12.4" = self.by-version."is-my-json-valid"."2.12.4"; + "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1"; }; optionalDependencies = { }; @@ -2430,7 +2401,7 @@ deps = { "chalk-1.1.1" = self.by-version."chalk"."1.1.1"; "commander-2.9.0" = self.by-version."commander"."2.9.0"; - "is-my-json-valid-2.12.4" = self.by-version."is-my-json-valid"."2.12.4"; + "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1"; "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; }; optionalDependencies = { @@ -2624,26 +2595,7 @@ deps = { "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0"; "jsprim-1.2.2" = self.by-version."jsprim"."1.2.2"; - "sshpk-1.7.3" = self.by-version."sshpk"."1.7.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."image-size"."^0.3.5" = - self.by-version."image-size"."0.3.5"; - by-version."image-size"."0.3.5" = self.buildNodePackage { - name = "image-size-0.3.5"; - version = "0.3.5"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz"; - name = "image-size-0.3.5.tgz"; - sha1 = "83240eab2fb5b00b04aab8c74b0471e9cba7ad8c"; - }; - deps = { + "sshpk-1.7.4" = self.by-version."sshpk"."1.7.4"; }; optionalDependencies = { }; @@ -2713,15 +2665,15 @@ cpu = [ ]; }; by-spec."is-my-json-valid"."^2.12.0" = - self.by-version."is-my-json-valid"."2.12.4"; - by-version."is-my-json-valid"."2.12.4" = self.buildNodePackage { - name = "is-my-json-valid-2.12.4"; - version = "2.12.4"; + self.by-version."is-my-json-valid"."2.13.1"; + by-version."is-my-json-valid"."2.13.1" = self.buildNodePackage { + name = "is-my-json-valid-2.13.1"; + version = "2.13.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz"; - name = "is-my-json-valid-2.12.4.tgz"; - sha1 = "d4ed2bc1d7f88daf8d0f763b3e3e39a69bd37880"; + url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; + name = "is-my-json-valid-2.13.1.tgz"; + sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; }; deps = { "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0"; @@ -2736,7 +2688,7 @@ cpu = [ ]; }; by-spec."is-my-json-valid"."^2.12.4" = - self.by-version."is-my-json-valid"."2.12.4"; + self.by-version."is-my-json-valid"."2.13.1"; by-spec."is-property"."^1.0.0" = self.by-version."is-property"."1.0.2"; by-version."is-property"."1.0.2" = self.buildNodePackage { @@ -2975,39 +2927,19 @@ os = [ ]; cpu = [ ]; }; - by-spec."jszip"."^2.5.0" = - self.by-version."jszip"."2.5.0"; - by-version."jszip"."2.5.0" = self.buildNodePackage { - name = "jszip-2.5.0"; - version = "2.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jszip/-/jszip-2.5.0.tgz"; - name = "jszip-2.5.0.tgz"; - sha1 = "7444fd8551ddf3e5da7198fea0c91bc8308cc274"; - }; - deps = { - "pako-0.2.8" = self.by-version."pako"."0.2.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jwa"."^1.1.0" = - self.by-version."jwa"."1.1.1"; - by-version."jwa"."1.1.1" = self.buildNodePackage { - name = "jwa-1.1.1"; - version = "1.1.1"; + by-spec."jwa"."^1.1.2" = + self.by-version."jwa"."1.1.3"; + by-version."jwa"."1.1.3" = self.buildNodePackage { + name = "jwa-1.1.3"; + version = "1.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/jwa/-/jwa-1.1.1.tgz"; - name = "jwa-1.1.1.tgz"; - sha1 = "b83c05279f0707f55ca5387b7b3f23da9f80195f"; + url = "http://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz"; + name = "jwa-1.1.3.tgz"; + sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d"; }; deps = { - "base64url-0.0.6" = self.by-version."base64url"."0.0.6"; + "base64url-1.0.6" = self.by-version."base64url"."1.0.6"; "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1"; "ecdsa-sig-formatter-1.0.5" = self.by-version."ecdsa-sig-formatter"."1.0.5"; }; @@ -3018,19 +2950,19 @@ cpu = [ ]; }; by-spec."jws"."3.x.x" = - self.by-version."jws"."3.1.1"; - by-version."jws"."3.1.1" = self.buildNodePackage { - name = "jws-3.1.1"; - version = "3.1.1"; + self.by-version."jws"."3.1.3"; + by-version."jws"."3.1.3" = self.buildNodePackage { + name = "jws-3.1.3"; + version = "3.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/jws/-/jws-3.1.1.tgz"; - name = "jws-3.1.1.tgz"; - sha1 = "34f5a424e628af4551121e860ba279f55cfa6629"; + url = "http://registry.npmjs.org/jws/-/jws-3.1.3.tgz"; + name = "jws-3.1.3.tgz"; + sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c"; }; deps = { - "base64url-1.0.5" = self.by-version."base64url"."1.0.5"; - "jwa-1.1.1" = self.by-version."jwa"."1.1.1"; + "base64url-1.0.6" = self.by-version."base64url"."1.0.6"; + "jwa-1.1.3" = self.by-version."jwa"."1.1.3"; }; optionalDependencies = { }; @@ -3078,18 +3010,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."lru-cache"."^2.6.5" = - self.by-version."lru-cache"."2.7.3"; - by-version."lru-cache"."2.7.3" = self.buildNodePackage { - name = "lru-cache-2.7.3"; - version = "2.7.3"; + by-spec."lru-cache"."^4.0.0" = + self.by-version."lru-cache"."4.0.0"; + by-version."lru-cache"."4.0.0" = self.buildNodePackage { + name = "lru-cache-4.0.0"; + version = "4.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; - name = "lru-cache-2.7.3.tgz"; - sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz"; + name = "lru-cache-4.0.0.tgz"; + sha1 = "b5cbf01556c16966febe54ceec0fb4dc90df6c28"; }; deps = { + "pseudomap-1.0.2" = self.by-version."pseudomap"."1.0.2"; + "yallist-2.0.0" = self.by-version."yallist"."2.0.0"; }; optionalDependencies = { }; @@ -3177,8 +3111,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime"."~1.2.4" = - self.by-version."mime"."1.2.11"; by-spec."mime-db"."~1.12.0" = self.by-version."mime-db"."1.12.0"; by-version."mime-db"."1.12.0" = self.buildNodePackage { @@ -3198,16 +3130,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime-db"."~1.21.0" = - self.by-version."mime-db"."1.21.0"; - by-version."mime-db"."1.21.0" = self.buildNodePackage { - name = "mime-db-1.21.0"; - version = "1.21.0"; + by-spec."mime-db"."~1.22.0" = + self.by-version."mime-db"."1.22.0"; + by-version."mime-db"."1.22.0" = self.buildNodePackage { + name = "mime-db-1.22.0"; + version = "1.22.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"; - name = "mime-db-1.21.0.tgz"; - sha1 = "9b5239e3353cf6eb015a00d890261027c36d4bac"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"; + name = "mime-db-1.22.0.tgz"; + sha1 = "ab23a6372dc9d86d3dc9121bd0ebd38105a1904a"; }; deps = { }; @@ -3218,18 +3150,18 @@ cpu = [ ]; }; by-spec."mime-types"."^2.1.3" = - self.by-version."mime-types"."2.1.9"; - by-version."mime-types"."2.1.9" = self.buildNodePackage { - name = "mime-types-2.1.9"; - version = "2.1.9"; + self.by-version."mime-types"."2.1.10"; + by-version."mime-types"."2.1.10" = self.buildNodePackage { + name = "mime-types-2.1.10"; + version = "2.1.10"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz"; - name = "mime-types-2.1.9.tgz"; - sha1 = "dfb396764b5fdf75be34b1f4104bc3687fb635f8"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz"; + name = "mime-types-2.1.10.tgz"; + sha1 = "b93c7cb4362e16d41072a7e54538fb4d43070837"; }; deps = { - "mime-db-1.21.0" = self.by-version."mime-db"."1.21.0"; + "mime-db-1.22.0" = self.by-version."mime-db"."1.22.0"; }; optionalDependencies = { }; @@ -3279,7 +3211,7 @@ by-spec."mime-types"."~2.0.3" = self.by-version."mime-types"."2.0.14"; by-spec."mime-types"."~2.1.7" = - self.by-version."mime-types"."2.1.9"; + self.by-version."mime-types"."2.1.10"; by-spec."minimist"."^1.1.0" = self.by-version."minimist"."1.2.0"; by-version."minimist"."1.2.0" = self.buildNodePackage { @@ -3319,15 +3251,15 @@ cpu = [ ]; }; by-spec."moment"."^2.6.0" = - self.by-version."moment"."2.11.2"; - by-version."moment"."2.11.2" = self.buildNodePackage { - name = "moment-2.11.2"; - version = "2.11.2"; + self.by-version."moment"."2.12.0"; + by-version."moment"."2.12.0" = self.buildNodePackage { + name = "moment-2.12.0"; + version = "2.12.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-2.11.2.tgz"; - name = "moment-2.11.2.tgz"; - sha1 = "87968e5f95ac038c2e42ac959c75819cd3f52901"; + url = "http://registry.npmjs.org/moment/-/moment-2.12.0.tgz"; + name = "moment-2.12.0.tgz"; + sha1 = "dc2560d19838d6c0731b1a6afa04675264d360d6"; }; deps = { }; @@ -3337,26 +3269,24 @@ os = [ ]; cpu = [ ]; }; - by-spec."ms-rest"."^1.8.0" = - self.by-version."ms-rest"."1.9.0"; - by-version."ms-rest"."1.9.0" = self.buildNodePackage { - name = "ms-rest-1.9.0"; - version = "1.9.0"; + by-spec."ms-rest"."^1.10.0" = + self.by-version."ms-rest"."1.10.0"; + by-version."ms-rest"."1.10.0" = self.buildNodePackage { + name = "ms-rest-1.10.0"; + version = "1.10.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ms-rest/-/ms-rest-1.9.0.tgz"; - name = "ms-rest-1.9.0.tgz"; - sha1 = "12b20c5477874c1ec09133b5fa77ea4bb67824ce"; + url = "http://registry.npmjs.org/ms-rest/-/ms-rest-1.10.0.tgz"; + name = "ms-rest-1.10.0.tgz"; + sha1 = "d1d9a93f3c7f7189500475ac680875ed1da56d99"; }; deps = { "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4"; - "request-2.52.0" = self.by-version."request"."2.52.0"; - "validator-3.1.0" = self.by-version."validator"."3.1.0"; + "request-2.69.0" = self.by-version."request"."2.69.0"; "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; "through-2.3.8" = self.by-version."through"."2.3.8"; - "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1"; - "moment-2.11.2" = self.by-version."moment"."2.11.2"; + "moment-2.12.0" = self.by-version."moment"."2.12.0"; }; optionalDependencies = { }; @@ -3364,26 +3294,26 @@ os = [ ]; cpu = [ ]; }; - by-spec."ms-rest"."^1.9.0" = - self.by-version."ms-rest"."1.9.0"; + by-spec."ms-rest"."^1.8.0" = + self.by-version."ms-rest"."1.10.0"; by-spec."ms-rest-azure"."^1.8.0" = - self.by-version."ms-rest-azure"."1.9.0"; - by-version."ms-rest-azure"."1.9.0" = self.buildNodePackage { - name = "ms-rest-azure-1.9.0"; - version = "1.9.0"; + self.by-version."ms-rest-azure"."1.10.0"; + by-version."ms-rest-azure"."1.10.0" = self.buildNodePackage { + name = "ms-rest-azure-1.10.0"; + version = "1.10.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.9.0.tgz"; - name = "ms-rest-azure-1.9.0.tgz"; - sha1 = "b172ac72f890ac31511e9c68899f4aa4d50c5bd1"; + url = "http://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.10.0.tgz"; + name = "ms-rest-azure-1.10.0.tgz"; + sha1 = "467f481de7f3f10b5d020de393d0de71ada6278a"; }; deps = { "async-0.2.7" = self.by-version."async"."0.2.7"; "uuid-2.0.1" = self.by-version."uuid"."2.0.1"; "adal-node-0.1.16" = self.by-version."adal-node"."0.1.16"; - "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - "moment-2.11.2" = self.by-version."moment"."2.11.2"; + "moment-2.12.0" = self.by-version."moment"."2.12.0"; }; optionalDependencies = { }; @@ -3610,25 +3540,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."pako"."~0.2.5" = - self.by-version."pako"."0.2.8"; - by-version."pako"."0.2.8" = self.buildNodePackage { - name = "pako-0.2.8"; - version = "0.2.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pako/-/pako-0.2.8.tgz"; - name = "pako-0.2.8.tgz"; - sha1 = "15ad772915362913f20de4a8a164b4aacc6165d6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."pause-stream"."0.0.11" = self.by-version."pause-stream"."0.0.11"; by-version."pause-stream"."0.0.11" = self.buildNodePackage { @@ -3726,6 +3637,25 @@ os = [ ]; cpu = [ ]; }; + by-spec."pseudomap"."^1.0.1" = + self.by-version."pseudomap"."1.0.2"; + by-version."pseudomap"."1.0.2" = self.buildNodePackage { + name = "pseudomap-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + name = "pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."q"."~0.9.3" = self.by-version."q"."0.9.7"; by-version."q"."0.9.7" = self.buildNodePackage { @@ -3939,7 +3869,7 @@ "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; }; optionalDependencies = { - "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1"; + "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0"; "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; @@ -3971,7 +3901,7 @@ "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; - "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1"; + "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0"; "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; @@ -3986,26 +3916,7 @@ os = [ ]; cpu = [ ]; }; - by-spec."request"."2.9.x" = - self.by-version."request"."2.9.203"; - by-version."request"."2.9.203" = self.buildNodePackage { - name = "request-2.9.203"; - version = "2.9.203"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz"; - name = "request-2.9.203.tgz"; - sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request".">= 2.52.0" = + by-spec."request"."2.69.0" = self.by-version."request"."2.69.0"; by-version."request"."2.69.0" = self.buildNodePackage { name = "request-2.69.0"; @@ -4018,8 +3929,8 @@ }; deps = { "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0"; - "aws4-1.2.1" = self.by-version."aws4"."1.2.1"; - "bl-1.0.2" = self.by-version."bl"."1.0.2"; + "aws4-1.3.2" = self.by-version."aws4"."1.3.2"; + "bl-1.0.3" = self.by-version."bl"."1.0.3"; "caseless-0.11.0" = self.by-version."caseless"."0.11.0"; "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; "extend-3.0.0" = self.by-version."extend"."3.0.0"; @@ -4031,12 +3942,12 @@ "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0"; "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-2.1.9" = self.by-version."mime-types"."2.1.9"; + "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10"; "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1"; "qs-6.0.2" = self.by-version."qs"."6.0.2"; "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5"; - "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1"; + "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; }; optionalDependencies = { @@ -4045,6 +3956,27 @@ os = [ ]; cpu = [ ]; }; + by-spec."request"."2.9.x" = + self.by-version."request"."2.9.203"; + by-version."request"."2.9.203" = self.buildNodePackage { + name = "request-2.9.203"; + version = "2.9.203"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz"; + name = "request-2.9.203.tgz"; + sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."request".">= 2.52.0" = + self.by-version."request"."2.69.0"; by-spec."request".">= 2.9.203" = self.by-version."request"."2.69.0"; by-spec."request"."~2.57.0" = @@ -4068,7 +4000,7 @@ "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; "qs-3.1.0" = self.by-version."qs"."3.1.0"; "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; - "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1"; + "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0"; "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1"; "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; @@ -4104,15 +4036,15 @@ cpu = [ ]; }; by-spec."sax".">=0.1.1" = - self.by-version."sax"."1.1.5"; - by-version."sax"."1.1.5" = self.buildNodePackage { - name = "sax-1.1.5"; - version = "1.1.5"; + self.by-version."sax"."1.1.6"; + by-version."sax"."1.1.6" = self.buildNodePackage { + name = "sax-1.1.6"; + version = "1.1.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-1.1.5.tgz"; - name = "sax-1.1.5.tgz"; - sha1 = "1da50a8d00cdecd59405659f5ff85349fe773743"; + url = "http://registry.npmjs.org/sax/-/sax-1.1.6.tgz"; + name = "sax-1.1.6.tgz"; + sha1 = "5d616be8a5e607d54e114afae55b7eaf2fcc3240"; }; deps = { }; @@ -4224,24 +4156,24 @@ cpu = [ ]; }; by-spec."sshpk"."^1.7.0" = - self.by-version."sshpk"."1.7.3"; - by-version."sshpk"."1.7.3" = self.buildNodePackage { - name = "sshpk-1.7.3"; - version = "1.7.3"; + self.by-version."sshpk"."1.7.4"; + by-version."sshpk"."1.7.4" = self.buildNodePackage { + name = "sshpk-1.7.4"; + version = "1.7.4"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.3.tgz"; - name = "sshpk-1.7.3.tgz"; - sha1 = "caa8ef95e30765d856698b7025f9f211ab65962f"; + url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz"; + name = "sshpk-1.7.4.tgz"; + sha1 = "ad7b47defca61c8415d964243b62b0ce60fbca38"; }; deps = { "asn1-0.2.3" = self.by-version."asn1"."0.2.3"; "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0"; - "dashdash-1.12.2" = self.by-version."dashdash"."1.12.2"; + "dashdash-1.13.0" = self.by-version."dashdash"."1.13.0"; }; optionalDependencies = { "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0"; - "tweetnacl-0.13.3" = self.by-version."tweetnacl"."0.13.3"; + "tweetnacl-0.14.1" = self.by-version."tweetnacl"."0.14.1"; "jodid25519-1.0.2" = self.by-version."jodid25519"."1.0.2"; "ecc-jsbn-0.1.1" = self.by-version."ecc-jsbn"."0.1.1"; }; @@ -4305,7 +4237,7 @@ "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; }; optionalDependencies = { - "fibers-1.0.8" = self.by-version."fibers"."1.0.8"; + "fibers-1.0.10" = self.by-version."fibers"."1.0.10"; "galaxy-0.1.12" = self.by-version."galaxy"."0.1.12"; }; peerDependencies = []; @@ -4389,15 +4321,15 @@ cpu = [ ]; }; by-spec."strip-ansi"."^3.0.0" = - self.by-version."strip-ansi"."3.0.0"; - by-version."strip-ansi"."3.0.0" = self.buildNodePackage { - name = "strip-ansi-3.0.0"; - version = "3.0.0"; + self.by-version."strip-ansi"."3.0.1"; + by-version."strip-ansi"."3.0.1" = self.buildNodePackage { + name = "strip-ansi-3.0.1"; + version = "3.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"; - name = "strip-ansi-3.0.0.tgz"; - sha1 = "7510b665567ca914ccb5d7e072763ac968be3724"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + name = "strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; deps = { "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0"; @@ -4427,25 +4359,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."swagger-schema-official"."2.0.0-a33091a" = - self.by-version."swagger-schema-official"."2.0.0-a33091a"; - by-version."swagger-schema-official"."2.0.0-a33091a" = self.buildNodePackage { - name = "swagger-schema-official-2.0.0-a33091a"; - version = "2.0.0-a33091a"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/swagger-schema-official/-/swagger-schema-official-2.0.0-a33091a.tgz"; - name = "swagger-schema-official-2.0.0-a33091a.tgz"; - sha1 = "54cd2c83aac5b2203572fcd70e6e092d17b763fd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."through"."2" = self.by-version."through"."2.3.8"; by-version."through"."2.3.8" = self.buildNodePackage { @@ -4490,35 +4403,16 @@ self.by-version."through"."2.3.8"; by-spec."through"."~2.3.4" = self.by-version."through"."2.3.8"; - by-spec."tmp"."0.0.25" = - self.by-version."tmp"."0.0.25"; - by-version."tmp"."0.0.25" = self.buildNodePackage { - name = "tmp-0.0.25"; - version = "0.0.25"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tmp/-/tmp-0.0.25.tgz"; - name = "tmp-0.0.25.tgz"; - sha1 = "b29629768c55f38df0bff33f6dfde052443da27d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tough-cookie"."*" = - self.by-version."tough-cookie"."2.2.1"; - by-version."tough-cookie"."2.2.1" = self.buildNodePackage { - name = "tough-cookie-2.2.1"; - version = "2.2.1"; + by-spec."tough-cookie".">=0.12.0" = + self.by-version."tough-cookie"."2.2.2"; + by-version."tough-cookie"."2.2.2" = self.buildNodePackage { + name = "tough-cookie-2.2.2"; + version = "2.2.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"; - name = "tough-cookie-2.2.1.tgz"; - sha1 = "3b0516b799e70e8164436a1446e7e5877fda118e"; + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; + name = "tough-cookie-2.2.2.tgz"; + sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; }; deps = { }; @@ -4528,10 +4422,8 @@ os = [ ]; cpu = [ ]; }; - by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."2.2.1"; by-spec."tough-cookie"."~2.2.0" = - self.by-version."tough-cookie"."2.2.1"; + self.by-version."tough-cookie"."2.2.2"; by-spec."tunnel"."0.0.2" = self.by-version."tunnel"."0.0.2"; by-version."tunnel"."0.0.2" = self.buildNodePackage { @@ -4591,35 +4483,16 @@ }; by-spec."tunnel-agent"."~0.4.1" = self.by-version."tunnel-agent"."0.4.2"; - by-spec."tv4"."^1.1.9" = - self.by-version."tv4"."1.2.7"; - by-version."tv4"."1.2.7" = self.buildNodePackage { - name = "tv4-1.2.7"; - version = "1.2.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tv4/-/tv4-1.2.7.tgz"; - name = "tv4-1.2.7.tgz"; - sha1 = "bd29389afc73ade49ae5f48142b5d544bf68d120"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."tweetnacl".">=0.13.0 <1.0.0" = - self.by-version."tweetnacl"."0.13.3"; - by-version."tweetnacl"."0.13.3" = self.buildNodePackage { - name = "tweetnacl-0.13.3"; - version = "0.13.3"; + self.by-version."tweetnacl"."0.14.1"; + by-version."tweetnacl"."0.14.1" = self.buildNodePackage { + name = "tweetnacl-0.14.1"; + version = "0.14.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"; - name = "tweetnacl-0.13.3.tgz"; - sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56"; + url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz"; + name = "tweetnacl-0.14.1.tgz"; + sha1 = "37c6a1fb5cd4b63b7acee450d8419d9c0024cc03"; }; deps = { }; @@ -4786,26 +4659,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."walk"."^2.3.9" = - self.by-version."walk"."2.3.9"; - by-version."walk"."2.3.9" = self.buildNodePackage { - name = "walk-2.3.9"; - version = "2.3.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/walk/-/walk-2.3.9.tgz"; - name = "walk-2.3.9.tgz"; - sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b"; - }; - deps = { - "foreachasync-3.0.0" = self.by-version."foreachasync"."3.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."winston"."0.6.x" = self.by-version."winston"."0.6.2"; by-version."winston"."0.6.2" = self.buildNodePackage { @@ -4863,7 +4716,7 @@ sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; }; deps = { - "sax-1.1.5" = self.by-version."sax"."1.1.5"; + "sax-1.1.6" = self.by-version."sax"."1.1.6"; }; optionalDependencies = { }; @@ -4969,4 +4822,23 @@ os = [ ]; cpu = [ ]; }; + by-spec."yallist"."^2.0.0" = + self.by-version."yallist"."2.0.0"; + by-version."yallist"."2.0.0" = self.buildNodePackage { + name = "yallist-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; + name = "yallist-2.0.0.tgz"; + sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; } |