diff options
Diffstat (limited to 'pkgs/development')
29 files changed, 847 insertions, 323 deletions
diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix new file mode 100644 index 000000000000..65f0481a8010 --- /dev/null +++ b/pkgs/development/compilers/carp/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }: + +haskellPackages.mkDerivation rec { + + pname = "carp"; + version = "unstable-2018-09-15"; + + src = fetchFromGitHub { + owner = "carp-lang"; + repo = "Carp"; + rev = "cf9286c35cab1c170aa819f7b30b5871b9e812e6"; + sha256 = "1k6kdxbbaclhi40b9p3fgbkc1x6pc4v0029xjm6gny6pcdci2cli"; + }; + + buildDepends = [ makeWrapper ]; + + executableHaskellDepends = with haskellPackages; [ + HUnit blaze-markup blaze-html split cmdargs + ]; + + isExecutable = true; + + # The carp executable must know where to find its core libraries and other + # files. Set the environment variable CARP_DIR so that it points to the root + # of the Carp repo. See: + # https://github.com/carp-lang/Carp/blob/master/docs/Install.md#setting-the-carp_dir + # + # Also, clang must be available run-time because carp is compiled to C which + # is then compiled with clang. + postInstall = '' + wrapProgram $out/bin/carp \ + --set CARP_DIR $src \ + --prefix PATH : ${clang}/bin + wrapProgram $out/bin/carp-header-parse \ + --set CARP_DIR $src \ + --prefix PATH : ${clang}/bin + ''; + + description = "A statically typed lisp, without a GC, for real-time applications"; + homepage = https://github.com/carp-lang/Carp; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ jluttine ]; + + # Windows not (yet) supported. + platforms = with stdenv.lib.platforms; unix ++ darwin; + +} diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 4a520471f867..f363c6fdb5ee 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, emscripten }: +{ stdenv, lib, fetchFromGitHub, emscripten +, enableJsonnetJs ? !stdenv.isDarwin +}: let version = "0.11.2"; in @@ -13,16 +15,17 @@ stdenv.mkDerivation { sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym"; }; - buildInputs = [ emscripten ]; + buildInputs = if enableJsonnetJs then [ emscripten ] else [ ]; enableParallelBuilding = true; - makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache'' ''all'']; + makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache''] ++ + (if enableJsonnetJs then ["all"] else ["jsonnet" "libjsonnet.so" "libjsonnet++.so"]); installPhase = '' mkdir -p $out/bin $out/lib $out/share/ cp jsonnet $out/bin/ - cp libjsonnet.so $out/lib/ + cp libjsonnet*.so $out/lib/ cp -a doc $out/share/doc cp -a include $out/include ''; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix new file mode 100644 index 000000000000..54cb7c50e407 --- /dev/null +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, coq, bignums }: + +let params = + { + "8.7" = { + version = "8.7.2"; + sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; + }; + "8.8" = { + version = "8.8"; + sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; + }; + }; + param = params."${coq.coq-version}" +; in + +stdenv.mkDerivation rec { + + inherit (param) version; + name = "coq${coq.coq-version}-coqprime-${version}"; + + src = fetchFromGitHub { + owner = "thery"; + repo = "coqprime"; + rev = "v${version}"; + inherit (param) sha256; + }; + + buildInputs = [ coq ]; + + propagatedBuildInputs = [ bignums ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + description = "Library to certify primality using Pocklington certificate and Elliptic Curve Certificate"; + license = licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (coq.meta) platforms; + inherit (src.meta) homepage; + }; + + passthru = { + compatibleCoqVersions = v: builtins.hasAttr v params; + }; +} diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 9b6f80e0f837..3faa4c268ac0 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -170,6 +170,7 @@ go.stdenv.mkDerivation ( runHook postBuild ''; + doCheck = args.doCheck or false; checkPhase = args.checkPhase or '' runHook preCheck diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index 010c523507fd..35bcd7bfc2f3 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "token readers" of a standard Scheme readers. For example, it is used to implement Skribilo's R5RS-derived document syntax. ''; - homepage = https://www.gnu.org/software/guile-reader; + homepage = https://www.nongnu.org/guile-reader/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.gnu; diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index bd4270e8b935..12d35e270209 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "0.16"; + version = "0.16.1"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "0kqfx6742vbyyr8glqm5bkvj0z0y0dkaajlw10p3pzidrc17767r"; + sha256 = "17dv5r3ygmbwwh7k8qaffp2965sv165b47i53ymc0gbfcwr6cy2n"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 1fe3bcf6cede..642063220b2c 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat -, libiconv +, libiconv, libxml2 , netcdfSupport ? true, netcdf, hdf5, curl }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite - libspatialite poppler hdf4 qhull giflib expat ] + libspatialite poppler hdf4 qhull giflib expat libxml2 ] ++ (with pythonPackages; [ python numpy wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { "--with-proj=${proj}" # optional "--with-geos=${geos}/bin/geos-config"# optional "--with-hdf4=${hdf4.dev}" # optional + "--with-xml2=${libxml2.dev}/bin/xml2-config" # optional (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index 2671199ab0e0..99e0ab0a4767 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -14,16 +14,16 @@ stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ cmake perl ]; - meta = { + meta = with stdenv.lib; { description = "A library to implement a test protocol"; longDescription = '' libtap is a library to implement the Test Anything Protocol for C originally created by Nik Clayton. This is a maintenance branch by Shlomi Fish. ''; - homepage = http://www.shlomifish.org/open-source/projects/libtap/; + homepage = https://www.shlomifish.org/open-source/projects/libtap/; license = licenses.bsd3; maintainers = [ maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix new file mode 100644 index 000000000000..3eb4ddaab693 --- /dev/null +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2 }: + +stdenv.mkDerivation rec { + name = "apfel-${version}"; + version = "3.0.3"; + + src = fetchFromGitHub { + owner = "scarrazza"; + repo = "apfel"; + rev = version; + sha256 = "13dvcc5ba6djflrcy5zf5ikaw8s78zd8ac6ickc0hxhbmx1gjb4j"; + }; + + buildInputs = [ gfortran lhapdf python2 ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A PDF Evolution Library"; + license = licenses.gpl3; + homepage = http://apfel.mi.infn.it/; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix new file mode 100644 index 000000000000..6509b04f0113 --- /dev/null +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root }: + +stdenv.mkDerivation rec { + name = "apfelgrid-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "nhartland"; + repo = "APFELgrid"; + rev = "v${version}"; + sha256 = "0l0cyxd00kmb5aggzwsxg83ah0qiwav0shbxkxwrz3dvw78n89jk"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ apfel applgrid lhapdf root ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Ultra-fast theory predictions for collider observables"; + license = licenses.mit; + homepage = http://nhartland.github.io/APFELgrid/; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/physics/applgrid/bad_code.patch b/pkgs/development/libraries/physics/applgrid/bad_code.patch new file mode 100644 index 000000000000..c1c8f618fbb3 --- /dev/null +++ b/pkgs/development/libraries/physics/applgrid/bad_code.patch @@ -0,0 +1,39 @@ +diff --git a/appl_grid/appl_grid.h b/appl_grid/appl_grid.h +index 5059622..a0651c9 100644 +--- a/appl_grid/appl_grid.h ++++ b/appl_grid/appl_grid.h +@@ -56,7 +56,7 @@ public: + class exception : public std::exception { + public: + exception(const std::string& s) { std::cerr << what() << " " << s << std::endl; }; +- exception(std::ostream& s) { std::cerr << what() << " " << s << std::endl; }; ++ exception(std::ostream& s) { s << what() << " " << std::endl; }; + virtual const char* what() const throw() { return "appl::grid::exception"; } + }; + +diff --git a/appl_grid/appl_pdf.h b/appl_grid/appl_pdf.h +index c71fd84..2525527 100644 +--- a/appl_grid/appl_pdf.h ++++ b/appl_grid/appl_pdf.h +@@ -51,7 +51,7 @@ public: + class exception : public std::exception { + public: + exception(const std::string& s="") { std::cerr << what() << " " << s << std::endl; }; +- exception(std::ostream& s) { std::cerr << what() << " " << s << std::endl; }; ++ exception(std::ostream& s) { s << " " << std::endl; }; + const char* what() const throw() { return "appl::appl_pdf::exception "; } + }; + +diff --git a/src/appl_igrid.h b/src/appl_igrid.h +index d25288e..be354df 100644 +--- a/src/appl_igrid.h ++++ b/src/appl_igrid.h +@@ -52,7 +52,7 @@ private: + class exception { + public: + exception(const std::string& s) { std::cerr << s << std::endl; }; +- exception(std::ostream& s) { std::cerr << s << std::endl; }; ++ exception(std::ostream& s) { s << std::endl; }; + }; + + typedef double (igrid::*transform_t)(double) const; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix new file mode 100644 index 000000000000..1ad5dcb8b25b --- /dev/null +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }: + +stdenv.mkDerivation rec { + name = "applgrid-${version}"; + version = "1.4.70"; + + src = fetchurl { + url = "https://www.hepforge.org/archive/applgrid/${name}.tgz"; + sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; + }; + + buildInputs = [ gfortran hoppet lhapdf root5 ]; + + patches = [ + ./bad_code.patch + ]; + + preConfigure = '' + substituteInPlace src/Makefile.in \ + --replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib" + '' + (if stdenv.isDarwin then '' + substituteInPlace src/Makefile.in \ + --replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib" + '' else ""); + + enableParallelBuilding = false; # broken + + # Install private headers required by APFELgrid + postInstall = '' + for header in src/*.h; do + install -Dm644 "$header" "$out"/include/appl_grid/"`basename $header`" + done + ''; + + meta = with stdenv.lib; { + description = "The APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics"; + license = licenses.gpl3; + homepage = http://applgrid.hepforge.org; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix new file mode 100644 index 000000000000..55714afbdce9 --- /dev/null +++ b/pkgs/development/libraries/physics/hoppet/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, gfortran }: + +stdenv.mkDerivation rec { + name = "hoppet-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = "https://hoppet.hepforge.org/downloads/${name}.tgz"; + sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz"; + }; + + buildInputs = [ gfortran ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Higher Order Perturbative Parton Evolution Toolkit"; + license = licenses.gpl2; + homepage = https://hoppet.hepforge.org; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix new file mode 100644 index 000000000000..a608a7f6b0f7 --- /dev/null +++ b/pkgs/development/libraries/physics/mela/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, gfortran }: + +stdenv.mkDerivation rec { + name = "mela-${version}"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "vbertone"; + repo = "MELA"; + rev = version; + sha256 = "01sgd4mwx4n58x95brphp4dskqkkx8434bvsr38r5drg9na5nc9y"; + }; + + buildInputs = [ gfortran ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "a Mellin Evolution LibrAry"; + license = licenses.gpl3; + homepage = https://github.com/vbertone/MELA; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix new file mode 100644 index 000000000000..1a3334562641 --- /dev/null +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, gfortran }: + +stdenv.mkDerivation rec { + name = "QCDNUM-${version}"; + version = "17-01-14"; + + src = fetchurl { + url = "http://www.nikhef.nl/user/h24/qcdnum-files/download/qcdnum${builtins.replaceStrings ["-"] [""] version}.tar.gz"; + sha256 = "199s6kgmszxgjzd9214mpx3kyplq2q6987sii67s5xkg10ynyv31"; + }; + + nativeBuildInputs = [ gfortran ]; + + enableParallelBuilding = true; + + meta = { + description = "QCDNUM is a very fast QCD evolution program written in FORTRAN77"; + license = stdenv.lib.licenses.gpl3; + homepage = https://www.nikhef.nl/~h24/qcdnum/index.html; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 0ebf299a8bfb..55af1d8573a1 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "proj-4.9.3"; + name = "proj-5.2.0"; src = fetchurl { - url = https://download.osgeo.org/proj/proj-4.9.3.tar.gz; - sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139"; + url = https://download.osgeo.org/proj/proj-5.2.0.tar.gz; + sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg"; }; doCheck = stdenv.is64bit; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 79deb482161f..456c28503e81 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -14,14 +14,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libjpeg ]; - patches = [ - (fetchpatch { - name = "CVE-2018-9918.patch"; - url = "https://github.com/qpdf/qpdf/commit/b4d6cf6836ce025ba1811b7bbec52680c7204223"; - sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; - }) - ]; - postPatch = '' patchShebangs qpdf/fix-qdf ''; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 19d63d89834e..ad4d4c017376 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -1,17 +1,25 @@ { stdenv -, fetchurl +, lib +, fetchFromGitLab +, fetchpatch , gmp , python2 +, tune ? false # tune to hardware, impure }: stdenv.mkDerivation rec { - version = "0.9"; + version = "0.9.1"; pname = "zn_poly"; name = "${pname}-${version}"; - src = fetchurl { - url = "http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/releases/zn_poly-${version}.tar.gz"; - sha256 = "1kxl25av7i3v68k32hw5bayrfcvmahmqvs97mlh9g238gj4qb851"; + # sage has picked up the maintenance (bug fixes and building, not development) + # from the original, now unmaintained project which can be found at + # http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/ + src = fetchFromGitLab { + owner = "sagemath"; + repo = "zn_poly"; + rev = version; + sha256 = "0ra5vy585bqq7g3317iw6fp44iqgqvds3j0l1va6mswimypq4vxb"; }; buildInputs = [ @@ -22,27 +30,42 @@ stdenv.mkDerivation rec { python2 # needed by ./configure to create the makefile ]; - libname = "libzn_poly${stdenv.targetPlatform.extensions.sharedLibrary}"; + # name of library file ("libzn_poly.so") + libbasename = "libzn_poly"; + libext = "${stdenv.targetPlatform.extensions.sharedLibrary}"; makeFlags = [ "CC=cc" ]; # Tuning (either autotuning or with hand-written paramters) is possible # but not implemented here. # It seems buggy anyways (see homepage). - buildFlags = [ "all" libname ]; + buildFlags = [ "all" "${libbasename}${libext}" ]; + configureFlags = lib.optionals (!tune) [ + "--disable-tuning" + ]; + + patches = [ + # fix format-security by not passing variables directly to printf + # https://gitlab.com/sagemath/zn_poly/merge_requests/1 + (fetchpatch { + name = "format-security.patch"; + url = "https://gitlab.com/timokau/zn_poly/commit/1950900a80ec898d342b8bcafa148c8027649766.patch"; + sha256 = "1gks9chvsfpc6sg5h3nqqfia4cgvph7jmj9dw67k7dk7kv9y0rk1"; + }) + ]; # `make install` fails to install some header files and the lib file. installPhase = '' mkdir -p "$out/include/zn_poly" mkdir -p "$out/lib" - cp "${libname}" "$out/lib" + cp "${libbasename}"*"${libext}" "$out/lib" cp include/*.h "$out/include/zn_poly" ''; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/; description = "Polynomial arithmetic over Z/nZ"; license = with licenses; [ gpl3 ]; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 22b5cd81f870..2cfb11bffbca 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -6,16 +6,16 @@ let in stdenv.mkDerivation rec { - version = "26.0.2"; + version = "28.0.1"; name = "android-platform-tools-r${version}"; src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "0695npvxljbbh8xwfm65k34fcpyfkzvfkssgnp46wkmnq8w5mcb3"; + sha256 = "14kkr9xib5drjjd0bclm0jn3f5xlmlg652mbv4xd83cv7a53a49y"; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip"; - sha256 = "0gy7apw9pmnnm41z6ywglw5va4ghmny4j57778may4q7ar751l56"; + sha256 = "117syrddq1haicwyjzd1p4pfphj0wldjs7w10fpk3n2b7yp37j1v"; } else throw "System ${stdenv.hostPlatform.system} not supported!"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") '' - for i in adb dmtracedump fastboot hprof-conv sqlite3 + for i in adb dmtracedump e2fsdroid fastboot hprof-conv make_f2fs mke2fs sload_f2fs sqlite3 do patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:`pwd`/lib64 $i diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index a754f3bef61e..40d70f198abf 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -104,6 +104,7 @@ , "sinopia" , "sloc" , "smartdc" +, "snyk" , "socket.io" , "stackdriver-statsd-backend" , "statsd" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 287623d03e43..c419a0db44e1 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -58,22 +58,22 @@ let sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw=="; }; }; - "@babel/runtime-7.1.1" = { + "@babel/runtime-7.1.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.1.tgz"; - sha512 = "5ruvezIb2ccAGj538SRRz6YyZOAVubhUfOq+57LuGd9ADAdiqGWYk1DQ0ReVEdvaAfZfS9+kK3N+BwAuJlzzjQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.2.tgz"; + sha512 = "Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg=="; }; }; - "@babel/runtime-corejs2-7.1.1" = { + "@babel/runtime-corejs2-7.1.2" = { name = "_at_babel_slash_runtime-corejs2"; packageName = "@babel/runtime-corejs2"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.1.1.tgz"; - sha512 = "J36jrmX2YeGHx+mIF/KV6By0XS4uCxt8JveYnx4LZaCkXDLopanQmbH7kp4VhSolU6nz3cggwCfkbFWwfxQI3Q=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.1.2.tgz"; + sha512 = "drxaPByExlcRDKW4ZLubUO4ZkI8/8ax9k9wve1aEthdLKFzjB7XRkOQ0xoTIWGxqdDnWDElkjYq77bt7yrcYJQ=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -1048,13 +1048,13 @@ let sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA=="; }; }; - "@types/node-10.11.2" = { + "@types/node-10.11.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.11.2"; + version = "10.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.11.2.tgz"; - sha512 = "XubfQDIg88PGJ7netQPf3QOKHF7Xht4WXGtg5W7cGBeQs9ETbYKwfchR9o+tRRA9iLTQ7nAre85M205JbYsjJA=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.11.3.tgz"; + sha512 = "3AvcEJAh9EMatxs+OxAlvAEs7OTy6AG94mcH1iqyVDwVVndekLxzwkWQ/Z4SDbY6GO2oyUXyWW8tQ4rENSSQVQ=="; }; }; "@types/node-8.10.30" = { @@ -1561,6 +1561,15 @@ let sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; + "acorn-6.0.2" = { + name = "acorn"; + packageName = "acorn"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-6.0.2.tgz"; + sha512 = "GXmKIvbrN3TV7aVqAzVFaMW8F8wzVX7voEBRO3bDA64+EX37YSayggRJP5Xig6HYHBkWKpFg9W5gg6orklubhg=="; + }; + }; "acorn-dynamic-import-3.0.0" = { name = "acorn-dynamic-import"; packageName = "acorn-dynamic-import"; @@ -1606,13 +1615,22 @@ let sha512 = "JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw=="; }; }; - "acorn-node-1.5.2" = { + "acorn-node-1.6.0" = { name = "acorn-node"; packageName = "acorn-node"; - version = "1.5.2"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.6.0.tgz"; + sha512 = "ZsysjEh+Y3i14f7YXCAKJy99RXbd56wHKYBzN4FlFtICIZyFpYwK6OwNJhcz8A/FMtxoUZkJofH1v9KIfNgWmw=="; + }; + }; + "acorn-walk-6.1.0" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz"; - sha512 = "krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg=="; + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.0.tgz"; + sha512 = "ugTb7Lq7u4GfWSqqpwE0bGyoBZNMTok/zDBXxfEG0QM50jNlGhIWjRC1pPN7bvV1anhF+bs+/gNcRw+o55Evbg=="; }; }; "active-x-obfuscator-0.0.1" = { @@ -3006,7 +3024,7 @@ let packageName = "async"; version = "0.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz"; + url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz"; sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; }; }; @@ -3015,7 +3033,7 @@ let packageName = "async"; version = "0.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; }; @@ -3024,7 +3042,7 @@ let packageName = "async"; version = "0.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; + url = "http://registry.npmjs.org/async/-/async-0.2.7.tgz"; sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; }; }; @@ -3033,7 +3051,7 @@ let packageName = "async"; version = "0.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.9.tgz"; + url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; }; }; @@ -3042,7 +3060,7 @@ let packageName = "async"; version = "0.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; }; }; @@ -3051,7 +3069,7 @@ let packageName = "async"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; + url = "http://registry.npmjs.org/async/-/async-1.0.0.tgz"; sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; }; }; @@ -3060,7 +3078,7 @@ let packageName = "async"; version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.4.2.tgz"; + url = "http://registry.npmjs.org/async/-/async-1.4.2.tgz"; sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; }; }; @@ -3069,7 +3087,7 @@ let packageName = "async"; version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + url = "http://registry.npmjs.org/async/-/async-1.5.2.tgz"; sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; }; }; @@ -3375,7 +3393,7 @@ let packageName = "azure-arm-hdinsight"; version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz"; + url = "http://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz"; sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d"; }; }; @@ -4842,7 +4860,7 @@ let packageName = "browserify-cache-api"; version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz"; + url = "http://registry.npmjs.org/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz"; sha1 = "96247e853f068fd6e0d45cc73f0bb2cd9778ef02"; }; }; @@ -4869,7 +4887,7 @@ let packageName = "browserify-incremental"; version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-incremental/-/browserify-incremental-3.1.1.tgz"; + url = "http://registry.npmjs.org/browserify-incremental/-/browserify-incremental-3.1.1.tgz"; sha1 = "0713cb7587247a632a9f08cf1bd169b878b62a8a"; }; }; @@ -8299,7 +8317,7 @@ let packageName = "csv"; version = "0.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz"; + url = "http://registry.npmjs.org/csv/-/csv-0.4.6.tgz"; sha1 = "8dbae7ddfdbaae62c1ea987c3e0f8a9ac737b73d"; }; }; @@ -8308,7 +8326,7 @@ let packageName = "csv-generate"; version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz"; + url = "http://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz"; sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; @@ -11022,13 +11040,13 @@ let sha512 = "dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g=="; }; }; - "event-stream-4.0.0" = { + "event-stream-4.0.1" = { name = "event-stream"; packageName = "event-stream"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-4.0.0.tgz"; - sha512 = "DOB0pW11hF+A572U9vmYbQuLVvzXb2ZQhP14wAhMesOLoWVmWNKZ05niYwgUEEO7Ex+lbPpsqT+pch4O7Ijqmg=="; + url = "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz"; + sha512 = "qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA=="; }; }; "event-to-promise-0.8.0" = { @@ -16936,13 +16954,13 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joi-13.6.0" = { + "joi-13.7.0" = { name = "joi"; packageName = "joi"; - version = "13.6.0"; + version = "13.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-13.6.0.tgz"; - sha512 = "E4QB0yRgEa6ZZKcSHJuBC+QeAwy+akCG0Bsa9edLqljyhlr+GuGDSmXYW1q7sj/FuAPy+ECUI3evVtK52tVfwg=="; + url = "https://registry.npmjs.org/joi/-/joi-13.7.0.tgz"; + sha512 = "xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q=="; }; }; "jquery-3.3.1" = { @@ -17085,7 +17103,7 @@ let packageName = "jsdom"; version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz"; + url = "http://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz"; sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; }; }; @@ -17788,7 +17806,7 @@ let packageName = "kind-of"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz"; + url = "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz"; sha1 = "140a3d2d41a36d2efcfa9377b62c24f8495a5c44"; }; }; @@ -17797,7 +17815,7 @@ let packageName = "kind-of"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz"; + url = "http://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz"; sha1 = "018ec7a4ce7e3a86cb9141be519d24c8faa981b5"; }; }; @@ -21640,7 +21658,7 @@ let packageName = "nan"; version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; + url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; }; }; @@ -21649,7 +21667,7 @@ let packageName = "nan"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; + url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; }; }; @@ -21658,7 +21676,7 @@ let packageName = "nan"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"; + url = "http://registry.npmjs.org/nan/-/nan-2.1.0.tgz"; sha1 = "020a7ccedc63fdee85f85967d5607849e74abbe8"; }; }; @@ -21667,17 +21685,17 @@ let packageName = "nan"; version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; + url = "http://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="; }; }; - "nan-2.11.0" = { + "nan-2.11.1" = { name = "nan"; packageName = "nan"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz"; - sha512 = "F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw=="; + url = "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz"; + sha512 = "iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA=="; }; }; "nan-2.5.1" = { @@ -21707,13 +21725,13 @@ let sha512 = "N1IBreECNaxmsaOLMqqm01K7XIp+sMvoVX8mvmT/p1VjM2FLcBU0lj0FalKooi2/2i+ph9WsEoEogOJevqQ6LQ=="; }; }; - "nanoid-1.2.4" = { + "nanoid-1.2.5" = { name = "nanoid"; packageName = "nanoid"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.4.tgz"; - sha512 = "VbM1HbXvDxZhcONUEJ0olXwg5MgOWS89KPL0PlchtB9NJ2dOTva64RR3fypJuEMQffJ7b1rjcPyR39SsV2W5PA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.5.tgz"; + sha512 = "mOYdCQS3xdgu81Hg3EQEhORykMk53Pkzg15Y6I+O9T3db9qHPf9z6nXzQBCUaHXlQs57eRKotDTzYlYACL+5uA=="; }; }; "nanolru-1.0.0" = { @@ -22437,7 +22455,7 @@ let packageName = "nodemailer"; version = "0.3.35"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz"; + url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz"; sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19"; }; }; @@ -22446,7 +22464,7 @@ let packageName = "nodemailer"; version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz"; + url = "http://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz"; sha1 = "4e69cb39b03015b1d1ef0c78a815412b9e976f79"; }; }; @@ -23324,13 +23342,13 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "ono-4.0.8" = { + "ono-4.0.9" = { name = "ono"; packageName = "ono"; - version = "4.0.8"; + version = "4.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/ono/-/ono-4.0.8.tgz"; - sha512 = "x7IM7JLrarP9WxfjDHTBs6io1D1ixEZnhKqnjMnwz+9waPZSapkGYe7jBAqnMTL+HAMfsN6rSHW3Pi+C/9dyjg=="; + url = "https://registry.npmjs.org/ono/-/ono-4.0.9.tgz"; + sha512 = "HuSv0Z//JsX3246ykva50NDq2dw2UOaUKRK/CrD3UN96FQ3kr9msI5wR0lMezAIKgfN9+utK+iDfWzj1df3TZg=="; }; }; "open-0.0.2" = { @@ -26237,7 +26255,7 @@ let packageName = "pump"; version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-0.3.5.tgz"; + url = "http://registry.npmjs.org/pump/-/pump-0.3.5.tgz"; sha1 = "ae5ff8c1f93ed87adc6530a97565b126f585454b"; }; }; @@ -29031,13 +29049,13 @@ let sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; }; }; - "simple-git-1.102.0" = { + "simple-git-1.103.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.102.0"; + version = "1.103.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.102.0.tgz"; - sha512 = "ox/EDIYtyxG9pFBuboxnmR1FFFS2vsrJejuble9d2W0EWvvMB02/ruMUHp1ROPS0OH5Nzr9+/W7JkRRRXDMs8Q=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.103.0.tgz"; + sha512 = "5QKrOtoXLTA3CdFG//8ZIGIVIVRRMBfSyMXDn1t3y+TOf+Kg39mfzfU4t0CRJBcxBGynjNWVwsx6W04+biIUmg=="; }; }; "simple-lru-cache-0.0.2" = { @@ -30246,13 +30264,13 @@ let sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA=="; }; }; - "ssb-config-2.3.2" = { + "ssb-config-2.3.3" = { name = "ssb-config"; packageName = "ssb-config"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.2.tgz"; - sha512 = "u+pUKX+ZL8KbfdwL49GuHaVD8kh+LkdLcKyCO+Rxn/MKLfZ1JFfuhm6yZ4ppQu9oTmq/1C49eLpNwZtrLIjVCg=="; + url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.3.tgz"; + sha512 = "w4tdXE7xEpYe9M071G60Wr/6lf59OTwrsTykUGFySh9Y7Prcu4pORmOIBgQUttZ86QvGMxJO1qdl7toIK53RMA=="; }; }; "ssb-ebt-5.2.3" = { @@ -31043,7 +31061,7 @@ let packageName = "strip-ansi"; version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; }; }; @@ -31052,7 +31070,7 @@ let packageName = "strip-ansi"; version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"; sha1 = "25f48ea22ca79187f3174a4db8759347bb126220"; }; }; @@ -31061,7 +31079,7 @@ let packageName = "strip-ansi"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"; sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"; }; }; @@ -31070,7 +31088,7 @@ let packageName = "strip-ansi"; version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; }; @@ -33771,7 +33789,7 @@ let packageName = "uuid"; version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + url = "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; @@ -35824,10 +35842,10 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "0.14.3"; + version = "0.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-0.14.3.tgz"; - sha512 = "+hNnVVDmYbv05We/a9knj/98w171+A94A9DNHj+3kXUr3ENTQoSEcfbJRvBBRHyOh4vukBYWujmHvvaMmQoQbg=="; + url = "https://registry.npmjs.org/asar/-/asar-0.14.4.tgz"; + sha512 = "U+Bd2VY5LkLM3DUpLtlQgS+goiXBmSU4P41xUdck/vyHqhMfxBVAXTMLksDGoWvhx7LPgboSUVF0ujHCVsturw=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -36524,9 +36542,9 @@ in }; dependencies = [ sources."JSONStream-1.3.4" - sources."acorn-5.7.3" - sources."acorn-dynamic-import-3.0.0" - sources."acorn-node-1.5.2" + sources."acorn-6.0.2" + sources."acorn-node-1.6.0" + sources."acorn-walk-6.1.0" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" @@ -37194,8 +37212,12 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."acorn-5.7.3" - sources."acorn-dynamic-import-3.0.0" - sources."acorn-node-1.5.2" + (sources."acorn-node-1.6.0" // { + dependencies = [ + sources."acorn-6.0.2" + ]; + }) + sources."acorn-walk-6.1.0" sources."ajv-5.5.2" sources."aliasify-2.1.0" sources."ansi-0.3.1" @@ -37739,7 +37761,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.0" - sources."@types/node-10.11.2" + sources."@types/node-10.11.3" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -38312,7 +38334,7 @@ in sources."multistream-2.1.1" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."nanoassert-1.1.0" sources."nanobus-4.3.4" sources."nanoscheduler-1.0.3" @@ -38580,7 +38602,7 @@ in sources."mime-types-2.1.20" sources."minimist-0.0.10" sources."ms-0.7.0" - sources."nan-2.11.0" + sources."nan-2.11.1" (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" @@ -39169,7 +39191,7 @@ in }) sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" - sources."nan-2.11.0" + sources."nan-2.11.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -40357,7 +40379,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.11.0" + sources."nan-2.11.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -40601,7 +40623,7 @@ in sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.1.1" - sources."simple-git-1.102.0" + sources."simple-git-1.103.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -40667,7 +40689,7 @@ in sources."multicb-1.2.2" sources."multiserver-1.13.5" sources."muxrpc-6.4.1" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."node-gyp-build-3.4.0" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" @@ -40743,7 +40765,7 @@ in sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-client-4.6.0" - sources."ssb-config-2.3.2" + sources."ssb-config-2.3.3" sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" @@ -41178,7 +41200,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."ono-4.0.8" + sources."ono-4.0.9" sources."open-0.0.5" sources."opn-5.4.0" sources."ora-1.4.0" @@ -41688,7 +41710,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."msgpack-1.0.2" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."optimist-0.3.7" sources."pop-iterate-1.0.1" sources."promise-6.1.0" @@ -43065,7 +43087,7 @@ in }) sources."moment-2.22.2" sources."mv-2.1.1" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."ncp-2.0.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -43918,7 +43940,7 @@ in sources."minimist-1.2.0" sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nanoid-1.2.4" + sources."nanoid-1.2.5" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -44275,7 +44297,7 @@ in sources."mixin-deep-1.3.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."nanomatch-1.2.13" sources."negotiator-0.6.1" sources."normalize-path-2.1.1" @@ -45973,7 +45995,7 @@ in sources."encodeurl-1.0.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."event-stream-4.0.0" + sources."event-stream-4.0.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" (sources."extend-shallow-3.0.2" // { @@ -46074,7 +46096,7 @@ in }) sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nan-2.11.0" + sources."nan-2.11.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -46556,7 +46578,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.11.0" + sources."nan-2.11.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -48146,7 +48168,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."negotiator-0.6.1" (sources."node-pre-gyp-0.6.39" // { dependencies = [ @@ -48569,7 +48591,7 @@ in sources."minimist-1.2.0" sources."mixin-deep-1.3.1" sources."ms-2.0.0" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."nanomatch-1.2.13" sources."nopt-1.0.10" sources."normalize-path-2.1.1" @@ -50022,7 +50044,7 @@ in ]; }) sources."mv-2.1.1" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator#full-parse-access" sources."normalize-package-data-2.4.0" @@ -51037,9 +51059,9 @@ in }; dependencies = [ sources."JSONStream-1.3.4" - sources."acorn-5.7.3" - sources."acorn-dynamic-import-3.0.0" - sources."acorn-node-1.5.2" + sources."acorn-6.0.2" + sources."acorn-node-1.6.0" + sources."acorn-walk-6.1.0" sources."anymatch-2.0.0" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -51152,7 +51174,11 @@ in sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."des.js-1.0.0" - sources."detective-4.7.1" + (sources."detective-4.7.1" // { + dependencies = [ + sources."acorn-5.7.3" + ]; + }) sources."diffie-hellman-5.0.3" sources."domain-browser-1.1.7" sources."duplexer2-0.1.4" @@ -51286,7 +51312,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."nanomatch-1.2.13" sources."neo-async-2.5.2" sources."node-static-0.7.11" @@ -52463,7 +52489,7 @@ in sources."rimraf-2.4.5" ]; }) - sources."nan-2.11.0" + sources."nan-2.11.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -52766,7 +52792,7 @@ in sources."split-string-3.1.0" sources."ssb-blobs-1.1.5" sources."ssb-client-4.6.0" - sources."ssb-config-2.3.2" + sources."ssb-config-2.3.3" sources."ssb-ebt-5.2.3" (sources."ssb-friends-3.1.3" // { dependencies = [ @@ -53407,7 +53433,7 @@ in sources."moment-2.22.2" sources."ms-2.0.0" sources."mv-2.1.1" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."ncp-2.0.0" sources."negotiator-0.6.1" sources."number-is-nan-1.0.1" @@ -53807,7 +53833,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."mv-2.1.1" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -53897,6 +53923,296 @@ in production = true; bypassCache = true; }; + snyk = nodeEnv.buildNodePackage { + name = "snyk"; + packageName = "snyk"; + version = "1.99.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk/-/snyk-1.99.1.tgz"; + sha512 = "vN2jUGwHPHAbqqOeZQsBrnWgTvuCnbxsP8i9BIaqZxINeKbuBOS1t5Kg9KMMCRJyqqCB/y76PQSdoqavh4yxkg=="; + }; + dependencies = [ + sources."@yarnpkg/lockfile-1.1.0" + sources."abbrev-1.1.1" + sources."agent-base-4.2.1" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."ansicolors-0.3.2" + sources."archy-1.0.0" + sources."argparse-1.0.10" + sources."asap-2.0.6" + sources."ast-types-0.11.5" + sources."async-1.5.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.1.1" + sources."bytes-3.0.0" + sources."camelcase-2.1.1" + sources."chalk-2.4.1" + sources."chardet-0.4.2" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."clone-deep-0.3.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."concat-map-0.0.1" + sources."configstore-3.1.2" + sources."core-js-2.3.0" + sources."core-util-is-1.0.2" + sources."crypto-random-string-1.0.0" + sources."data-uri-to-buffer-1.2.0" + sources."debug-3.2.5" + sources."decamelize-1.2.0" + sources."deep-is-0.1.3" + sources."degenerator-1.0.4" + sources."depd-1.1.2" + sources."dot-prop-4.2.0" + sources."email-validator-2.0.4" + sources."es6-promise-4.2.5" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + sources."escodegen-1.11.0" + sources."esprima-3.1.3" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."extend-3.0.2" + sources."external-editor-2.2.0" + sources."fast-levenshtein-2.0.6" + sources."figures-2.0.0" + sources."file-uri-to-path-1.0.0" + sources."for-in-1.0.2" + sources."for-own-1.0.0" + (sources."ftp-0.3.10" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) + (sources."get-uri-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."graceful-fs-4.1.11" + sources."graphlib-2.1.5" + sources."has-flag-3.0.0" + sources."hasbin-1.2.3" + sources."hosted-git-info-2.7.1" + sources."http-errors-1.6.3" + (sources."http-proxy-agent-2.1.0" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) + sources."https-proxy-agent-2.2.1" + sources."iconv-lite-0.4.24" + sources."immediate-3.0.6" + sources."imurmurhash-0.1.4" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-3.3.0" + sources."invert-kv-1.0.0" + sources."ip-1.1.5" + sources."is-buffer-1.1.6" + sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-obj-1.0.1" + sources."is-plain-object-2.0.4" + sources."is-promise-2.1.0" + sources."is-wsl-1.1.0" + sources."isarray-0.0.1" + sources."isobject-3.0.1" + (sources."js-yaml-3.12.0" // { + dependencies = [ + sources."esprima-4.0.1" + ]; + }) + (sources."jszip-3.1.5" // { + dependencies = [ + sources."es6-promise-3.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."readable-stream-2.0.6" + ]; + }) + sources."kind-of-3.2.2" + sources."lazy-cache-0.2.7" + sources."lcid-1.0.0" + sources."levn-0.3.0" + sources."lie-3.1.1" + sources."lodash-4.17.11" + sources."lodash.assign-4.2.0" + sources."lodash.assignin-4.2.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.flatten-4.4.0" + sources."lodash.get-4.4.2" + sources."lodash.set-4.3.2" + sources."lru-cache-4.1.3" + sources."macos-release-1.1.0" + sources."make-dir-1.3.0" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + (sources."mixin-object-2.0.1" // { + dependencies = [ + sources."for-in-0.1.8" + ]; + }) + sources."ms-2.1.1" + sources."mute-stream-0.0.7" + sources."nconf-0.10.0" + (sources."needle-2.2.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."netmask-1.0.6" + sources."number-is-nan-1.0.1" + sources."onetime-2.0.1" + sources."opn-5.4.0" + sources."optionator-0.8.2" + sources."os-locale-1.4.0" + sources."os-name-2.0.1" + sources."os-tmpdir-1.0.2" + sources."pac-proxy-agent-2.0.2" + sources."pac-resolver-3.0.0" + sources."pako-1.0.6" + sources."path-0.12.7" + sources."pify-3.0.0" + sources."prelude-ls-1.1.2" + sources."process-0.11.10" + sources."process-nextick-args-2.0.0" + sources."promise-7.3.1" + sources."proxy-agent-2.3.1" + sources."proxy-from-env-1.0.0" + sources."pseudomap-1.0.2" + (sources."raw-body-2.3.3" // { + dependencies = [ + sources."iconv-lite-0.4.23" + ]; + }) + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."isarray-1.0.0" + sources."string_decoder-1.1.1" + ]; + }) + sources."recursive-readdir-2.2.2" + sources."restore-cursor-2.0.0" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."secure-keys-1.0.0" + sources."semver-5.5.1" + sources."setprototypeof-1.1.0" + (sources."shallow-clone-0.1.2" // { + dependencies = [ + sources."kind-of-2.0.1" + ]; + }) + sources."signal-exit-3.0.2" + sources."smart-buffer-1.1.15" + sources."snyk-config-2.2.0" + sources."snyk-docker-plugin-1.11.0" + sources."snyk-go-plugin-1.5.2" + sources."snyk-gradle-plugin-2.0.1" + sources."snyk-module-1.8.2" + sources."snyk-mvn-plugin-2.0.0" + (sources."snyk-nodejs-lockfile-parser-1.5.1" // { + dependencies = [ + sources."lodash-4.17.10" + ]; + }) + sources."snyk-nuget-plugin-1.6.5" + sources."snyk-php-plugin-1.5.1" + sources."snyk-policy-1.12.0" + sources."snyk-python-plugin-1.8.1" + sources."snyk-resolve-1.0.1" + sources."snyk-resolve-deps-3.1.0" + sources."snyk-sbt-plugin-2.0.0" + sources."snyk-tree-1.0.0" + sources."snyk-try-require-1.3.1" + sources."socks-1.1.10" + sources."socks-proxy-agent-3.0.1" + sources."source-map-0.6.1" + sources."source-map-support-0.5.9" + sources."sprintf-js-1.0.3" + sources."statuses-1.5.0" + sources."string-width-2.1.1" + sources."string_decoder-0.10.31" + sources."strip-ansi-4.0.0" + sources."supports-color-5.5.0" + sources."temp-dir-1.0.0" + sources."tempfile-2.0.0" + sources."then-fs-2.0.0" + sources."through-2.3.8" + sources."thunkify-2.1.2" + sources."tmp-0.0.33" + sources."toml-2.3.3" + sources."tslib-1.9.3" + sources."type-check-0.3.2" + (sources."undefsafe-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."unique-string-1.0.0" + sources."unpipe-1.0.0" + sources."util-0.10.4" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" + sources."win-release-1.1.1" + sources."window-size-0.1.4" + sources."wordwrap-1.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xregexp-2.0.0" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + (sources."yargs-3.32.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "snyk library and cli utility"; + homepage = "https://github.com/snyk/snyk#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + }; "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; @@ -53986,7 +54302,7 @@ in sources."hashring-3.2.0" sources."keypress-0.1.0" sources."modern-syslog-1.1.2" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."sequence-2.2.1" sources."simple-lru-cache-0.0.2" sources."winser-0.1.6" @@ -54495,7 +54811,7 @@ in sources."ms-2.0.0" sources."multer-1.4.0" sources."mute-stream-0.0.5" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" (sources."nodemon-1.18.4" // { @@ -55054,7 +55370,7 @@ in sources."mooremachine-2.2.1" sources."mute-stream-0.0.7" sources."mv-2.1.1" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."ncp-2.0.0" sources."once-1.3.2" sources."path-is-absolute-1.0.1" @@ -56166,8 +56482,8 @@ in sources."@akryum/winattr-3.0.0" sources."@apollographql/apollo-upload-server-5.0.3" sources."@apollographql/graphql-playground-html-1.6.0" - sources."@babel/runtime-7.1.1" - sources."@babel/runtime-corejs2-7.1.1" + sources."@babel/runtime-7.1.2" + sources."@babel/runtime-corejs2-7.1.2" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.2" sources."@protobufjs/aspromise-1.1.2" @@ -56190,7 +56506,7 @@ in sources."@types/express-serve-static-core-4.16.0" sources."@types/long-4.0.0" sources."@types/mime-2.0.0" - sources."@types/node-10.11.2" + sources."@types/node-10.11.3" sources."@types/range-parser-1.2.2" sources."@types/serve-static-1.13.2" sources."@types/ws-5.1.2" @@ -56616,7 +56932,7 @@ in sources."isurl-1.0.0" sources."iterall-1.2.2" sources."javascript-stringify-1.6.0" - sources."joi-13.6.0" + sources."joi-13.7.0" sources."js-message-1.0.5" sources."js-queue-2.0.0" sources."js-yaml-3.12.0" @@ -56675,8 +56991,8 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.11.0" - sources."nanoid-1.2.4" + sources."nan-2.11.1" + sources."nanoid-1.2.5" (sources."nanomatch-1.2.13" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -57431,7 +57747,7 @@ in sources."mkdirp-0.5.1" sources."move-concurrently-1.0.1" sources."ms-2.0.0" - sources."nan-2.11.0" + sources."nan-2.11.1" sources."nanomatch-1.2.13" sources."neo-async-2.5.2" (sources."node-libs-browser-2.1.0" // { @@ -57954,7 +58270,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.11.2" + sources."@types/node-10.11.3" sources."@yarnpkg/lockfile-1.1.0" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" @@ -58623,7 +58939,7 @@ in ]; }) sources."mz-2.7.0" - sources."nan-2.11.0" + sources."nan-2.11.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."kind-of-6.0.2" diff --git a/pkgs/development/ocaml-modules/ezxmlm/default.nix b/pkgs/development/ocaml-modules/ezxmlm/default.nix new file mode 100644 index 000000000000..d40c47dd7a40 --- /dev/null +++ b/pkgs/development/ocaml-modules/ezxmlm/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, dune, xmlm }: + +stdenv.mkDerivation rec { + version = "1.0.2"; + name = "ocaml${ocaml.version}-ezxmlm-${version}"; + + src = fetchFromGitHub { + owner = "avsm"; + repo = "ezxmlm"; + rev = "v${version}"; + sha256 = "1dgr61f0hymywikn67inq908x5adrzl3fjx3v14l9k46x7kkacl9"; + }; + + propagatedBuildInputs = [ xmlm ]; + + buildInputs = [ ocaml findlib dune ]; + + buildFlags = "build"; + + inherit (dune) installPhase; + + meta = with stdenv.lib; { + description = "Combinators to use with xmlm for parsing and selection"; + longDescription = '' + An "easy" interface on top of the xmlm library. This version provides + more convenient (but far less flexible) input and output functions + that go to and from [string] values. This avoids the need to write signal + code, which is useful for quick scripts that manipulate XML. + + More advanced users should go straight to the Xmlm library and use it + directly, rather than be saddled with the Ezxmlm interface. Since the + types in this library are more specific than Xmlm, it should interoperate + just fine with it if you decide to switch over. + ''; + maintainers = [ maintainers.carlosdagos ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + license = licenses.isc; + }; +} diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index b95ed080e66a..f070ab4fd7a4 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "black"; - version = "18.6b4"; + version = "18.9b0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0i4sfqgz6w15vd50kbhi7g7rifgqlf8yfr8y78rypd56q64qn592"; + sha256 = "1992ramdwv8sg4mbl5ajirwj5i4a48zjgsycib0fnbaliyiajc70"; }; checkInputs = [ pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix index b19fad1a1f19..60f6af287652 100644 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -19,6 +19,9 @@ buildPythonPackage rec { pytest ''; + # Enable when https://github.com/rupert/pyls-black/pull/6 is merged. + doCheck = false; + checkInputs = [ pytest ]; propagatedBuildInputs = [ black toml python-language-server ]; diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index 04d274d05621..5c1db601988b 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -8,7 +8,7 @@ GEM jaro_winkler (1.5.1) kramdown (1.17.0) mini_portile2 (2.3.0) - nokogiri (1.8.4) + nokogiri (1.8.5) mini_portile2 (~> 2.3.0) parallel (1.12.1) parser (2.5.1.2) @@ -17,7 +17,7 @@ GEM rainbow (3.0.0) reverse_markdown (1.1.0) nokogiri - rubocop (0.59.1) + rubocop (0.59.2) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) @@ -26,7 +26,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.10.0) - solargraph (0.28.1) + solargraph (0.28.2) coderay (~> 1.1) eventmachine (~> 1.2, >= 1.2.5) htmlentities (~> 4.3, >= 4.3.4) diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index 3319f2a68de5..2f46db60984a 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -59,10 +59,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; + sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; type = "gem"; }; - version = "1.8.4"; + version = "1.8.5"; }; parallel = { source = { @@ -110,10 +110,10 @@ dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz4slfisbq8nqs83mvvh6yv5hb7z7zx9fxvv9cka6b9ldvr2i2b"; + sha256 = "0110r4yqi6nn97bp2myah76plv6a7daxnm9k04k64n1y4zpqm256"; type = "gem"; }; - version = "0.59.1"; + version = "0.59.2"; }; ruby-progressbar = { source = { @@ -127,10 +127,10 @@ dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11l759mrzjla2iqy5wdd20r01196pfxkw0b0gzgskdbfi8y8mvg5"; + sha256 = "0xvxifq5871fh2c34hjvsqn38nw4s63d599vbs5mlrrvdl3c5s01"; type = "gem"; }; - version = "0.28.1"; + version = "0.28.2"; }; thor = { source = { diff --git a/pkgs/development/tools/vagrant/Gemfile b/pkgs/development/tools/vagrant/Gemfile deleted file mode 100644 index d32951f1c054..000000000000 --- a/pkgs/development/tools/vagrant/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source "https://rubygems.org" -gem 'vagrant' diff --git a/pkgs/development/tools/vagrant/Gemfile.lock b/pkgs/development/tools/vagrant/Gemfile.lock deleted file mode 100644 index 2a1515fd1438..000000000000 --- a/pkgs/development/tools/vagrant/Gemfile.lock +++ /dev/null @@ -1,149 +0,0 @@ -GIT - remote: https://github.com/hashicorp/vagrant-spec.git - revision: 9413ab298407114528766efefd1fb1ff24589636 - specs: - vagrant-spec (0.0.1) - childprocess (~> 0.6.0) - log4r (~> 1.1.9) - rspec (~> 3.5.0) - thor (~> 0.18.1) - -PATH - remote: . - specs: - vagrant (2.1.2) - childprocess (~> 0.6.0) - erubis (~> 2.7.0) - hashicorp-checkpoint (~> 0.1.5) - i18n (>= 0.6.0, <= 0.8.0) - listen (~> 3.1.5) - log4r (~> 1.1.9, < 1.1.11) - net-scp (~> 1.2.0) - net-sftp (~> 2.1) - net-ssh (~> 4.2.0) - rb-kqueue (~> 0.2.0) - rest-client (>= 1.6.0, < 3.0) - ruby_dep (<= 1.3.1) - wdm (~> 0.1.0) - winrm (~> 2.1) - winrm-elevated (~> 1.1) - winrm-fs (~> 1.0) - -GEM - remote: https://rubygems.org/ - specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - builder (3.2.3) - childprocess (0.6.3) - ffi (~> 1.0, >= 1.0.11) - crack (0.4.3) - safe_yaml (~> 1.0.0) - diff-lcs (1.3) - domain_name (0.5.20180417) - unf (>= 0.0.5, < 1.0.0) - erubis (2.7.0) - fake_ftp (0.1.1) - ffi (1.9.23) - gssapi (1.2.0) - ffi (>= 1.0.1) - gyoku (1.3.1) - builder (>= 2.1.2) - hashdiff (0.3.7) - hashicorp-checkpoint (0.1.5) - http-cookie (1.0.3) - domain_name (~> 0.5) - httpclient (2.8.3) - i18n (0.8.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - little-plugger (1.1.4) - log4r (1.1.10) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - multi_json (1.13.1) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (4.2.0) - netrc (0.11.0) - nori (2.6.0) - public_suffix (3.0.1) - rake (12.0.0) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rb-kqueue (0.2.5) - ffi (>= 0.5.0) - rest-client (2.0.2) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-its (1.2.0) - rspec-core (>= 3.0.0) - rspec-expectations (>= 3.0.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) - ruby_dep (1.3.1) - rubyntlm (0.6.2) - rubyzip (1.2.1) - safe_yaml (1.0.4) - thor (0.18.1) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.5) - wdm (0.1.1) - webmock (2.3.2) - addressable (>= 2.3.6) - crack (>= 0.3.2) - hashdiff - winrm (2.2.3) - builder (>= 2.1.2) - erubis (~> 2.7) - gssapi (~> 1.2) - gyoku (~> 1.0) - httpclient (~> 2.2, >= 2.2.0.2) - logging (>= 1.6.1, < 3.0) - nori (~> 2.0) - rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-elevated (1.1.0) - winrm (~> 2.0) - winrm-fs (~> 1.0) - winrm-fs (1.2.0) - erubis (~> 2.7) - logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) - winrm (~> 2.0) - -PLATFORMS - ruby - -DEPENDENCIES - fake_ftp (~> 0.1.1) - rake (~> 12.0.0) - rspec (~> 3.5.0) - rspec-its (~> 1.2.0) - vagrant! - vagrant-spec! - webmock (~> 2.3.1) - -BUNDLED WITH - 1.16.2 diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index f247a20b1b27..ecc1a2d00946 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,10 +1,8 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }: +{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText }: let # NOTE: bumping the version and updating the hash is insufficient; - # you must copy a fresh Gemfile.lock from the vagrant source, - # and use bundix to generate a new gemset.nix. - # Do not change the existing Gemfile. + # you must use bundix to generate a new gemset.nix in the Vagrant source. version = "2.1.2"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; sha256 = "0fb90v43d30whhyjlgb9mmy93ccbpr01pz97kp5hrg3wfd7703b1"; @@ -15,7 +13,8 @@ let inherit version; inherit ruby; - gemdir = ./.; + gemfile = writeText "Gemfile" ""; + lockfile = writeText "Gemfile.lock" ""; gemset = lib.recursiveUpdate (import ./gemset.nix) { vagrant = { source = { |