diff options
Diffstat (limited to 'pkgs/tools')
144 files changed, 1792 insertions, 1119 deletions
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 23b406c2d43f..e7233d0f7145 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchzip, fetchFromGitHub, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto +{ stdenv, fetchurl, fetchFromGitHub +, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, which, gnugrep, gnused, coreutils , mimiSupport ? false, gawk ? null }: @@ -15,12 +16,12 @@ let in stdenv.mkDerivation rec { - name = "xdg-utils-1.1.0-rc3p46"; + name = "xdg-utils-${version}"; + version = "1.1.1"; - src = fetchzip { - name = "${name}.tar.gz"; - url = "http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/03577f987730.tar.gz"; - sha256 = "1fs0kxalmpqv6x0rv4xg65w8r26sk464xisrbwp4p6a033y5x34l"; + src = fetchurl { + url = "https://portland.freedesktop.org/download/${name}.tar.gz"; + sha256 = "09a1pk3ifsndc5qz2kcd1557i137gpgnv3d739pv22vfayi67pdh"; }; # just needed when built from git @@ -28,18 +29,23 @@ 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 + + substituteInPlace $out/bin/xdg-open \ + --replace "/usr/bin/printf" "${coreutils}/bin/printf" + + substituteInPlace $out/bin/xdg-mime \ + --replace "/usr/bin/file" "${file}/bin/file" + + 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 689384430863..ae869cfb1c4f 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.out}/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 de8eb82f8835..f30c0751c3f2 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.out}/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/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 6b442e7bf660..1f27730b19a0 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, python, doxygen, lzma, boost}: stdenv.mkDerivation rec { - name = "innoextract-1.5"; + name = "innoextract-1.6"; src = fetchurl { url = "http://constexpr.org/innoextract/files/${name}.tar.gz"; - sha256 = "1ks8z8glak63xvqlv7dnmlzkjrwsn81lhybmai2mja6g5jclwngj"; + sha256 = "0gh3q643l8qlwla030cmf3qdcdr85ixjygkb7j4dbm7zbwa3yik6"; }; buildInputs = [ python doxygen lzma boost ]; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 769f20c41111..f2fdc71dc86c 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/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 2b761df3863f..011793248cd7 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -1,23 +1,14 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, perl, unzip }: let s = # Generated upstream information rec { baseName="zpaq"; - version="705"; + version="707"; name="${baseName}-${version}"; - hash="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq"; - url="http://mattmahoney.net/dc/zpaq705.zip"; - sha256="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq"; + hash="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3"; + url="http://mattmahoney.net/dc/zpaq707.zip"; + sha256="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3"; }; - isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD; - isx86 = stdenv.isi686 || stdenv.isx86_64; - compileFlags = with stdenv; "" - + (lib.optionalString (isUnix) " -Dunix -pthread") - + (lib.optionalString (isi686) " -march=i686") - + (lib.optionalString (isx86_64) " -march=nocona") - + (lib.optionalString (!isx86) " -DNOJIT") - + " -O3 -mtune=generic -DNDEBUG" - ; in stdenv.mkDerivation { inherit (s) name version; @@ -28,20 +19,24 @@ stdenv.mkDerivation { sourceRoot = "."; + nativeBuildInputs = [ perl /* for pod2man */ ]; buildInputs = [ unzip ]; - buildPhase = '' - g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so - g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaq.cpp -o zpaq + preBuild = let + CPPFLAGS = with stdenv; "" + + (lib.optionalString (!isi686 && !isx86_64) "-DNOJIT ") + + "-Dunix"; + CXXFLAGS = with stdenv; "" + + (lib.optionalString (isi686) "-march=i686 ") + + (lib.optionalString (isx86_64) "-march=nocona ") + + "-O3 -mtune=generic -DNDEBUG"; + in '' + buildFlagsArray=( "CPPFLAGS=${CPPFLAGS}" "CXXFLAGS=${CXXFLAGS}" ) ''; - installPhase = '' - mkdir -p "$out"/{bin,include,lib,share/doc/zpaq} - cp libzpaq.so "$out/lib" - cp zpaq "$out/bin" - cp libzpaq.h "$out/include" - cp readme.txt "$out/share/doc/zpaq" - ''; + enableParallelBuilding = true; + + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { inherit (s) version; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index f5d4322ec932..07319fe4c39b 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -12,9 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig qt4 taglib chromaprint ffmpeg ]; - meta = { + cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${(builtins.parseDrvName taglib.name).version}" ]; + + meta = with stdenv.lib; { homepage = "http://acoustid.org/fingerprinter"; description = "Audio fingerprinting tool using chromaprint"; license = stdenv.lib.licenses.gpl2Plus; + maintainers = with maintainers; [ ehmry ]; }; } 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/b2/default.nix b/pkgs/tools/backup/b2/default.nix deleted file mode 100644 index 15a48b765798..000000000000 --- a/pkgs/tools/backup/b2/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchFromGitHub, pythonPackages, stdenv }: - -stdenv.mkDerivation rec { - name = "b2-${version}"; - version = "git-26.01.2016"; - - src = fetchFromGitHub { - owner = "Backblaze"; - repo = "B2_Command_Line_Tool"; - rev = "b3f06fd53eb1c9a07740b962284753cba413a7b8"; - sha256 = "0kn2lkh8hp6g8q88glyz03z1r8a47pqm91dc5w083i334swqkjp2"; - }; - - buildInputs = [ pythonPackages.wrapPython ]; - - installPhase = '' - mkdir -p $out/bin - cp b2 $out/bin - ''; - - postInstall = "wrapPythonPrograms"; - - meta = with stdenv.lib; { - homepage = https://github.com/Backblaze/B2_Command_Line_Tool; - description = "CLI for accessing Backblaze's B2 Cloud Storage"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ hrdinka ]; - }; -} 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/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch b/pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch new file mode 100644 index 000000000000..1ebb34ded9ea --- /dev/null +++ b/pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch @@ -0,0 +1,39 @@ +From d5978c207f2b266165140dd21e9746ace5792daf Mon Sep 17 00:00:00 2001 +From: Moritz Ulrich <moritz@tarn-vedra.de> +Date: Fri, 18 Mar 2016 14:01:22 +0100 +Subject: [PATCH] btrbk: Prefix PATH instead of resetting it. + +Some distros don't even install use /usr/bin, /sbin, etc. (notably +NixOS). Instead, they use PATH to specify which programs are available +to a given executable. + +This patch changes the behavior or `btrbk` so it extends PATH with its +own search paths instead of resetting it. This allows users and distros +to specify their own custom location for `btrfs` via `PATH`. +--- + btrbk | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/btrbk b/btrbk +index ab15858..0b91cbe 100755 +--- a/btrbk ++++ b/btrbk +@@ -2464,10 +2464,11 @@ sub exit_status + + MAIN: + { +- # set PATH instead of using absolute "/sbin/btrfs" (for now), as +- # different distros (and even different versions of btrfs-progs) +- # install the "btrfs" executable to different locations. +- $ENV{PATH} = '/sbin:/bin:/usr/sbin:/usr/bin'; ++ # Prefix PATH with /sbin etc. instead of using absolute ++ # "/sbin/btrfs" (for now), as different distros (and even different ++ # versions of btrfs-progs) install the "btrfs" executable to ++ # different locations. ++ $ENV{PATH} .= '/sbin:/bin:/usr/sbin:/usr/bin'; + + Getopt::Long::Configure qw(gnu_getopt); + $Data::Dumper::Sortkeys = 1; +-- +2.7.3 + diff --git a/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch b/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch new file mode 100644 index 000000000000..050f1a6c4303 --- /dev/null +++ b/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch @@ -0,0 +1,25 @@ +From 8abe8a915aa2d0c79c4dbe00dc7d255c32b7b85d Mon Sep 17 00:00:00 2001 +From: Moritz Ulrich <moritz@tarn-vedra.de> +Date: Fri, 18 Mar 2016 13:20:48 +0100 +Subject: [PATCH] btrbk-mail: Use `btrbk` instead of unbound variable `$btrbk` + +--- + contrib/cron/btrbk-mail | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/cron/btrbk-mail b/contrib/cron/btrbk-mail +index f7e4f12..9143f2d 100755 +--- a/contrib/cron/btrbk-mail ++++ b/contrib/cron/btrbk-mail +@@ -113,7 +113,7 @@ case $exitcode in + ;; + 10) status="ERROR: At least one backup task aborted!" + ;; +- *) status="ERROR: $btrbk failed with error code $exitcode" ++ *) status="ERROR: btrbk failed with error code $exitcode" + ;; + esac + +-- +2.7.3 + diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix new file mode 100644 index 000000000000..d4e058d143ff --- /dev/null +++ b/pkgs/tools/backup/btrbk/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, coreutils, bash, btrfs-progs, perl, perlPackages, makeWrapper }: + +stdenv.mkDerivation rec { + name = "btrbk-${version}"; + version = "0.22.2"; + + src = fetchurl { + url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz"; + sha256 = "1gbgi0dp62wlw7y72pgxjs6byxkrk73g35kqxzw0gjf32r5i4sb8"; + }; + + patches = [ + # https://github.com/digint/btrbk/pull/74 + ./btrbk-Prefix-PATH-instead-of-resetting-it.patch + # https://github.com/digint/btrbk/pull/73 + ./btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch + ]; + + buildInputs = with perlPackages; [ makeWrapper perl DateCalc ]; + + preInstall = '' + substituteInPlace Makefile \ + --replace "/usr" "$out" \ + --replace "/etc" "$out/etc" + + # Tainted Mode disables PERL5LIB + substituteInPlace btrbk --replace "perl -T" "perl" + + # Fix btrbk-mail + substituteInPlace contrib/cron/btrbk-mail \ + --replace "/bin/date" "${coreutils}/bin/date" \ + --replace "/bin/echo" "${coreutils}/bin/echo" \ + --replace '$btrbk' 'btrbk' + ''; + + fixupPhase = '' + patchShebangs $out/ + + wrapProgram $out/sbin/btrbk \ + --set PERL5LIB $PERL5LIB \ + --prefix PATH ':' "${btrfs-progs}/bin:${bash}/bin/" + ''; + + meta = with stdenv.lib; { + description = "A backup tool for btrfs subvolumes"; + homepage = http://digint.ch/btrbk; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ the-kenny ]; + inherit version; + }; +} diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index e94af89a7c6d..9b2adc1d39f9 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -3,21 +3,21 @@ python3Packages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "s3ql"; - version = "2.13"; + version = "2.17.1"; src = fetchurl { url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2"; - sha256 = "0bxps1iq0rv7bg2b8mys6zyjp912knm6zmafhid1jhsv3xyby4my"; + sha256 = "049vpvvkyia7v4v97rg2l01n43shrdxc1ik38bmjb2q4fvsh1pgx"; }; propagatedBuildInputs = with python3Packages; - [ sqlite apsw pycrypto requests defusedxml dugong llfuse ]; + [ sqlite apsw pycrypto requests2 defusedxml dugong llfuse ]; meta = with stdenv.lib; { description = "A full-featured file system for online data storage"; homepage = "https://bitbucket.org/nikratio/s3ql"; license = licenses.gpl3; maintainers = with maintainers; [ rushmorem ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } 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/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix new file mode 100644 index 000000000000..1534a0bab0a3 --- /dev/null +++ b/pkgs/tools/backup/znapzend/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: + +let + version = "0.15.3"; + checksum = "1xk0lgb23kv1cl0wc2rav75hjrjigd0cp3hjw9gxab835vsvnkq0"; +in +stdenv.mkDerivation rec { + name = "znapzend-${version}"; + + src = fetchFromGitHub{ + owner = "oetiker"; + repo = "znapzend"; + rev = "v${version}"; + sha256 = checksum; + }; + + buildInputs = [ perl perlPackages.TestHarness perlPackages.Mojolicious + perlPackages.TAPParserSourceHandlerpgTAP perlPackages.MojoIOLoopForkCall + perlPackages.IOPipely wget ]; + + nativeBuildInputs = [ autoconf automake ]; + + preConfigure = '' + sed -i 's/^SUBDIRS =.*$/SUBDIRS = lib/' Makefile.am + + grep -v thirdparty/Makefile configure.ac > configure.ac.tmp + mv configure.ac.tmp configure.ac + + autoconf + ''; + + preBuild = '' + aclocal + automake + ''; + + postInstall = '' + substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \ + "${perl}/bin/perl \ + -I${perlPackages.TestHarness}/${perl.libPrefix} \ + -I${perlPackages.Mojolicious}/${perl.libPrefix} \ + -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ + -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \ + -I${perlPackages.IOPipely}/${perl.libPrefix} \ + " + substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \ + "${perl}/bin/perl \ + -I${perlPackages.TestHarness}/${perl.libPrefix} \ + -I${perlPackages.Mojolicious}/${perl.libPrefix} \ + -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ + -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \ + -I${perlPackages.IOPipely}/${perl.libPrefix} \ + " + substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \ + "${perl}/bin/perl \ + -I${perlPackages.TestHarness}/${perl.libPrefix} \ + -I${perlPackages.Mojolicious}/${perl.libPrefix} \ + -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ + -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \ + -I${perlPackages.IOPipely}/${perl.libPrefix} \ + " + ''; + + + meta = with stdenv.lib; { + description = "High performance open source ZFS backup with mbuffer and ssh support"; + homepage = http://www.znapzend.org; + license = licenses.gpl3; + maintainers = with maintainers; [ otwieracz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 7cb1bf7506da..08da13b569ae 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (builtins.elem stdenv.system stdenv.lib.platforms.x86_64) "--with-sse2=yes"; - enableParallelBuilding = true; + # fatal error: inlined-icons.h: No such file or directory + enableParallelBuilding = false; doCheck = true; checkPhase = '' 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/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 8aeeb3b9e516..07e2eb194695 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - enableParallelBuilding = true; + enableParallelBuilding = false; # problems, easily reproducible buildFlags = [ "zopfli" "libzopfli" diff --git a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix b/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix new file mode 100644 index 000000000000..afafa4ec1743 --- /dev/null +++ b/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt +}: + +let version = "4.4.1"; in + +stdenv.mkDerivation rec { + name = "btrfs-progs-${version}"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; + sha256 = "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"; + }; + + buildInputs = [ + pkgconfig attr acl zlib libuuid e2fsprogs lzo + asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + ]; + + # gcc bug with -O1 on ARM with gcc 4.8 + # This should be fine on all platforms so apply universally + patchPhase = "sed -i s/-O1/-O2/ configure"; + + meta = with stdenv.lib; { + description = "Utilities for the btrfs filesystem"; + homepage = https://btrfs.wiki.kernel.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ nckx raskin wkennington ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 3435a8c14329..59935af0a5d4 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.4.1"; in +let version = "4.5"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"; + sha256 = "04d8w1wqaij6kxhxcirwvy1bkvc7aikkyw981ciwlznblzc16y7f"; }; buildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Utilities for the btrfs filesystem"; homepage = https://btrfs.wiki.kernel.org/; license = licenses.gpl2; - maintainers = with maintainers; [ raskin wkennington ]; + maintainers = with maintainers; [ nckx raskin wkennington ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix new file mode 100644 index 000000000000..db1968fccdcf --- /dev/null +++ b/pkgs/tools/filesystems/genromfs/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "0.5.2"; + name = "genromfs-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/romfs/genromfs/${version}/${name}.tar.gz"; + sha256 = "0q6rpq7cmclmb4ayfyknvzbqysxs4fy8aiahlax1sb2p6k3pzwrh"; + }; + + postPatch = '' + substituteInPlace Makefile --replace "prefix = /usr" "prefix = $out" + ''; + + meta = with stdenv.lib; { + homepage = "http://romfs.sourceforge.net/"; + description = "Tool for creating romfs file system images"; + license = licenses.gpl2; + maintainers = with maintainers; [ pxc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 6e54de033d60..ed3850b9fdd6 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -1,13 +1,12 @@ -{stdenv, fetchgit, libuuid, lzo, zlib, acl}: +{ stdenv, fetchurl, libuuid, lzo, zlib, acl }: stdenv.mkDerivation rec { name = "mtd-utils-${version}"; - version = "1.5.1"; + version = "1.5.2"; - src = fetchgit { - url = git://git.infradead.org/mtd-utils.git; - rev = "refs/tags/v" + version; - sha256 = "1bjx42pwl789ara63c672chvgvmqhkj4y132gajqih6naq71f8g7"; + src = fetchurl { + url = ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.5.2.tar.bz2; + sha256 = "007lhsd8yb34l899r4m37whhzdw815cz4fnjbpnblfha524p7dax"; }; patchPhase = '' 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/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 218a2fe0e058..5ebd567b8ba7 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "tmsu-${version}"; - version = "0.6.0"; + version = "0.6.1"; go-sqlite3 = fetchgit { url = "git://github.com/mattn/go-sqlite3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "1fqq8cj1awwhb076s88l489kj664ndc343gqi8c21yp9wj6fzpnq"; + sha256 = "08mz08pw59zaljp7dcndklnfdbn36ld27capivq3ifbq96nnqdf3"; }; buildInputs = [ go fuse ]; diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index 329950f8969b..7cb924c6cf13 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -10,9 +10,15 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline ]; + NIX_CFLAGS_COMPILE = "-std=gnu90"; + preConfigure = '' sed -e '1i#include <limits.h>' -i cdrwtool/cdrwtool.c -i pktsetup/pktsetup.c sed -e 's@[(]char[*][)]spm [+]=@spm = ((char*) spm) + @' -i wrudf/wrudf.c + sed -e '27i#include <string.h>' -i include/udf_endian.h + sed -e '38i#include <string.h>' -i wrudf/wrudf-cdrw.c + sed -e '12i#include <string.h>' -i wrudf/wrudf-cdr.c + sed -e '37i#include <stdlib.h>' -i wrudf/ide-pc.c ''; meta = with stdenv.lib; { 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/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index c967b73001c7..f1f5ac878ba9 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -2,13 +2,13 @@ , boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libxmi, mesa, vigra , help2man, pkgconfig, perl }: -let version = "4.1.4"; in +let version = "4.1.5"; in stdenv.mkDerivation rec { name = "enblend-enfuse-${version}"; src = fetchurl { url = "mirror://sourceforge/enblend/${name}.tar.gz"; - sha256 = "0208x01i129hqylmy6jh3krwdac47mx6fi8xccjm9h35c18c7xl5"; + sha256 = "08dz73jgrwfhz0kh57kz048qy1c6a35ckqn9xs5rajm449vnw0pg"; }; buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; diff --git a/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch b/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch new file mode 100644 index 000000000000..13e18fd04476 --- /dev/null +++ b/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch @@ -0,0 +1,47 @@ +From 53ce5fe7e73d7ed95c9e12b52dd4984723f865fa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zdenko=20Podobn=C3=BD?= <zdenop@gmail.com> +Date: Sun, 6 Apr 2014 21:25:27 +0200 +Subject: [PATCH] fix build with leptonica 1.70 + +--- + configure.ac | 1 + + src/jbig2.cc | 13 +++++++++---- + 2 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fe37c22..753a607 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,6 +55,7 @@ AC_CHECK_LIB([lept], [findFileFormatStream], [], [ + echo "Error! Leptonica not detected." + exit -1 + ]) ++AC_CHECK_FUNCS(expandBinaryPower2Low,,) + # test for function - it should detect leptonica dependecies + + # Check for possible dependancies of leptonica. +diff --git a/src/jbig2.cc b/src/jbig2.cc +index e10f042..515c1ef 100644 +--- a/src/jbig2.cc ++++ b/src/jbig2.cc +@@ -130,11 +130,16 @@ segment_image(PIX *pixb, PIX *piximg) { + // input color image, so we have to do it this way... + // is there a better way? + // PIX *pixd = pixExpandBinary(pixd4, 4); +- PIX *pixd = pixCreate(piximg->w, piximg->h, 1); +- pixCopyResolution(pixd, piximg); +- if (verbose) pixInfo(pixd, "mask image: "); +- expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl, ++ PIX *pixd; ++#ifdef HAVE_EXPANDBINARYPOWER2LOW ++ pixd = pixCreate(piximg->w, piximg->h, 1); ++ pixCopyResolution(pixd, piximg); ++ expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl, + pixd4->data, pixd4->w, pixd4->h, pixd4->wpl, 4); ++#else ++ pixd = pixExpandBinaryPower2(pixd4, 4); ++#endif ++ if (verbose) pixInfo(pixd, "mask image: "); + + pixDestroy(&pixd4); + pixDestroy(&pixsf4); diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix index 71f0789286a1..8d0b7d2d9f49 100644 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -8,6 +8,11 @@ propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ]; + patches = [ + # https://github.com/agl/jbig2enc/commit/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa + ./53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch + ]; + # This is necessary, because the resulting library has # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib # in its rpath, which means that patchelf --shrink-rpath removes diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index b39ae1dfd08f..4a52434d379a 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { touch lib/standardppmdfont.c ''; - enableParallelBuilding = true; + enableParallelBuilding = false; installPhase = '' make package pkgdir=$out diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 77cc898ef2ad..985b8a1c59d5 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchgit, libpng }: +{ stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }: stdenv.mkDerivation rec { name = "pngquant-${version}"; - version = "2.0.1"; + version = "2.6.0"; - src = fetchgit { - url = https://github.com/pornel/pngquant.git; - rev = "refs/tags/${version}"; - sha256 = "00mrv9wgxbwy517l8i4n7n3jpzirjdgi0zass3wj29i7xyipwlhf"; + src = fetchFromGitHub { + owner = "pornel"; + repo = "pngquant"; + rev = version; + sha256 = "0sdh9cz330rhj6xvqk3sdhy0393qwyl349klk9r55g88rjp774s5"; }; - buildInputs = [ libpng ]; + preConfigure = "patchShebangs ."; + + buildInputs = [ pkgconfig libpng zlib lcms2 ]; preInstall = '' mkdir -p $out/bin @@ -18,10 +21,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pornel/pngquant; - description = "pngquant converts 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved"; - platforms = platforms.all; + homepage = https://pngquant.org/; + description = "A tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved"; + platforms = platforms.linux; license = licenses.bsd2; # Not exactly bsd2, but alike - broken = true; }; } diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix index 34ffa1568b98..4fbd0965c785 100644 --- a/pkgs/tools/inputmethods/anthy/default.nix +++ b/pkgs/tools/inputmethods/anthy/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation { description = "Hiragana text to Kana Kanji mixed text Japanese input method"; homepace = http://sourceforge.jp/projects/anthy/; license = licenses.gpl2Plus; + maintainers = with maintainers; [ ericsagnes ]; 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/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index d8f53a032af8..cdfb57fc5f0e 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "abduco-0.5"; + name = "abduco-0.6"; meta = { homepage = http://brain-dump.org/projects/abduco; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; - sha256 = "11phry5wnvwm9ckij5gxbrjfgdz3x38vpnm505q5ldc88im248mz"; + sha256 = "1x1m58ckwsprljgmdy93mvgjyg9x3cqrzdf3mysp0mx97zhhj2f9"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index ab00d52c7779..f9f9f06eb518 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; platforms = platforms.linux; + broken = true; }; } 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/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 67249161e841..64657d7cd3b9 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpuminer-${version}"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; - sha256 = "1p66v96pz3vk1khwlmc26fg2d06c001755rrkcdv5wh8zyg6wv99"; + sha256 = "0xdgz5qlx1yr3mw2h4bwlbj94y6v2ygjy334cnc87xgzxf1wgann"; }; buildInputs = [ curl jansson ]; diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index dabf843fc83b..e65cec542186 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -1,18 +1,20 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "datamash-${version}"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "http://ftp.gnu.org/gnu/datamash/${name}.tar.gz"; - sha256 = "0154c25c45b5506b6d618ca8e18d0ef093dac47946ac0df464fb21e77b504118"; + sha256 = "0y49zaadzirghy4xfajvsv1f5x805cjp61z212ggipx5243302qs"; }; - meta = { - description = "GNU datamash"; + meta = with stdenv.lib; { + description = "A command-line program which performs basic numeric,textual and statistical operations on input textual data files"; homepage = http://www.gnu.org/software/datamash/; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index c9340e449afa..617cd5f55481 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.16.1"; + version = "2.16.2"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "096f26b0z6kwv47qy99gak40wcc8mp24n0nvqwgifcicr18qv4rz"; + sha256 = "0qlzciiyfhq11j5wf0x6jsa18bmmf2z7f2x5psq2wkkccfi0fxc4"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e05889fdb4b2..72a8f61bf3f0 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,14 +1,13 @@ { fetchurl, stdenv, go }: -let - version = "2.7.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "direnv-${version}"; + version = "2.8.0"; + src = fetchurl { url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz"; name = "direnv-${version}.tar.gz"; - sha256 = "3cfa8f41e740c0dc09d854f3833058caec0ea0d67d19e950f97eee61106b0daf"; + sha256 = "1l1kvjgpak7cc9s37qipfw6lybb4650zwd8kcdagm409gs89mil6"; }; buildInputs = [ go ]; 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/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index b587afb645c2..b32f8f43146f 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -1,37 +1,40 @@ -{ stdenv, fetchFromGitHub, makeWrapper, tmux, vim }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "dynamic-colors-git-${version}"; - version = "2013-12-28"; + name = "dynamic-colors-${version}"; + version = "0.2.1"; src = fetchFromGitHub { - owner = "sos4nt"; + owner = "peterhoeg"; repo = "dynamic-colors"; - rev = "35325f43620c5ee11a56db776b8f828bc5ae1ddd"; - sha256 = "1xsjanqyvjlcj1fb8x4qafskxp7aa9b43ba9gyjgzr7yz8hkl4iz"; + rev = "v${version}"; + sha256 = "061lh4qjk4671hwzmj55n3gy5hsi4p3hb30hj5bg3s6glcsbjpr5"; }; - buildInputs = [ makeWrapper ]; - - patches = [ ./separate-config-and-dynamic-root-path.patch ]; + dontBuild = true; + dontStrip = true; installPhase = '' - mkdir -p $out/bin $out/etc/bash_completion.d $out/share/dynamic-colors - cp bin/dynamic-colors $out/bin/ - cp completions/dynamic-colors.bash $out/etc/bash_completion.d/ - cp -r colorschemes $out/share/dynamic-colors/ - - sed -e 's|\<tmux\>|${tmux}/bin/tmux|g' \ - -e 's|/usr/bin/vim|${vim}/bin/vim|g' \ - -i "$out/bin/dynamic-colors" - - wrapProgram $out/bin/dynamic-colors --set DYNAMIC_COLORS_ROOT "$out/share/dynamic-colors" + mkdir -p \ + $out/bin \ + $out/share/colorschemes \ + $out/share/bash-completion/completions \ + $out/share/zsh/site-packages + + install -m755 bin/dynamic-colors $out/bin/ + install -m644 completions/dynamic-colors.bash $out/share/bash-completion/completions/dynamic-colors + install -m644 completions/dynamic-colors.zsh $out/share/zsh/site-packages/_dynamic-colors + install -m644 colorschemes/* -t $out/share/colorschemes + + sed -e "s|/usr/share/dynamic-colors|$out/share|g" \ + -i $out/bin/dynamic-colors ''; meta = { - homepage = https://github.com/sos4nt/dynamic-colors; + homepage = https://github.com/peterhoeg/dynamic-colors; license = stdenv.lib.licenses.mit; description = "Change terminal colors on the fly"; platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.peterhoeg ]; }; } diff --git a/pkgs/tools/misc/dynamic-colors/separate-config-and-dynamic-root-path.patch b/pkgs/tools/misc/dynamic-colors/separate-config-and-dynamic-root-path.patch deleted file mode 100644 index 7462ed0e3afa..000000000000 --- a/pkgs/tools/misc/dynamic-colors/separate-config-and-dynamic-root-path.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ee44b859003972275d8e469ab41b9900420295e0 Mon Sep 17 00:00:00 2001 -From: Malte Rohde <malte.rohde@flavoursys.com> -Date: Fri, 9 Jan 2015 13:10:41 +0100 -Subject: [PATCH] Store user configuration in appropriate config location. - -So that the dynamic-colors source can live somewhere else -(e.g., /usr/local/dynamic-colors) and multiple users -can use the same script. ---- - bin/dynamic-colors | 21 ++++++++++++++++----- - 1 file changed, 16 insertions(+), 5 deletions(-) - -diff --git a/bin/dynamic-colors b/bin/dynamic-colors -index a669221..5d6bce7 100755 ---- a/bin/dynamic-colors -+++ b/bin/dynamic-colors -@@ -84,16 +84,27 @@ else - fi - COLORSCHEMES="${DYNAMIC_COLORS_ROOT}/colorschemes" - -+if [ -z "${DYNAMIC_COLORS_HOME}" ]; then -+ if [ -d "${HOME}/.dynamic-colors" ] || [ -z "${XDG_CONFIG_HOME}" ]; then -+ DYNAMIC_COLORS_HOME="${HOME}/.dynamic-colors" -+ else -+ DYNAMIC_COLORS_HOME="${XDG_CONFIG_HOME}/dynamic-colors" -+ fi -+else -+ DYNAMIC_COLORS_HOME="${DYNAMIC_COLORS_HOME%/}" -+fi -+ - write_colorscheme_name () { -- echo "$1" > "${DYNAMIC_COLORS_ROOT}/colorscheme" -+ [ ! -d "${DYNAMIC_COLORS_HOME}" ] && mkdir -p "${DYNAMIC_COLORS_HOME}" -+ echo "$1" > "${DYNAMIC_COLORS_HOME}/colorscheme" - } - - load_colorscheme_name () { -- head -1 "${DYNAMIC_COLORS_ROOT}/colorscheme" -+ head -1 "${DYNAMIC_COLORS_HOME}/colorscheme" - } - - init () { -- [ ! -f "${DYNAMIC_COLORS_ROOT}/colorscheme" ] && return -+ [ ! -f "${DYNAMIC_COLORS_HOME}/colorscheme" ] && return - colorscheme_name=$(load_colorscheme_name) - load_colorscheme "$colorscheme_name" - set_colors -@@ -142,8 +153,8 @@ audit () { - } - - cycle() { -- if [ -f "${DYNAMIC_COLORS_ROOT}/colorscheme" ]; then -- current=`head -1 "${DYNAMIC_COLORS_ROOT}/colorscheme"` -+ if [ -f "${DYNAMIC_COLORS_HOME}/colorscheme" ]; then -+ current=$(load_colorscheme_name) - found=false - cd "$COLORSCHEMES" - for file in *.sh; do diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 69ddbd6dbfe7..c6bca6e9d8f6 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.2"; + version = "3.4"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "0ikigpfzyjmr8j6snwlvxzqamrjbhlv78m8w1h0h7kzczc5f1vmi"; + sha256 = "02h1drxn2lid2fwzwjpkp9p04l0g5a56v6jyj3gi3dzjsq7h0zff"; }; postPatch = '' @@ -21,12 +21,11 @@ stdenv.mkDerivation rec { checkTarget = "test"; installFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with stdenv.lib; { homepage = http://entrproject.org/; description = "Run arbitrary commands when files change"; - - license = stdenv.lib.licenses.isc; - - platforms = stdenv.lib.platforms.all; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 8518a7331b95..af6f70e2f5c1 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -4,15 +4,15 @@ with rustPlatform; buildRustPackage rec { name = "exa-${version}"; - version = "2016-02-15"; + version = "2016-03-22"; - depsSha256 = "1925nhpfph82wn755zf2nmad24f1hzbxq60gpva9sic6rnap4c1x"; + depsSha256 = "18anwh235kzziq6z7md8f3rl2xl4l9d4ivsqw9grkb7yivd5j0jk"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; - rev = "252eba484476369bb966fb1af7f739732b968fc0"; - sha256 = "1smyy32z44zgmhyhlbjaxcgfnlbcwz7am9225yppqfdsiqqgdybf"; + rev = "8805ce9e3bcd4b56f8811a686dd56c47202cdbab"; + sha256 = "0dkvk0rsf068as6zcd01p7959rdjzm26mlkpid6z0j168gp4kh4q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/findutils/change_echo_path.patch b/pkgs/tools/misc/findutils/change_echo_path.patch deleted file mode 100644 index 5bbd9aea9ac3..000000000000 --- a/pkgs/tools/misc/findutils/change_echo_path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur findutils-4.2.30/xargs/xargs.c findutils-4.2.30_new/xargs/xargs.c ---- findutils-4.2.30/xargs/xargs.c 2007-02-27 11:21:08.000000000 +0100 -+++ findutils-4.2.30_new/xargs/xargs.c 2007-07-17 19:02:05.000000000 +0200 -@@ -402,7 +402,7 @@ - int show_limits = 0; /* --show-limits */ - int always_run_command = 1; - char *input_file = "-"; /* "-" is stdin */ -- char *default_cmd = "/bin/echo"; -+ char *default_cmd = "echo"; - int (*read_args) PARAMS ((void)) = read_line; - void (*act_on_init_result)(void) = noop; - int env_too_big = 0; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index c59283fb7c39..1271aa8c9863 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,29 +1,25 @@ { stdenv, fetchurl, coreutils }: stdenv.mkDerivation rec { - name = "findutils-4.4.2"; + name = "findutils-4.6.0"; src = fetchurl { url = "mirror://gnu/findutils/${name}.tar.gz"; - sha256 = "0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks3"; + sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y"; }; - nativeBuildInputs = [coreutils]; + nativeBuildInputs = [ coreutils ]; - patches = [ ./findutils-path.patch ./change_echo_path.patch ./disable-test-canonicalize.patch ]; + doCheck = !stdenv.isDarwin; outputs = [ "out" "info" ]; - doCheck = true; - crossAttrs = { # http://osdir.com/ml/bug-findutils-gnu/2009-08/msg00026.html configureFlags = [ "gl_cv_func_wcwidth_works=yes" ]; }; - preConfigure = if stdenv.isCygwin then '' - sed -i gnulib/lib/fpending.h -e '/include <stdio_ext.h>/d' - '' else null; + enableParallelBuilding = true; meta = { homepage = http://www.gnu.org/software/findutils/; diff --git a/pkgs/tools/misc/findutils/disable-test-canonicalize.patch b/pkgs/tools/misc/findutils/disable-test-canonicalize.patch deleted file mode 100644 index 3a8d42eb5607..000000000000 --- a/pkgs/tools/misc/findutils/disable-test-canonicalize.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN findutils-4.4.2/tests/test-canonicalize.sh findutils-4.4.2_edited/tests/test-canonicalize.sh ---- findutils-4.4.2/tests/test-canonicalize.sh 2008-12-23 12:50:15.000000000 +0000 -+++ findutils-4.4.2_edited/tests/test-canonicalize.sh 2015-06-14 10:51:19.000000000 +0000 -@@ -1,5 +1,8 @@ - #!/bin/sh - -+# skipped because user might not have directory listing permission for all parents of TMPDIR -+exit 77 -+ - tmpfiles="" - trap 'rm -fr $tmpfiles' 1 2 3 15 - diff --git a/pkgs/tools/misc/findutils/findutils-path.patch b/pkgs/tools/misc/findutils/findutils-path.patch deleted file mode 100644 index be8d85be3033..000000000000 --- a/pkgs/tools/misc/findutils/findutils-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN findutils-4.2.20/locate/updatedb.sh findutils-4.2.20.new/locate/updatedb.sh ---- findutils-4.2.20/locate/updatedb.sh 2005-01-24 17:12:35.000000000 +0100 -+++ findutils-4.2.20.new/locate/updatedb.sh 2005-08-23 14:37:10.000000000 +0200 -@@ -141,7 +141,7 @@ - : ${code:=${LIBEXECDIR}/@code@} - - --PATH=/bin:/usr/bin:${BINDIR}; export PATH -+PATH=/bin:/usr/bin:${BINDIR}:${PATH}; export PATH - - : ${PRUNEFS="nfs NFS proc afs proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs"} - diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index 925ea13780ac..13b69dad971f 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation { ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db ''; - meta = { + meta = with stdenv.lib; { description = "Tool for displaying hard disk temperature"; homepage = https://savannah.nongnu.org/projects/hddtemp/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index e4c161b2e51c..4346d25ca07c 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { preConfigure = "cd src"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index feb5710282fd..759847b897a0 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "moreutils-${version}"; - version = "0.57"; + version = "0.58"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz"; - sha256 = "078dpkwwwrv8hxnylbc901kib2d1rr3hsja37j6dlpjfcfq58z9s"; + sha256 = "02n00vqp6jxbxr5v3rdjxmzp6kxxjdkjgcclam6wrw8qamsbljww"; }; preBuild = '' 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/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d4c920f4acc8..b4e793976c7a 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20160222"; + name = "parallel-20160322"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1sjmvinwr9j2a0jdk9y9nf2x4hhzcbl529slkwpz0vva0cwybywd"; + sha256 = "020vfcwapla6b4c9pr5ik7kg47fswszdds2mr52kc907xi4zcc34"; }; nativeBuildInputs = [ makeWrapper ]; 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/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 6de3474d2d74..c71f2e86e119 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "8012"; + version = "8037"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar"; - sha256 = "12l2kmp6jaz6lmcj16ljhrpb1bm7zzz5qgvihhymvk66rfjd3ybz"; + sha256 = "1mlwcaph6n2akl639x64vpyjjipv6x0mwqxv6lvy3ml58pbgl58y"; }; # It's only a .jar file and a shell wrapper diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix index e21da0deca2d..654ba4c1795c 100644 --- a/pkgs/tools/misc/scanmem/default.nix +++ b/pkgs/tools/misc/scanmem/default.nix @@ -1,13 +1,13 @@ { stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }: stdenv.mkDerivation rec { - version = "0.15.2"; + version = "0.15.6"; name = "scanmem-${version}"; src = fetchFromGitHub { owner = "scanmem"; repo = "scanmem"; rev = "v${version}"; - sha256 = "0f93ac5rycf46q60flab5nl7ksadjls13axijg5j5wy1yif0k094"; + sha256 = "16cw76ji3mp0sj8q0sz5wndavk10n0si1sm6kr5zpiws4sw047ii"; }; buildInputs = [ autoconf automake intltool libtool readline ]; preConfigure = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/scanmem/scanmem"; description = "Memory scanner for finding and poking addresses in executing processes"; maintainers = [ stdenv.lib.maintainers.chattered ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix new file mode 100644 index 000000000000..30b632f525d2 --- /dev/null +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, buildPythonApplication, makeWrapper, ffmpeg }: + +buildPythonApplication rec { + + name = "togglesg-download-git-${version}"; + version = "2016-02-08"; + + src = fetchFromGitHub { + owner = "0x776b7364"; + repo = "toggle.sg-download"; + rev = "5cac3ec039d67ad29240b2fa850a8db595264e3d"; + sha256 = "0pqw73aa5b18d5ws4zj6gcmzap6ag526jrylqq80m0yyh9yxw5hs"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + doCheck = false; + dontBuild = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out/bin + install -m755 download_toggle_video2.py $out/bin/download_toggle_video2.py + ''; + + postInstall = stdenv.lib.optionalString (ffmpeg != null) + ''wrapProgram $out/bin/download_toggle_video2.py --prefix PATH : "${ffmpeg}/bin"''; + + meta = with stdenv.lib; { + homepage = "https://github.com/0x776b7364/toggle.sg-download"; + description = "Command-line tool to download videos from toggle.sg written in Python"; + longDescription = '' + toggle.sg requires SilverLight in order to view videos. This tool will + allow you to download the video files for viewing in your media player and + on your OS of choice. + ''; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.peterhoeg ]; + }; +} diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index d6789bf52bc5..fedfaa48aa37 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,32 +1,35 @@ -{ 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.3"; name = "vdirsyncer-${version}"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz"; - sha256 = "0s9awjr9v60rr80xcpwmdhkf4v1yqnydahjmxwvxmh64565is465"; + sha256 = "1wjhzjfcvwz68j6wc5cmjsw69ggwcpfy7jp7z7q6fnwwp4dr98lc"; }; 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; + homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; maintainers = with maintainers; [ matthiasbeyer jgeerds ]; platforms = platforms.all; 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/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index d884d48f5214..2c8660a49139 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -13,10 +13,18 @@ stdenv.mkDerivation rec { "--enable-icon-browser" ]; + # for gcc5: c11 inline semantics breaks the build + NIX_CFLAGS_COMPILE = "-fgnu89-inline"; + buildInputs = [ gtk2 ]; nativeBuildInputs = [ pkgconfig intltool ]; + postPatch = '' + sed -i src/file.c -e '21i#include <glib/gprintf.h>' + sed -i src/form.c -e '21i#include <stdlib.h>' + ''; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index fee4d44ce667..20c1170a8055 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.0.2"; + name = "yubico-piv-tool-1.3.0"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "1l12bkyqs38212rizda6s3mypfr4wdiap0yhqfwx86lqcp4h0yb9"; + sha256 = "0l9lkzwi2227y5y02i5g1d701bmlyaj8lffv72jks1w4mkh7q7qh"; }; buildInputs = [ pkgconfig openssl pcsclite ]; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 269219e11435..57952b80daf5 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yubikey-personalization, qt, libyubikey }: stdenv.mkDerivation rec { - name = "yubikey-personalization-gui-3.1.21"; + name = "yubikey-personalization-gui-3.1.24"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz"; - sha256 = "1b5mf6h3jj35f3xwzdbqsyzk171sn8rp9ym4vipmzzcg10jxyp0m"; + sha256 = "0aj8cvajswkwzig0py0mjnfw0m8xsilisdcnixpjx9xxsxz5yacq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index c109903e6ee3..1562b9e69b8e 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yubikey-personalization-${version}"; - version = "1.17.2"; + version = "1.17.3"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; - sha256 = "1z6ybpdhl74phwzg2lhxhipqf7xnfhg52dykkzb3fbx21m0i4jkh"; + sha256 = "034wmwinxmngji1ly8nm9q4hg194iwk164y5rw0whnf69ycc6bs8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index ae4774c0e123..8074f78db50b 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/zsh/site-functions/ cp n-* $out/share/zsh/site-functions/ + cp znt-* $out/share/zsh/site-functions/ ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index eda7f7168760..5fff72a3b075 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }: +{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: assert stdenv.isLinux; assert stdenv.cc.isGNU; let @@ -15,7 +15,7 @@ stdenv.mkDerivation { url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q"; }; - buildInputs = [ readline tcp_wrappers pcre makeWrapper ]; + buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ]; patches = [ debianPatch ]; postInstall = '' wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""} diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 3fb04c16ee76..53392857f2ab 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "10qsmfq2aprrxsm8sshpvzjjpxhmyv89mrik4clw9rprwxknfdq2"; + sha256 = "17j6kp4askr1q5459ak71m1bm0qa3dyqbxvi5ifh2bjvjlp516mx"; }; buildInputs = [ gettext ]; diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index a6752606da69..6bc96a5b8c72 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl, fetchpatch, openssl }: stdenv.mkDerivation rec { name = "cadaver-0.23.3"; @@ -8,11 +8,20 @@ stdenv.mkDerivation rec { sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x"; }; - buildInputs = [openssl]; - configureFlags = ["--with-ssl"]; + patches = [ + (fetchpatch { + url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/disable-sslv2.patch?h=packages/cadaver; + name = "disable-sslv2.patch"; + sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr"; + }) + ]; + + configureFlags = "--with-ssl"; + + buildInputs = [ openssl ]; meta = with stdenv.lib; { - description = "A command-line WebDAV client for Unix"; + description = "A command-line WebDAV client"; homepage = http://www.webdav.org/cadaver; maintainers = with maintainers; [ ianwookim ]; license = licenses.gpl2; diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix index 356c9b4f32d2..56046d5423dd 100644 --- a/pkgs/tools/networking/curl/7.15.nix +++ b/pkgs/tools/networking/curl/7.15.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation rec { homepage = "http://curl.haxx.se/"; description = "A command line tool for transferring files with URL syntax"; platforms = with stdenv.lib.platforms; allBut darwin; + broken = true; }; } diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index b98570a7341b..565a83047efe 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -1,25 +1,30 @@ { 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 ]; + # upstream claims OSX support, but Hydra fails + platforms = with platforms; allBut [ darwin ]; }; } 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..586ae6b544e3 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.73"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "1bw3lzmisn6gs6zy9vcqbfnicl437ydskqcayklpw60fkhb18qip"; + sha256 = "1mzg18jss1bsmcnn88zv7kv5yj01hzimndnd5636hfq9kgva8qaw"; }; dontDisableStatic = enableStatic; diff --git a/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch b/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch new file mode 100644 index 000000000000..03277838e887 --- /dev/null +++ b/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch @@ -0,0 +1,36 @@ +From b34a33255f56bbd2317c26da12d702796d67ed50 Mon Sep 17 00:00:00 2001 +From: Geo Van Osterom <george.vo@alum.rpi.edu> +Date: Thu, 22 Oct 2015 00:12:42 -0400 +Subject: [PATCH] Fix gcc 5 compile errors + +--- + src/net.c | 2 +- + src/tclhash.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/net.c b/src/net.c +index a1937de..c369fda 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -560,7 +560,7 @@ int open_address_listen(sockname_t *addr) + /* Returns a socket number for a listening socket that will accept any + * connection -- port # is returned in port + */ +-inline int open_listen(int *port) ++extern inline int open_listen(int *port) + { + int sock; + sockname_t name; +diff --git a/src/tclhash.c b/src/tclhash.c +index 9729acb..22c3d05 100644 +--- a/src/tclhash.c ++++ b/src/tclhash.c +@@ -113,7 +113,7 @@ static inline void tcl_bind_list_delete(tcl_bind_list_t *tl) + nfree(tl); + } + +-inline void garbage_collect_tclhash(void) ++extern inline void garbage_collect_tclhash(void) + { + tcl_bind_list_t *tl, *tl_next, *tl_prev; + tcl_bind_mask_t *tm, *tm_next, *tm_prev; diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index cf7fb20df68b..623b42d6fc1b 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ tcl ]; + patches = [ + # https://github.com/eggheads/eggdrop/issues/123 + ./b34a33255f56bbd2317c26da12d702796d67ed50.patch + ]; + preConfigure = '' prefix=$out/eggdrop mkdir -p $prefix diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index f6201b44b3ea..2e04ea194928 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,13 +1,13 @@ { stdenv, pkgs, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - majorVersion = "1.5"; - version = "${majorVersion}.14"; + majorVersion = "1.6"; + version = "${majorVersion}.4"; name = "haproxy-${version}"; src = fetchurl { url = "http://haproxy.1wt.eu/download/${majorVersion}/src/${name}.tar.gz"; - sha256 = "16cg1jmy2d8mq2ypwifsvhbyp4pyrj0zm0r818sx0r4hchwdsrcm"; + sha256 = "0c6j1j30xw08zdlk149s9ghvwphhbiqadkacjyvfrs8z9xh3ryp5"; }; buildInputs = [ openssl zlib ]; diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index 0f18534d2004..4a756711e8ee 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "horst-${version}"; - version = "git-2015-07-22"; + version = "git-2016-03-15"; src = fetchFromGitHub { owner = "br101"; repo = "horst"; - rev = "b62fc20b98690061522a431cb278d989e21141d8"; - sha256 = "176yma8v2bsab2ypgmgzvjg0bsbnk9sga3xpwkx33mwm6q79kd6g"; + rev = "9d5c2f387607ac1c174b59497557b8985cdb788b"; + sha256 = "0a4ixc9xbc818hw7rai24i1y8nqq2aqxqd938ax89ik4pfd2w3l0"; }; nativeBuildInputs = [ pkgconfig ]; 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/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 77d268f3a47c..5d788af1682e 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { export lsh_cv_sys_unix98_ptys=yes ''; + NIX_CFLAGS_COMPILE = "-std=gnu90"; + buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ]; meta = { diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index a414b6f092ee..307b17a7a7c0 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "minissdpd-${version}"; - version = "1.5.20160119"; + version = "1.5.20160301"; src = fetchurl { - sha256 = "0z0h2fqjlys9g08fbv0jg8l53h8cjlpdk45z4g71kwdk1m9ld8r2"; + sha256 = "053icnb25jg2vvjxirkznks3ipbbdjxac278y19rk2w9cirgi9lv"; url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/ncat/default.nix b/pkgs/tools/networking/ncat/default.nix deleted file mode 100644 index 8f81e9284b60..000000000000 --- a/pkgs/tools/networking/ncat/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, openssl}: - -stdenv.mkDerivation { - name = "ncat-0.10rc3"; - - src = fetchurl { - url = mirror://sourceforge/nmap-ncat/ncat-0.10rc3.tar.gz; - sha256 = "1yb26ipxwhqkfannji90jxi38k35fal4ffx0jm5clr1a1rndjjzb"; - }; - - patches = [./ncat-0.10rc3.patch]; - - buildInputs = [openssl]; - - CFLAGS = "-g"; - - postInstall = '' - install -D ncat $out/bin/ncat - install -D docs/man/ncat.1 $out/man/ncat.1 - ''; - - meta = { - description = "A netcat implementation with IPv6 support"; - }; -} diff --git a/pkgs/tools/networking/ncat/ncat-0.10rc3.patch b/pkgs/tools/networking/ncat/ncat-0.10rc3.patch deleted file mode 100644 index ed4c93673aa6..000000000000 --- a/pkgs/tools/networking/ncat/ncat-0.10rc3.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -urN ncat-0.10rc3/ncat_main.c ncat-0.10rc3-fixed/ncat_main.c ---- ncat-0.10rc3/ncat_main.c 2006-01-10 03:29:08.000000000 +0300 -+++ ncat-0.10rc3-fixed/ncat_main.c 2007-07-09 09:58:58.000000000 +0400 -@@ -23,6 +23,7 @@ - { - struct sockaddr_in ss; - struct sockaddr_in6 ss6; -+ struct sockaddr_storage sst; - - struct conn_state cs; - -@@ -271,7 +272,7 @@ - } - - /* resolve hostname */ -- if (!resolve(argv[optind], (struct sockaddr_storage *) &ss)) { -+ if (!resolve(argv[optind], (struct sockaddr_storage *) &sst)) { - /* host failed to resolve :( */ - fprintf(stderr, - "%s: Could not resolve target hostname %s. QUITTING.\n", -@@ -297,6 +298,8 @@ - - /* IPv6 connect() */ - if (oipv == 6) { -+ memcpy(&ss6,&sst,sizeof(ss6)); -+ - ss6.sin6_family = AF_INET6; - ss_len = sizeof(struct sockaddr_in6); - -@@ -329,6 +332,8 @@ - } - /* IPv4 connect() - default. */ - else { -+ memcpy(&ss,&sst,sizeof(ss)); -+ - ss.sin_family = AF_INET; - ss_len = sizeof(struct sockaddr_in); - diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 3705745b957f..742e6a93b655 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "netsniff-ng-${version}"; - version = "0.6.0"; + version = "0.6.1"; # Upstream recommends and supports git src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; rev = "v${version}"; - sha256 = "0vfs1vsrsbiqxp6nrdibxa60wivapjhj3sdpa4v90m3pfnqif46z"; + sha256 = "0nl0xq7dwhryrd8i5iav8fj4x9jrna0afhfim5nrx2kwp5yylnvi"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl 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 4a1efbb03356..957d5e715e78 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 @@ -79,7 +82,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/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index f90370edf516..4f27c89fa829 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "openvpn-2.3.8"; + name = "openvpn-2.3.10"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; - sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k"; + sha256 = "1xn8kv4v4h4v8mhd9k4s9rilb7k30jgb9rm7n4fwmfrm5swvbc7q"; }; patches = optional stdenv.isLinux ./systemd-notify.patch; diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 45a739247584..d091af624463 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -3,9 +3,10 @@ , httpServer ? false # build web interface for the daemon , client ? false # build amule remote gui , fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null -, pkgconfig, makeWrapper }: +, pkgconfig, makeWrapper, libX11 ? null }: assert httpServer -> libpng != null; +assert client -> libX11 != null; with stdenv; let # Enable/Disable Feature @@ -21,7 +22,8 @@ mkDerivation rec { buildInputs = [ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ] - ++ lib.optional httpServer libpng; + ++ lib.optional httpServer libpng + ++ lib.optional client libX11; patches = [ ./gcc47.patch ]; # from Gentoo diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index 4d99eaaeff66..a1b1f549ee4a 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/pkgs/tools/networking/pingtcp/default.nix @@ -13,11 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - postPatch = '' - substituteInPlace {.,pfcquirks}/CMakeLists.txt \ - --replace "-march=native" "" - ''; - enableParallelBuilding = true; doCheck = false; diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 0f5de17c71b6..bc6b2b0e5ded 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -22,6 +22,16 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ]; + installPhase = '' + mkdir -p $out/bin + make install + install -D -m 755 scripts/{pon,poff,plog} $out/bin + ''; + + postFixup = '' + substituteInPlace $out/bin/{pon,poff,plog} --replace "/usr/sbin" "$out/bin" + ''; + meta = { homepage = https://ppp.samba.org/; description = "Point-to-point implementation for Linux and Solaris"; diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 5bfb6f58bea2..e7f40ade77ea 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, perl, ppp, iproute }: +{ stdenv, fetchurl, perl, ppp, iproute, which }: stdenv.mkDerivation rec { - name = "pptp-1.7.2"; + name = "pptp-1.8.0"; src = fetchurl { url = "mirror://sourceforge/pptpclient/${name}.tar.gz"; - sha256 = "1g4lfv9vhid4v7kx1mlfcrprj3h7ny6g4kv564qzlf9abl3f12p9"; + sha256 = "1nmvwj7wd9c1isfi9i0hdl38zv55y2khy2k0v1nqlai46gcl5773"; }; patchPhase = @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { MANDIR=$out/share/man/man8 PPPDIR=$out/etc/ppp ) ''; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl which ]; meta = { description = "PPTP client for Linux"; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 0ff741ef7e2c..ec464438553f 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "s3cmd-1.5.2"; + name = "s3cmd-${version}"; + version = "1.6.1"; - src = fetchurl { - url = "mirror://sourceforge/s3tools/${name}.tar.gz"; - sha256 = "0bdl2wvh4nri4n6hpaa8s9lk98xy4a1b0l9ym54fvmxxx1j6g2pz"; + src = fetchFromGitHub { + owner = "s3tools"; + repo = "s3cmd"; + rev = "v${version}"; + sha256 = "0aan6v1qj0pdkddhhkbaky44d54irm1pa8mkn52i2j86nb2rkcf9"; }; propagatedBuildInputs = with pythonPackages; [ python_magic dateutil ]; diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index 941e1d809ba1..7242417bf2be 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/sipwise/sipsak; description = "SIP Swiss army knife"; license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ sheenobu ]; }; } 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/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index bab487f5fab8..cf755b354917 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext }: stdenv.mkDerivation rec { - version = "5.2.10"; + version = "5.2.11"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "0fqxbys3ssyplh70wjs83jsljqhmrnjic02ayaznw9m9l6fzhkkr"; + sha256 = "0yjzssy1nfj314hqbhfjljpb74c5aqvx5pbpsba5qsx7rrwy7n4z"; }; buildInputs = [ perl gettext ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 0dd6d5e09b6a..bc1472576759 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.4"; + name = "disnixos-0.4.1"; src = fetchurl { - url = http://hydra.nixos.org/build/31143419/download/3/disnixos-0.4.tar.gz; - sha256 = "0ff2k15j34b947b8pnw5xhsv9blk9kq350pcp3p3p2qclgf9ahfh"; + url = http://hydra.nixos.org/build/33130082/download/3/disnixos-0.4.1.tar.gz; + sha256 = "1r6b73qhz64z7xms6hkmm495yz0114pqa61b2qzlmzmlywhhy15b"; }; buildInputs = [ socat pkgconfig disnix getopt ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 720526d72a62..e9bb704c7725 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); stdenv.mkDerivation { - name = "dysnomia-0.5"; + name = "dysnomia-0.5.1"; src = fetchurl { - url = http://hydra.nixos.org/build/31143399/download/1/dysnomia-0.5.tar.gz; - sha256 = "1dxilzcqnv60l418k1ihyh0gkai5xgzj13s9hcbbb0yp71mv7n9x"; + url = http://hydra.nixos.org/build/33508870/download/1/dysnomia-0.5.1.tar.gz; + sha256 = "0mrbg0wirixqzx0qw8lg6mklr8npr29ghbj7lq1mygjgzr1hyhzm"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index f65b25d119d8..ad351914cb3b 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; postPatch = '' - # dpkg tries to force some dependents like debian_devscripts to use + # dpkg tries to force some dependents like debian-devscripts to use # -fstack-protector-strong - not (yet?) a good idea. Disable for now: substituteInPlace scripts/Dpkg/Vendor/Debian.pm \ --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0" diff --git a/pkgs/tools/package-management/fpm/Gemfile b/pkgs/tools/package-management/fpm/Gemfile new file mode 100644 index 000000000000..95916cf4322a --- /dev/null +++ b/pkgs/tools/package-management/fpm/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'fpm' diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock new file mode 100644 index 000000000000..a2a652c4056d --- /dev/null +++ b/pkgs/tools/package-management/fpm/Gemfile.lock @@ -0,0 +1,29 @@ +GEM + remote: https://rubygems.org/ + specs: + arr-pm (0.0.10) + cabin (> 0) + backports (3.6.8) + cabin (0.8.1) + childprocess (0.5.9) + ffi (~> 1.0, >= 1.0.11) + clamp (0.6.5) + ffi (1.9.10) + fpm (1.4.0) + arr-pm (~> 0.0.10) + backports (>= 2.6.2) + cabin (>= 0.6.0) + childprocess + clamp (~> 0.6) + ffi + json (>= 1.7.7) + json (1.8.3) + +PLATFORMS + ruby + +DEPENDENCIES + fpm + +BUNDLED WITH + 1.10.6 diff --git a/pkgs/tools/package-management/fpm/default.nix b/pkgs/tools/package-management/fpm/default.nix new file mode 100644 index 000000000000..ca2e44fcaf00 --- /dev/null +++ b/pkgs/tools/package-management/fpm/default.nix @@ -0,0 +1,18 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "fpm-${version}"; + + version = (import gemset).fpm.version; + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "Tool to build packages for multiple platforms with ease"; + homepage = https://github.com/jordansissel/fpm; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix new file mode 100644 index 000000000000..0751fdc48bcb --- /dev/null +++ b/pkgs/tools/package-management/fpm/gemset.nix @@ -0,0 +1,66 @@ +{ + arr-pm = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; + type = "gem"; + }; + version = "0.0.10"; + }; + backports = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k"; + type = "gem"; + }; + version = "3.6.8"; + }; + cabin = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06b5ri2629ad9xjc419xswz17zli90v8x640k2sd6v2yb90zkr1b"; + type = "gem"; + }; + version = "0.8.1"; + }; + childprocess = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1is253wm9k2s325nfryjnzdqv9flq8bm4y2076mhdrncxamrh7r2"; + type = "gem"; + }; + version = "0.5.9"; + }; + clamp = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gpz9jvg1gpr8xmfqd35gvyzsvmjvlvwm2sq3pyhml3i84a6qjrq"; + type = "gem"; + }; + version = "0.6.5"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj"; + type = "gem"; + }; + version = "1.9.10"; + }; + fpm = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ljifrfzjirad5ql5yvs1prpbivsjnwdbhzlqb8r7sdidd9kwakz"; + type = "gem"; + }; + version = "1.4.0"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + type = "gem"; + }; + version = "1.8.3"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix deleted file mode 100644 index 1d5d995a1896..000000000000 --- a/pkgs/tools/package-management/guix/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ fetchurl, stdenv, guile, libgcrypt, sqlite, bzip2, pkgconfig }: - -let - # Getting the bootstrap Guile binary. This is normally performed by Guix's build system. - base_url = arch: - "http://alpha.gnu.org/gnu/guix/bootstrap/${arch}-linux/20130105/guile-2.0.7.tar.xz"; - boot_guile = { - i686 = fetchurl { - url = base_url "i686"; - sha256 = "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c"; - }; - x86_64 = fetchurl { - url = base_url "x86_64"; - sha256 = "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c"; - }; - }; -in stdenv.mkDerivation rec { - name = "guix-0.3"; - - src = fetchurl { - url = "ftp://alpha.gnu.org/gnu/guix/${name}.tar.gz"; - sha256 = "0xpfdmlfkkpmgrb8lpaqs5wxx31m4jslajs6b9waz5wp91zk7fix"; - }; - - configureFlags = - [ "--localstatedir=/nix/var" - "--with-libgcrypt-prefix=${libgcrypt}" - ]; - - preBuild = - # Copy the bootstrap Guile tarballs like Guix's makefile normally does. - '' cp -v "${boot_guile.i686}" gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz - cp -v "${boot_guile.x86_64}" gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ guile libgcrypt sqlite bzip2 ]; - - doCheck = true; - enableParallelBuilding = true; - - meta = { - description = "Functional package manager with a Scheme interface"; - - longDescription = '' - GNU Guix is a purely functional package manager for the GNU system, and a distribution thereof. - - In addition to standard package management features, Guix supports - transactional upgrades and roll-backs, unprivileged package management, - per-user profiles, and garbage collection. - - It provides Guile Scheme APIs, including high-level embedded - domain-specific languages (EDSLs), to describe how packages are built - and composed. - - A user-land free software distribution for GNU/Linux comes as part of - Guix. - - Guix is based on the Nix package manager. - ''; - - license = stdenv.lib.licenses.gpl3Plus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; - - homepage = http://www.gnu.org/software/guix; - }; -} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 77b27dbf3dc6..16078906bc2b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -96,15 +96,12 @@ in rec { }; }; - nixUnstable = nixStable; - /* nixUnstable = lib.lowPrio (common rec { - name = "nix-1.11pre4379_786046c"; + name = "nix-1.12pre4523_3b81b26"; src = fetchurl { - url = "http://hydra.nixos.org/build/30375557/download/4/${name}.tar.xz"; - sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5"; + url = "http://hydra.nixos.org/build/33598573/download/4/${name}.tar.xz"; + sha256 = "0469zv09m85824w4vqj2ag0nciq51xvrvsys7bd5v4nrxihk9991"; }; }); - */ } diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index c8ea45a39dbe..f4c92ac701f4 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -13,12 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig autoconf automake openssl libgsf gmp ]; - patchPhase = '' - substituteInPlace Makefile.in \ - --replace '-march=native' "" \ - --replace '-mtune=native' "" - ''; - installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 0ea5bc62fd4e..08fee5c8c149 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -3,20 +3,22 @@ stdenv.mkDerivation rec { name = "ecryptfs-${version}"; - version = "108"; + version = "110"; src = fetchurl { url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz"; - sha256 = "1pfpzc907m4qi5h2rxmkqq072c6g22pik2rilj4bl4qishd8p0sj"; + sha256 = "1x03m9s409fmzjcnsa9f9ghzkpxcnj9irj05rx7jlwm5cach0lqs"; }; - #TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir; + # TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir; + wrapperDir = "/var/setuid-wrappers"; + postPatch = '' FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)" for file in $FILES; do substituteInPlace "$file" \ - --replace /sbin/mount.ecryptfs_private /var/setuid-wrappers/mount.ecryptfs_private \ - --replace /sbin/umount.ecryptfs_private /var/setuid-wrappers/umount.ecryptfs_private \ + --replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \ + --replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \ --replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \ --replace /sbin/umount.ecryptfs $out/sbin/umount.ecryptfs \ --replace /usr/bin/ecryptfs-rewrite-file $out/bin/ecryptfs-rewrite-file \ @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \ --replace /bin/mount ${utillinux}/bin/mount \ --replace /bin/umount ${utillinux}/bin/umount \ - --replace /sbin/unix_chkpwd /var/setuid-wrappers/unix_chkpwd \ + --replace /sbin/unix_chkpwd ${wrapperDir}/unix_chkpwd \ --replace /bin/bash ${bash}/bin/bash done ''; @@ -50,8 +52,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Enterprise-class stacked cryptographic filesystem"; - license = licenses.gpl2Plus; + license = licenses.gpl2Plus; maintainers = [ maintainers.obadz ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 9443eac01da7..c886b10e2201 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchzip, python, pythonPackages, unzip, gamin }: +{ stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.9.3"; in +let version = "0.9.4"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; namePrefix = ""; - src = fetchzip { - name = "fail2ban-${version}-src"; - url = "https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"; - sha256 = "1pwgr56i6l6wh2ap8b5vknxgsscfzjqy2nmd1c3vzdii5kf72j0f"; + src = fetchFromGitHub { + owner = "fail2ban"; + repo = "fail2ban"; + rev = version; + sha256 = "1m8gqj35kwrn30rqwd488sgakaisz22xa5v9llvz6gwf4f7ps0a9"; }; - buildInputs = [ unzip ]; - propagatedBuildInputs = [ python.modules.sqlite3 gamin ] ++ (stdenv.lib.optional stdenv.isLinux pythonPackages.systemd); @@ -48,7 +47,7 @@ pythonPackages.buildPythonApplication { homepage = http://www.fail2ban.org/; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco lovek323 ]; + maintainers = with maintainers; [ eelco lovek323 fpletz ]; platforms = platforms.linux ++ platforms.darwin; }; } 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/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index dc86c6e420ef..0af041e63df9 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libiconv, npth -, autoreconfHook, gettext, texinfo, pcsclite +, gettext, texinfo, pcsclite # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. @@ -20,25 +20,24 @@ stdenv.mkDerivation rec { sha256 = "06mn2viiwsyq991arh5i5fhr9jyxq2bi0jkdj7ndfisxihngpc5p"; }; - postPatch = stdenv.lib.optionalString stdenv.isLinux '' - sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - ''; #" fix Emacs syntax highlighting :-( - - postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c"; - buildInputs = [ - pkgconfig libgcrypt libassuan libksba libiconv npth - autoreconfHook gettext texinfo + pkgconfig libgcrypt libassuan libksba libiconv npth gettext texinfo readline libusb gnutls adns openldap zlib bzip2 ]; + postPatch = stdenv.lib.optionalString stdenv.isLinux '' + sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + ''; #" fix Emacs syntax highlighting :-( + configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry"; + postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c"; + meta = with stdenv.lib; { homepage = http://gnupg.org; description = "a complete and free implementation of the OpenPGP standard"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington simons ]; platforms = platforms.all; }; } 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/haka/default.nix b/pkgs/tools/security/haka/default.nix index d040aaa6aea8..8f856213e8cf 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha1 = "87625ed32841cc0b3aa92aa49397ce71ce434bc2"; }; + NIX_CFLAGS_COMPILE = "-Wno-error"; + preConfigure = '' sed -i 's,/etc,'$out'/etc,' src/haka/haka.c sed -i 's,/etc,'$out'/etc,' src/haka/CMakeLists.txt 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/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index dfde2b57aa69..ef00a8538a96 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "5.5.2"; + version = "5.5.4"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "1zb5fssy9c37cb0ab083f2jifw47wnck32nc6zpijmqm059yccxc" else - "1gjc6prx3n769nj4gzhfjrb2qpw3ypvsb3pp0a130db1ssgnzqqr"; + "0sjx2r7z7s3x1ygs9xak1phng13jcf4d5pcfyfrfsrd8kb1yn8xa" else + "0w9wk9hk57hyhhx7l4sr2x64ki9882fr6py2can1slr7kbb4mhpb"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/tools/security/tpm-tools/03-fix-bool-error-parseStringWithValues.patch b/pkgs/tools/security/tpm-tools/03-fix-bool-error-parseStringWithValues.patch new file mode 100644 index 000000000000..87f7b8e815b3 --- /dev/null +++ b/pkgs/tools/security/tpm-tools/03-fix-bool-error-parseStringWithValues.patch @@ -0,0 +1,30 @@ +Title: Fix boolean comparison error (and FTBFS with gcc-5) +Date: 2015-06-28 +Author: Pierre Chifflier <pollux@debian.org> +Bug-Debian: http://bugs.debian.org/778147 +Index: tpm-tools/src/tpm_mgmt/tpm_nvcommon.c +=================================================================== +--- tpm-tools.orig/src/tpm_mgmt/tpm_nvcommon.c ++++ tpm-tools/src/tpm_mgmt/tpm_nvcommon.c +@@ -140,8 +140,8 @@ int parseStringWithValues(const char *aA + aArg); + return -1; + } +- if (!aArg[offset+numbytes] == '|' && +- !aArg[offset+numbytes] == 0) { ++ if (!(aArg[offset+numbytes] == '|' || ++ aArg[offset+numbytes] == 0)) { + logError(_("Illegal character following " + "hexadecimal number in %s\n"), + aArg + offset); +@@ -164,8 +164,8 @@ int parseStringWithValues(const char *aA + return -1; + } + +- if (!aArg[offset+numbytes] == '|' && +- !aArg[offset+numbytes] == 0) { ++ if (!(aArg[offset+numbytes] == '|' || ++ aArg[offset+numbytes] == 0)) { + logError(_("Illegal character following decimal " + "number in %s\n"), + aArg + offset); diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index a17bff9e32c8..264beae9dc4b 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ trousers openssl opencryptoki ]; + patches = [ ./03-fix-bool-error-parseStringWithValues.patch ]; + meta = with stdenv.lib; { description = "Management tools for TPM hardware"; longDescription = '' 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/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index a1d676d708df..5f42e39871a4 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -30,9 +30,9 @@ , varnish ? null , yajl ? null }: - stdenv.mkDerivation rec { - name = "collectd-5.5.0"; + version = "5.5.0"; + name = "collectd-${version}"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; diff --git a/pkgs/tools/system/foreman/Gemfile b/pkgs/tools/system/foreman/Gemfile new file mode 100644 index 000000000000..e25e6d790fc0 --- /dev/null +++ b/pkgs/tools/system/foreman/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "foreman" diff --git a/pkgs/tools/system/foreman/Gemfile.lock b/pkgs/tools/system/foreman/Gemfile.lock new file mode 100644 index 000000000000..8fa9a213ab28 --- /dev/null +++ b/pkgs/tools/system/foreman/Gemfile.lock @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + foreman (0.78.0) + thor (~> 0.19.1) + thor (0.19.1) + +PLATFORMS + ruby + +DEPENDENCIES + foreman + +BUNDLED WITH + 1.11.2 diff --git a/pkgs/tools/system/foreman/default.nix b/pkgs/tools/system/foreman/default.nix new file mode 100644 index 000000000000..594947c265a3 --- /dev/null +++ b/pkgs/tools/system/foreman/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, ruby, bundlerEnv, makeWrapper }: + +stdenv.mkDerivation rec { + name = "foreman-${env.gems.foreman.version}"; + + env = bundlerEnv { + inherit ruby; + name = "${name}-gems"; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + + phases = ["installPhase"]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/foreman $out/bin/foreman + ''; + + meta = with lib; { + description = "Process manager for applications with multiple components"; + homepage = https://github.com/ddollar/foreman; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + platforms = ruby.meta.platforms; + }; +} diff --git a/pkgs/tools/system/foreman/gemset.nix b/pkgs/tools/system/foreman/gemset.nix new file mode 100644 index 000000000000..b35bd15c9749 --- /dev/null +++ b/pkgs/tools/system/foreman/gemset.nix @@ -0,0 +1,18 @@ +{ + thor = { + version = "0.19.1"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + }; + }; + foreman = { + version = "0.78.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix new file mode 100644 index 000000000000..9301107d2db9 --- /dev/null +++ b/pkgs/tools/system/htop/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, stdenv, ncurses, +IOKit }: + +stdenv.mkDerivation rec { + name = "htop-${version}"; + version = "2.0.1"; + + src = fetchurl { + sha256 = "0rjn9ybqx5sav7z4gn18f1q6k23nmqyb6yydfgghzdznz9nn447l"; + url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; + }; + + buildInputs = + [ ncurses ] ++ + lib.optionals stdenv.isDarwin [ IOKit ]; + + meta = with stdenv.lib; { + description = "An interactive process viewer for Linux"; + homepage = https://hisham.hm/htop/; + license = licenses.gpl2Plus; + platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin; + maintainers = with maintainers; [ rob simons relrod nckx ]; + }; +} 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/ts/default.nix b/pkgs/tools/system/ts/default.nix index ff2fdfefb059..8e65eda8f540 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -3,7 +3,7 @@ sendmailPath ? "/var/setuid-wrappers/sendmail" }: stdenv.mkDerivation rec { - name = "ts-0.7.4"; + name = "ts-0.7.6"; installPhase=''make install "PREFIX=$out"''; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://viric.name/~viric/soft/ts/${name}.tar.gz"; - sha256 = "042r9a09300v4fdrw4r60g5xi25v5m6g12kvvr6pcsm9qnfqyqqs"; + sha256 = "07b61sx3hqpdxlg5a1xrz9sxww9yqdix3bmr0sm917r3rzk87lwk"; }; meta = with stdenv.lib; { 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/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix new file mode 100644 index 000000000000..e47369f47559 --- /dev/null +++ b/pkgs/tools/text/ansifilter/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgconfig, boost, lua }: +let version = "1.15"; + pkgsha = "65dc20cc1a03d4feba990f830186404c90462d599e5f4b37610d4d822d67aec4"; +in stdenv.mkDerivation { + name = "ansifilter-${version}"; + buildInputs = [ + pkgconfig boost lua + ]; + src = fetchurl { + url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; + sha256 = pkgsha; + }; + meta = { + description = "Tool to convert ANSI to other formats"; + longDescription = '' + Tool to remove ANSI or convert them to another format + (HTML, TeX, LaTeX, RTF, Pango or BBCode) + ''; + + license = stdenv.lib.licenses.gpl1; + maintainers = [ stdenv.lib.maintainers.Adjective-Object ]; + }; + + makeFlags="PREFIX=$(out) conf_dir=$(out)/etc/ansifilter/"; + +} + 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/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix new file mode 100644 index 000000000000..8469a151aa09 --- /dev/null +++ b/pkgs/tools/text/icdiff/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub, buildPythonApplication }: + +buildPythonApplication rec { + name = "icdiff-${version}"; + version = "1.7.3"; + + src = fetchFromGitHub { + owner = "jeffkaufman"; + repo = "icdiff"; + rev = "release-${version}"; + sha256 = "1k7dlf2i40flsrvkma1k1vii9hsjwdmwryx65q0n0yj4frv7ky6k"; + }; + + meta = with stdenv.lib; { + homepage = https://www.jefftk.com/icdiff; + description = "Side-by-side highlighted command line diffs"; + maintainers = with maintainers; [ aneeshusa ]; + license = licenses.psfl; + }; +} 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/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix index 5fe52ba07baf..fbf4adde2ae7 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/default.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix @@ -1,29 +1,7 @@ -/* (new) TeX Live user docs - - Basic usage: just pull texlive.combined.scheme-basic - for an environment with basic LaTeX support. - There are all the schemes as defined upstream (with tiny differences, perhaps). - - You can compose your own collection like this: - texlive.combine { - inherit (texlive) scheme-small collection-langkorean algorithms cm-super; - } - - By default you only get executables and files needed during runtime, - and a little documentation for the core packages. - To change that, you need to add `pkgFilter` function to `combine`. - texlive.combine { - # inherit (texlive) whatever-you-want; - pkgFilter = pkg: - pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "cm-super"; - # elem tlType [ "run" "bin" "doc" "source" ] - # there are also other attributes: version, name - } - - Known bugs: - * some tools are still missing, e.g. luajittex - * some apps aren't packaged/tested yet (xdvi, asymptote, biber, etc.) - * feature/bug: when a package is rejected by pkgFilter, - its dependencies are still propagated - * in case of any bugs or feature requests, file a github issue and /cc @vcunat +/* TeX Live user docs + - source: ../../../../../doc/languages-frameworks/texlive.xml + - current html: http://nixos.org/nixpkgs/manual/#sec-language-texlive */ - { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min , makeWrapper, perl, python, ruby 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/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix new file mode 100644 index 000000000000..e995f9e3a4f6 --- /dev/null +++ b/pkgs/tools/video/yamdi/default.nix @@ -0,0 +1,31 @@ +{ + stdenv, + fetchurl, +}: + +stdenv.mkDerivation rec { + name = "yamdi-${version}"; + version = "1.9"; + + # Source repo is also available here: + # https://github.com/ioppermann/yamdi + src = fetchurl { + url = "mirror://sourceforge/yamdi/yamdi-${version}.tar.gz"; + sha256 = "4a6630f27f6c22bcd95982bf3357747d19f40bd98297a569e9c77468b756f715"; + }; + + buildFlags = "CC=cc"; + + installPhase = '' + install -D {,$out/bin/}yamdi + install -D {,$out/share/man/}man1/yamdi.1 + ''; + + meta = with stdenv.lib; { + description = "Yet Another MetaData Injector for FLV"; + homepage = http://yamdi.sourceforge.net/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.ryanartecona ]; + }; +} 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 = [ ]; + }; } |