From 35f7d38a3ba416a7327d84cbfedd84c1e09baaea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 11 Dec 2019 15:43:17 +0100 Subject: [PATCH 01/79] nixos/systemd: Use a proper type for unit paths --- nixos/modules/system/boot/systemd-unit-options.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index bee21f1a8f36..62398f27d088 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -233,6 +233,7 @@ in rec { path = mkOption { default = []; + type = with types; listOf package; apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}"; description = '' Packages added to the service's PATH From a15bdad2c18fef08c11151f74e147b2f5994225f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Feb 2020 12:06:11 +0000 Subject: [PATCH 02/79] mygui: 3.2.2 -> 3.4.0 --- pkgs/development/libraries/mygui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index c277b7934b9b..da139257fc6b 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -5,13 +5,13 @@ let renderSystem = if withOgre then "3" else "4"; in stdenv.mkDerivation rec { pname = "mygui"; - version = "3.2.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "MyGUI"; repo = "mygui"; rev = "MyGUI${version}"; - sha256 = "1wk7jmwm55rhlqqcyvqsxdmwvl70bysl9azh4kd9n57qlmgk3zmw"; + sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w"; }; enableParallelBuilding = true; From 27e52af5a5d5b5a6e2951b114f38482fe995882a Mon Sep 17 00:00:00 2001 From: Riley Inman Date: Sat, 29 Feb 2020 16:31:47 -0500 Subject: [PATCH 03/79] noto-fonts-emoji-blob-bin: init at 2019-06-14-Emoji-12 --- pkgs/data/fonts/noto-fonts/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 9681bb50efac..ebf7c8b5aebc 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -2,6 +2,7 @@ , stdenvNoCC , lib , fetchFromGitHub +, fetchurl , fetchzip , optipng , cairo @@ -146,4 +147,28 @@ in maintainers = with maintainers; [ mathnerd314 ]; }; }; + + noto-fonts-emoji-blob-bin = stdenv.mkDerivation rec { + pname = "noto-fonts-emoji-blob-bin"; + version = "2019-06-14-Emoji-12"; + + src = fetchurl { + url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; + sha256 = "0snvymglmvpnfgsriw2cnnqm0f4llav0jvzir6mpd17mqqhhabbh"; + }; + + dontUnpack = true; + + installPhase = '' + install -D $src $out/share/fonts/blobmoji/Blobmoji.ttf + ''; + + meta = with stdenv.lib; { + description = "Noto Emoji with extended Blob support"; + homepage = https://github.com/C1710/blobmoji; + license = with licenses; [ ofl asl20 ]; + platforms = platforms.all; + maintainers = with maintainers; [ rileyinman ]; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04eacccf2c11..aa90c027d929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17806,7 +17806,7 @@ in nordic-polar = callPackage ../data/themes/nordic-polar { }; inherit (callPackages ../data/fonts/noto-fonts {}) - noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra; + noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra; nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; From 4f701dd3af7e1037c867021f521500a7de296b70 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 13 Apr 2020 14:44:04 +0200 Subject: [PATCH 04/79] =?UTF-8?q?zziplib:=200.13.69=20=E2=86=92=200.13.71?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/gdraheim/zziplib/releases/tag/v0.13.70 https://github.com/gdraheim/zziplib/releases/tag/v0.13.71 --- .../development/libraries/zziplib/default.nix | 75 +++++++++++++------ 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 8078a3c360c3..670a911cb6eb 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,47 +1,74 @@ -{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib, fetchpatch }: +{ stdenv +, cmake +, pkg-config +, ninja +, fetchFromGitHub +, fetchpatch +, zip +, unzip +, python3 +, xmlto +, zlib +}: stdenv.mkDerivation rec { pname = "zziplib"; - version = "0.13.69"; + version = "0.13.71"; - src = fetchurl { - url = "https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz"; - sha256 = "0i052a7shww0fzsxrdp3rd7g4mbzx7324a8ysbc0br7frpblcql4"; + src = fetchFromGitHub { + owner = "gdraheim"; + repo = "zziplib"; + rev = "v${version}"; + sha256 = "P+7D57sc2oIABhk3k96aRILpGnsND5SLXHh2lqr9O4E="; }; patches = [ + # Fix ninja parsing (fetchpatch { - name = "CVE-2018-17828.patch"; - url = "https://github.com/gdraheim/zziplib/commit/f609ae8971f3c0ce6.diff"; - sha256 = "0jhiz4fgr93wzh6q03avn95b2nsf6402jaki6hxirxyhs5v9ahry"; + url = "https://github.com/gdraheim/zziplib/commit/75e22f3c365b62acbad8d8645d5404242800dfba.patch"; + sha256 = "IB0am3K0x4+Ug1CKvowTtkS8JD6zHJJ247A7guJOw80="; }) + # Install man pages (fetchpatch { - name = "CVE-2018-16548-part1.patch"; - url = "https://github.com/gdraheim/zziplib/commit/9411bde3e4a70a81ff3ffd256b71927b2d90dcbb.patch"; - sha256 = "0cy8i182zbvcqzs5z2j13d5sl7hbh59pkgw4xkyg5yz739q4fp9b"; + url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch"; + sha256 = "wVExEZN8Ml1/3GicB0ZYsLVS3KJ8BSz8i4Gu46naz1Y="; + excludes = [ "GNUmakefile" ]; }) + + # Fix man page formatting (fetchpatch { - name = "CVE-2018-16548-part2.patch"; - url = "https://github.com/gdraheim/zziplib/commit/d2e5d5c53212e54a97ad64b793a4389193fec687.patch"; - sha256 = "153wd4vab8xqj9avcpx8g2zw9qsp9nkaqi7yc65pz3r7xfcxwdla"; - }) - (fetchpatch { - name = "CVE-2018-16548-part3.patch"; - url = "https://github.com/gdraheim/zziplib/commit/0e1dadb05c1473b9df2d7b8f298dab801778ef99.patch"; - sha256 = "0fs6dns8l7dz5a900397g8b7x62z72b0pbpdmwk1hnx6vb7z5rz5"; + url = "https://github.com/gdraheim/zziplib/commit/22ed64f13dc239f86664c60496261f544bce1088.patch"; + sha256 = "ScFVWLc4LQPqkcHn9HK/VkLula4b5HzuYl0b5vi4Ikc="; }) ]; - postPatch = '' - sed -i -e s,--export-dynamic,, configure - ''; - buildInputs = [ docbook_xml_dtd_412 perl python2 zip xmlto zlib ]; + nativeBuildInputs = [ + cmake + pkg-config + ninja # make fails, unable to find test2.zip + zip + python3 + xmlto + ]; + + buildInputs = [ + zlib + ]; + + checkInputs = [ + unzip + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests + ]; # tests are broken (https://github.com/gdraheim/zziplib/issues/20), # and test/zziptests.py requires network access # (https://github.com/gdraheim/zziplib/issues/24) doCheck = false; + checkTarget = "check"; meta = with stdenv.lib; { description = "Library to extract data from files archived in a zip file"; @@ -60,6 +87,6 @@ stdenv.mkDerivation rec { homepage = "http://zziplib.sourceforge.net/"; maintainers = [ ]; - platforms = python2.meta.platforms; + platforms = python3.meta.platforms; }; } From 089c6660b0fb3cde60cae7b2e15b6d8c2b576e4c Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 May 2020 20:17:27 +0100 Subject: [PATCH 05/79] freeimage: mark as broken on aarch64 --- pkgs/development/libraries/freeimage/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 878299f725a6..c31f858850c9 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchurl, unzip, darwin }: +# TODO: consider unvendoring various dependencies (libpng, libjpeg, +# libwebp, zlib, ...) + stdenv.mkDerivation { name = "freeimage-3.18.0"; @@ -50,5 +53,7 @@ stdenv.mkDerivation { license = "GPL"; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; unix; + # see https://github.com/NixOS/nixpkgs/issues/77653 + broken = stdenv.isAarch64; }; } From 4ef9eed22473685e3952402ff66b225de4147853 Mon Sep 17 00:00:00 2001 From: Ivar Date: Wed, 13 May 2020 20:14:22 +0200 Subject: [PATCH 06/79] xwallpaper: init at 0.6.5 --- pkgs/tools/X11/xwallpaper/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/X11/xwallpaper/default.nix diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix new file mode 100644 index 000000000000..ad2995b4ca60 --- /dev/null +++ b/pkgs/tools/X11/xwallpaper/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, pixman, xcbutil, xcbutilimage +, libseccomp, libjpeg, libpng, libXpm }: + +stdenv.mkDerivation rec { + pname = "xwallpaper"; + version = "0.6.5"; + + src = fetchFromGitHub { + owner = "stoeckmann"; + repo = "xwallpaper"; + rev = "v${version}"; + sha256 = "121ai4dc0v65qk12gn9w62ixly8hc8a5qrygkbb82vy8ck4jqxj7"; + }; + + preConfigure = "./autogen.sh"; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ pixman xcbutilimage xcbutil libseccomp libjpeg libpng libXpm ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/stoeckmann/xwallpaper"; + description = "Utility for setting wallpapers in X"; + license = licenses.isc; + maintainers = with maintainers; [ ivar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abcba8f5ccbd..706f2d765431 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7456,6 +7456,8 @@ in xcruiser = callPackage ../applications/misc/xcruiser { }; + xwallpaper = callPackage ../tools/X11/xwallpaper { }; + xxkb = callPackage ../applications/misc/xxkb { }; ugarit = callPackage ../tools/backup/ugarit { From f21011e8cf81ee02e03d474ab26abc11f463136a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 03:13:05 +0000 Subject: [PATCH 07/79] terragrunt: 0.23.14 -> 0.23.23 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 6a4e1979e883..74f576b9a394 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.23.14"; + version = "0.23.23"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "1znb9d4n9zv3dq10dw17kb1h04gj8iz6gwx1a741fcf4ygp8zpy1"; + sha256 = "1087zs5k73rhhzni8zdj950aw4nsc7mqjj8lgdcc8y3yx8p8y5hy"; }; - vendorSha256 = "0h737h25f80zfx84vm6ry0581c32ylcb5h9givqk5k5kh5qgkbgx"; + vendorSha256 = "1xn7c6y32vpanqvf1sfpw6bs73dbjniavjbf00j0vx83bfyklsr4"; buildInputs = [ makeWrapper ]; From 521416791b3d79ec89d470da1fca74b5963d49e5 Mon Sep 17 00:00:00 2001 From: geistesk Date: Tue, 9 Jun 2020 10:23:55 +0200 Subject: [PATCH 08/79] znc: 1.8.0 -> 1.8.1 Fixes CVE-2020-13775 --- pkgs/applications/networking/znc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index fae03846b68e..13803556a479 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "znc"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz"; - sha256 = "0m5xf60r40pgbg9lyk56dafxj2hj149pn2wf8vzsp8xgq4kv5zcl"; + sha256 = "0hb1v167aa6gv5bcwz352l6b8gnd74ymjw92y4x882l099hzg59i"; }; nativeBuildInputs = [ pkgconfig ]; From 5a211182fd89d55599eea505c690d9271b18ae8d Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 17 Apr 2020 15:33:54 +0200 Subject: [PATCH 09/79] castor: init at 0.8.14 --- .../networking/browsers/castor/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/networking/browsers/castor/default.nix diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix new file mode 100644 index 000000000000..6209c3263bcd --- /dev/null +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchurl +, rustPlatform +, pkg-config +, wrapGAppsHook +, openssl +, gtk3 +, gdk-pixbuf +, pango +, atk +, cairo +}: + +rustPlatform.buildRustPackage rec { + pname = "castor"; + version = "0.8.14"; + + src = fetchurl { + url = "https://git.sr.ht/~julienxx/castor/archive/${version}.tar.gz"; + sha256 = "1ykpmbimhfy3ys2hvv0mn8xiwxzdl43gpny1nc58i0gzv07ar8sc"; + }; + + cargoSha256 = "04w49wka1vkb295lk6fzd6c5rwhzrqkp26hd5d94rx7bhcjmmb9w"; + verifyCargoDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + openssl + gtk3 + gdk-pixbuf + pango + atk + cairo + ]; + + postInstall = "make PREFIX=$out copy-data"; + + # Sometimes tests fail when run in parallel + checkFlags = [ "--test-threads=1" ]; + + meta = with stdenv.lib; { + description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols"; + homepage = "https://sr.ht/~julienxx/Castor"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86cee3a17203..818ef163ad79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18696,6 +18696,8 @@ in carla = qt5.callPackage ../applications/audio/carla { }; + castor = callPackage ../applications/networking/browsers/castor { }; + catimg = callPackage ../tools/misc/catimg { }; catt = python3Packages.callPackage ../applications/video/catt { }; From 8c57cfff105f64e426379977be776d859be0dd4f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 16:03:28 +0000 Subject: [PATCH 10/79] ocamlPackages.ppx_deriving: 4.4.1 -> 4.5 --- pkgs/development/ocaml-modules/ppx_deriving/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 612a12bb4183..37a3a55229d4 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { pname = "ppx_deriving"; - version = "4.4.1"; + version = "4.5"; src = fetchzip { url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz"; - sha256 = "1map50w2a35y83bcd19p9yakdkhp04z5as2j2wlygi0b6s0a9vba"; + sha256 = "1v2xldag54n0xk69vv3j4nln9bzkkpq3rildq118sydzsc9v239z"; }; buildInputs = [ ppxfind cppo ounit ]; From 7d424a400d5eed099b4d1d8ab6221cceebe8b708 Mon Sep 17 00:00:00 2001 From: Jonathan Jeppener-Haltenhoff Date: Sun, 7 Jun 2020 19:42:19 +0200 Subject: [PATCH 11/79] paraview: 5.6.3 -> 5.8.0 --- .../graphics/paraview/default.nix | 74 ++++++++++++------- 1 file changed, 47 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 15d70d143081..b201f9dbf0da 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,26 +1,33 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, qtbase , qttools, python -, libGLU, libGL , libXt, qtx11extras, qtxmlpatterns , mkDerivation }: +{ boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras, + qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper, + mkDerivation, ninja, openmpi, python3, stdenv, tbb, libGLU, libGL }: mkDerivation rec { pname = "paraview"; - version = "5.6.3"; + version = "5.8.0"; - # fetching from GitHub instead of taking an "official" source - # tarball because of missing submodules there src = fetchFromGitHub { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "0zcij59pg47c45gfddnpbin13w16smzhcbivzm1k4pg4366wxq1q"; + sha256 = "1mka6wwg9mbkqi3phs29mvxq6qbc44sspbm4awwamqhilh4grhrj"; fetchSubmodules = true; }; - cmakeFlags = [ - "-DPARAVIEW_ENABLE_PYTHON=ON" - "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" - "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" - "-DOpenGL_GL_PREFERENCE=GLVND" - ]; + # Avoid error: format not a string literal and + # no format arguments [-Werror=format-security] + preConfigure = '' + substituteInPlace VTK/Common/Core/vtkLogger.h \ + --replace 'vtkLogScopeF(verbosity_name, __func__)' 'vtkLogScopeF(verbosity_name, "%s", __func__)' + + substituteInPlace VTK/Common/Core/vtkLogger.h \ + --replace 'vtkVLogScopeF(level, __func__)' 'vtkVLogScopeF(level, "%s", __func__)' + ''; + + # Find the Qt platform plugin "minimal" + patchPhase = '' + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; # During build, binaries are called that rely on freshly built # libraries. These reside in build/lib, and are not found by @@ -29,37 +36,50 @@ mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib ''; - enableParallelBuilding = true; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DPARAVIEW_ENABLE_FFMPEG=ON" + "-DPARAVIEW_ENABLE_GDAL=ON" + "-DPARAVIEW_ENABLE_MOTIONFX=ON" + "-DPARAVIEW_ENABLE_VISITBRIDGE=ON" + "-DPARAVIEW_ENABLE_XDMF3=ON" + "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" + "-DPARAVIEW_USE_MPI=ON" + "-DPARAVIEW_USE_PYTHON=ON" + "-DVTK_SMP_IMPLEMENTATION_TYPE=TBB" + "-DVTKm_ENABLE_MPI=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_BINDIR=bin" + "-DOpenGL_GL_PREFERENCE=GLVND" + "-GNinja" + ]; nativeBuildInputs = [ cmake makeWrapper + ninja + gfortran ]; buildInputs = [ - python - python.pkgs.numpy libGLU libGL libXt + openmpi + (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ])) + tbb + boost + ffmpeg + gdal qtbase qtx11extras qttools qtxmlpatterns + qtsvg ]; - # Paraview links into the Python library, resolving symbolic links on the way, - # so we need to put the correct sitePackages (with numpy) back on the path - preFixup = '' - wrapQtApp $out/bin/paraview \ - --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - wrapQtApp $out/bin/pvbatch \ - --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - wrapQtApp $out/bin/pvpython \ - --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - ''; - meta = with stdenv.lib; { - homepage = "http://www.paraview.org/"; + homepage = "https://www.paraview.org/"; description = "3D Data analysis and visualization application"; license = licenses.free; maintainers = with maintainers; [ guibert ]; From 9181f79289204c4aca7bd38719947ca202b907f8 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 11 Jun 2020 12:41:59 +0200 Subject: [PATCH 12/79] linux: enable force feedback support in HID drivers --- pkgs/os-specific/linux/kernel/common-config.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 06ed2cf15598..a6b362ca35fd 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -639,6 +639,14 @@ let # enabled by default in x86_64 but not arm64, so we do that here HIDRAW = yes; + HID_ACRUX_FF = yes; + DRAGONRISE_FF = yes; + HOLTEK_FF = yes; + SONY_FF = yes; + SMARTJOYPLUS_FF = yes; + THRUSTMASTER_FF = yes; + ZEROPLUS_FF = yes; + MODULE_COMPRESS = yes; MODULE_COMPRESS_XZ = yes; KERNEL_XZ = yes; From 6fb11e5227ec84acee9ac9e28694583783ce0b61 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 11 Jun 2020 14:42:40 +0100 Subject: [PATCH 13/79] nixos/undervolt: add a warning for the `enable` option Also use the convenience `mkEnableOption` function for simplicity. --- nixos/modules/services/hardware/undervolt.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index e5ef0601de3c..284440975fe3 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -1,18 +1,13 @@ { config, pkgs, lib, ... }: with lib; - let cfg = config.services.undervolt; -in { +in +{ options.services.undervolt = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to undervolt intel cpus. - ''; - }; + enable = mkEnableOption + "Intel CPU undervolting service (WARNING: may permanently damage your hardware!)"; verbose = mkOption { type = types.bool; From f224b243db40b79d8d6bc65916cc7b419c555c12 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 11 Jun 2020 14:51:35 +0100 Subject: [PATCH 14/79] nixos/undervolt: fix up options' descriptions The default `undervolt` package does not accept floating point numbers for any of its numeric arguments. This also mentions in what units are the values expressed. --- nixos/modules/services/hardware/undervolt.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 284440975fe3..1e89e74cad08 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -30,7 +30,7 @@ in type = types.nullOr types.str; default = null; description = '' - The amount of voltage to offset the CPU cores by. Accepts a floating point number. + The amount of voltage in mV to offset the CPU cores by. ''; }; @@ -38,7 +38,7 @@ in type = types.nullOr types.str; default = null; description = '' - The amount of voltage to offset the GPU by. Accepts a floating point number. + The amount of voltage in mV to offset the GPU by. ''; }; @@ -46,7 +46,7 @@ in type = types.nullOr types.str; default = null; description = '' - The amount of voltage to offset uncore by. Accepts a floating point number. + The amount of voltage in mV to offset uncore by. ''; }; @@ -54,7 +54,7 @@ in type = types.nullOr types.str; default = null; description = '' - The amount of voltage to offset analogio by. Accepts a floating point number. + The amount of voltage in mV to offset analogio by. ''; }; @@ -62,7 +62,7 @@ in type = types.nullOr types.str; default = null; description = '' - The temperature target. Accepts a floating point number. + The temperature target in Celsius degrees. ''; }; @@ -70,7 +70,7 @@ in type = types.nullOr types.str; default = null; description = '' - The temperature target on AC power. Accepts a floating point number. + The temperature target on AC power in Celsius degrees. ''; }; @@ -78,7 +78,7 @@ in type = types.nullOr types.str; default = null; description = '' - The temperature target on battery power. Accepts a floating point number. + The temperature target on battery power in Celsius degrees. ''; }; }; From 24e0e056541369dd8559c74bdf0f5060eb518b8c Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 11 Jun 2020 14:55:14 +0100 Subject: [PATCH 15/79] nixos/undervolt: use `int` type for numeric options --- nixos/modules/services/hardware/undervolt.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 1e89e74cad08..2e6fadc26fc1 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -27,7 +27,7 @@ in }; coreOffset = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The amount of voltage in mV to offset the CPU cores by. @@ -35,7 +35,7 @@ in }; gpuOffset = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The amount of voltage in mV to offset the GPU by. @@ -43,7 +43,7 @@ in }; uncoreOffset = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The amount of voltage in mV to offset uncore by. @@ -51,7 +51,7 @@ in }; analogioOffset = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The amount of voltage in mV to offset analogio by. @@ -59,7 +59,7 @@ in }; temp = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The temperature target in Celsius degrees. @@ -67,7 +67,7 @@ in }; tempAc = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The temperature target on AC power in Celsius degrees. @@ -75,7 +75,7 @@ in }; tempBat = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The temperature target on battery power in Celsius degrees. @@ -104,14 +104,14 @@ in ExecStart = '' ${pkgs.undervolt}/bin/undervolt \ ${optionalString cfg.verbose "--verbose"} \ - ${optionalString (cfg.coreOffset != null) "--core ${cfg.coreOffset}"} \ - ${optionalString (cfg.coreOffset != null) "--cache ${cfg.coreOffset}"} \ - ${optionalString (cfg.gpuOffset != null) "--gpu ${cfg.gpuOffset}"} \ - ${optionalString (cfg.uncoreOffset != null) "--uncore ${cfg.uncoreOffset}"} \ - ${optionalString (cfg.analogioOffset != null) "--analogio ${cfg.analogioOffset}"} \ - ${optionalString (cfg.temp != null) "--temp ${cfg.temp}"} \ - ${optionalString (cfg.tempAc != null) "--temp-ac ${cfg.tempAc}"} \ - ${optionalString (cfg.tempBat != null) "--temp-bat ${cfg.tempBat}"} + ${optionalString (cfg.coreOffset != null) "--core ${toString cfg.coreOffset}"} \ + ${optionalString (cfg.coreOffset != null) "--cache ${toString cfg.coreOffset}"} \ + ${optionalString (cfg.gpuOffset != null) "--gpu ${toString cfg.gpuOffset}"} \ + ${optionalString (cfg.uncoreOffset != null) "--uncore ${toString cfg.uncoreOffset}"} \ + ${optionalString (cfg.analogioOffset != null) "--analogio ${toString cfg.analogioOffset}"} \ + ${optionalString (cfg.temp != null) "--temp ${toString cfg.temp}"} \ + ${optionalString (cfg.tempAc != null) "--temp-ac ${toString cfg.tempAc}"} \ + ${optionalString (cfg.tempBat != null) "--temp-bat ${toString cfg.tempBat}"} ''; }; }; From afae933693b8909caf758fed6e90f3d61c503dd6 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 11 Jun 2020 15:16:28 +0100 Subject: [PATCH 16/79] nixos/undervolt: simplify CLI args generation --- nixos/modules/services/hardware/undervolt.nix | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 2e6fadc26fc1..da627af73bc6 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -3,6 +3,25 @@ with lib; let cfg = config.services.undervolt; + cliArgs = lib.cli.toGNUCommandLineShell {} { + inherit (cfg) + verbose + temp + ; + # `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs: + # + # Core or Cache offsets have no effect. It is not possible to set different offsets for + # CPU Core and Cache. The CPU will take the smaller of the two offsets, and apply that to + # both CPU and Cache. A warning message will be displayed if you attempt to set different offsets. + core = cfg.coreOffset; + cache = cfg.coreOffset; + gpu = cfg.gpuOffset; + uncore = cfg.uncoreOffset; + analogio = cfg.analogioOffset; + + temp-bat = cfg.tempBat; + temp-ac = cfg.tempAc; + }; in { options.services.undervolt = { @@ -95,24 +114,7 @@ in serviceConfig = { Type = "oneshot"; Restart = "no"; - - # `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs: - # - # Core or Cache offsets have no effect. It is not possible to set different offsets for - # CPU Core and Cache. The CPU will take the smaller of the two offsets, and apply that to - # both CPU and Cache. A warning message will be displayed if you attempt to set different offsets. - ExecStart = '' - ${pkgs.undervolt}/bin/undervolt \ - ${optionalString cfg.verbose "--verbose"} \ - ${optionalString (cfg.coreOffset != null) "--core ${toString cfg.coreOffset}"} \ - ${optionalString (cfg.coreOffset != null) "--cache ${toString cfg.coreOffset}"} \ - ${optionalString (cfg.gpuOffset != null) "--gpu ${toString cfg.gpuOffset}"} \ - ${optionalString (cfg.uncoreOffset != null) "--uncore ${toString cfg.uncoreOffset}"} \ - ${optionalString (cfg.analogioOffset != null) "--analogio ${toString cfg.analogioOffset}"} \ - ${optionalString (cfg.temp != null) "--temp ${toString cfg.temp}"} \ - ${optionalString (cfg.tempAc != null) "--temp-ac ${toString cfg.tempAc}"} \ - ${optionalString (cfg.tempBat != null) "--temp-bat ${toString cfg.tempBat}"} - ''; + ExecStart = "${pkgs.undervolt}/bin/undervolt ${cliArgs}"; }; }; From d55e70b7cd0d879147932e2d43884cc6eabbbea7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 12 Jun 2020 15:55:44 -0700 Subject: [PATCH 17/79] rust-analyzer: 2020-06-01 -> 2020-06-08 --- .../node-packages/node-packages.nix | 730 ++++++++++++------ .../tools/rust/rust-analyzer/default.nix | 6 +- 2 files changed, 484 insertions(+), 252 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 69045fa7d615..964328388ca7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,31 +22,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.901.7" = { + "@angular-devkit/architect-0.901.8" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.901.7"; + version = "0.901.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.7.tgz"; - sha512 = "yW/PUEqle55QihOFbmeNXaVTodhfeXkteoFDUpz+YpX3xiQDXDtNbIJSzKOQTojtBKdSMKMvZkQLr+RAa7/1EA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.8.tgz"; + sha512 = "tK9ZQlubH6n+q+c2J9Wvfcxg3RFuRiTfJriNoodo6GHvtF2KLdPY67w3Gen0Sp172A5Q8Y927NseddNI8RZ/0A=="; }; }; - "@angular-devkit/core-9.1.7" = { + "@angular-devkit/core-9.1.8" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.1.7"; + version = "9.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz"; - sha512 = "guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.8.tgz"; + sha512 = "4k1pZwje2oh5c/ULg7pnCBzTstx3l3uF7O5tQq/KXomDDsam97IhLm6cKUqQpaoyC1NUsBV6xJARJ0PyUP5TPQ=="; }; }; - "@angular-devkit/schematics-9.1.7" = { + "@angular-devkit/schematics-9.1.8" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.1.7"; + version = "9.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.7.tgz"; - sha512 = "oeHPJePBcPp/bd94jHQeFUnft93PGF5iJiKV9szxqS8WWC5OMZ5eK7icRY0PwvLyfenspAZxdZcNaqJqPMul5A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.8.tgz"; + sha512 = "/8L5J4X6SkcFMRmrSQHvJWOPilrMWTNlv1lD+1z06D3xGJEktVxXM3gCUXhDrbMvpoi+lYtR2Fuia0E6zvyjCQ=="; }; }; "@antora/asciidoc-loader-2.3.3" = { @@ -220,13 +220,13 @@ let sha512 = "fDj5rWlTi/czvUS5t7V7I45Ai6bOO3Z7JARYj21Y2xxfbRGtJi6h8FvLX0N/EbzQgo/fiZc/HAhtfwn+OCjD7A=="; }; }; - "@apollographql/graphql-playground-html-1.6.24" = { + "@apollographql/graphql-playground-html-1.6.26" = { name = "_at_apollographql_slash_graphql-playground-html"; packageName = "@apollographql/graphql-playground-html"; - version = "1.6.24"; + version = "1.6.26"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz"; - sha512 = "8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ=="; + url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.26.tgz"; + sha512 = "XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ=="; }; }; "@azu/format-text-1.0.1" = { @@ -2524,22 +2524,22 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@octokit/auth-token-2.4.1" = { + "@octokit/auth-token-2.4.2" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.1.tgz"; - sha512 = "NB81O5h39KfHYGtgfWr2booRxp2bWOJoqbWwbyUg2hw6h35ArWYlAST5B3XwAkbdcx13yt84hFXyFP5X0QToWA=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.2.tgz"; + sha512 = "jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ=="; }; }; - "@octokit/endpoint-6.0.2" = { + "@octokit/endpoint-6.0.3" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.2.tgz"; - sha512 = "xs1mmCEZ2y4shXCpFjNq3UbmNR+bLzxtZim2L0zfEtj9R6O6kc4qLDvYw66hvO6lUsYzPTM5hMkltbuNAbRAcQ=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.3.tgz"; + sha512 = "Y900+r0gIz+cWp6ytnkibbD95ucEzDSKzlEnaWS52hbCDNcCJYO5mRmWW7HRAnDc7am+N/5Lnd8MppSaTYx1Yg=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -2578,13 +2578,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.4" = { + "@octokit/request-5.4.5" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.4"; + version = "5.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.4.tgz"; - sha512 = "vqv1lz41c6VTxUvF9nM+a6U+vvP3vGk7drDpr0DVQg4zyqlOiKVrY17DLD6de5okj+YLHKcoqaUZTBtlNZ1BtQ=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.5.tgz"; + sha512 = "atAs5GAGbZedvJXXdjtKljin+e2SltEs48B3naJjqWupYl2IUBbB/CJisyjbNHcKpHzb3E+OYEZ46G8eakXgQg=="; }; }; "@octokit/request-error-1.2.1" = { @@ -2632,6 +2632,15 @@ let sha512 = "/wbFy1cUIE5eICcg0wTKGXMlKSbaAxEr00qaBXzscLXpqhcwgXeS6P8O0pkysBhRfyjkKjJaYrvR1ExMO5eOXQ=="; }; }; + "@octokit/types-5.0.0" = { + name = "_at_octokit_slash_types"; + packageName = "@octokit/types"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/types/-/types-5.0.0.tgz"; + sha512 = "3LVS+MbeqwSd5G4KS8123cZz+hWomsiGeMnQ/QJIBFDwL/YHX8kkr0FZXrgWEMO7Fgi2/VOrhbiFnk9sZ+s4qA=="; + }; + }; "@parcel/fs-1.11.0" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; @@ -2821,22 +2830,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.1.7" = { + "@schematics/angular-9.1.8" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.1.7"; + version = "9.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.7.tgz"; - sha512 = "ld3WcoMWvup04V3OWioQ+AFGQBzz7IDM4Fxc5+Qc3wILWkDJnNkrc4EmJAow96Ab4/T1+Wl1vof3tV4At0BTzA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.8.tgz"; + sha512 = "fjyAP9m4aF51OVdksRXCOF8BTyt96PqFmKK9G0kuwOzgfx2gPZNOO3wOZH6xFAMZ09y86VGzasZxZNeDdyN4sQ=="; }; }; - "@schematics/update-0.901.7" = { + "@schematics/update-0.901.8" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.901.7"; + version = "0.901.8"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.7.tgz"; - sha512 = "6IpQVFvbu47CrXfqqHAzv2vi7AOdfi1S+SiayXU6FWTeA2wV47H8R60VjxurL8JkDGoVhFgC4+lK6KG++g3dQw=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.8.tgz"; + sha512 = "v1tEYX6yM5vuwXW7AG7OZ4OtjqRwTo3kd69LVJyOdF/d9HlqaAFU301RuEsAPwOrPqZEQdTwklH1fNJnqgpB/w=="; }; }; "@serverless/cli-1.4.0" = { @@ -2938,13 +2947,13 @@ let sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; }; }; - "@serverless/utils-china-0.1.13" = { + "@serverless/utils-china-0.1.14" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.13"; + version = "0.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.13.tgz"; - sha512 = "NeWXaNDUs/8mUyq2OVtSyzTHEg4PabaEmz31tIkG5+AUuNdfg/mlE5RTzOmH0pW/WeKwFtmm3Wehs75WEpzYcQ=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.14.tgz"; + sha512 = "M1/bvs/ZhqPfj1yqdsyxu4yIWtCXHd+a5Av/ZXef1deTn1zJHO+ZJdOtvFzWHb0Sr7sX4p2ZHD/vGj0Rve/Pzg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -4099,40 +4108,40 @@ let sha512 = "uh+Y2QO7dxNrdLw7mVnjUqkwO/InxEqwN0wF+Za6eo3coxls9aH9kQ/5rSvW2GcNanebRTmsT5w1/92lAOb1bA=="; }; }; - "@vue/cli-shared-utils-4.4.1" = { + "@vue/cli-shared-utils-4.4.4" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.4.1"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.1.tgz"; - sha512 = "teevHgI7XUsKVMOncx3M+6iLjO28woGfRwgUG4hR83moVBHQe5x2OCr2i5t/58bwpv269RD5RYXBQCGtIXuxZw=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.4.tgz"; + sha512 = "ccMZtTMSutR35V5nrU/eyj+zRMomTRGBTLwJPmaJ2sRiW/93MTggQGXDWC8JRAA8yiU1N8xza8mjBxS0O2wIAA=="; }; }; - "@vue/cli-ui-4.4.1" = { + "@vue/cli-ui-4.4.4" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.4.1"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.4.1.tgz"; - sha512 = "UPDvDdYvuacUuq39OQ/WfLsuIrzIJMdL2bkMecpcegDRPi6MEgkInXqSOMEl5v72FX8qStwXYCUSxifoYIIZ/g=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.4.4.tgz"; + sha512 = "BKzDvUgy6fsZolrMLBvMLlue7s3dFeIJdxWWJtc8/CjD5VvLG+XawAePx8W+24QZwCZpvoZIz4zU38D341IT9A=="; }; }; - "@vue/cli-ui-addon-webpack-4.4.1" = { + "@vue/cli-ui-addon-webpack-4.4.4" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.4.1"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.4.1.tgz"; - sha512 = "UJrv7bCSEJIq+nG3xKSOMjkUnQBbUr+vwk6PjBPsMcjOdbra7p8sQfDIXeRSviCgoDVcnODJDMyD0tqg6OI/sA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.4.4.tgz"; + sha512 = "qx3MnLxk4JeKpkGK2h5ZihuA8Asgu7sbLDagOOaEbF6GpnHSfkrYioE7es8AHm4QHBgn/MWqnkBts5XDN5r4LA=="; }; }; - "@vue/cli-ui-addon-widgets-4.4.1" = { + "@vue/cli-ui-addon-widgets-4.4.4" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.4.1"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.4.1.tgz"; - sha512 = "VaAnCI1X2SEllLNf1TXNz0BARfdb+COMUMzc17PMb5xmdqDswPvVKG5pnFurKODWFgI7zcbk4kBnrYojdLnhNg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.4.4.tgz"; + sha512 = "nOe6LOwZsKCiaH+jrAO2/G90qAkzB1RYivcWGnXirQAH7nec1ZysDNQv1HMDIfWbhCkJMWhGICuWcrn+rtb/8Q=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -4774,13 +4783,13 @@ let sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="; }; }; - "acorn-7.2.0" = { + "acorn-7.3.1" = { name = "acorn"; packageName = "acorn"; - version = "7.2.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz"; - sha512 = "apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz"; + sha512 = "tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="; }; }; "acorn-globals-1.0.9" = { @@ -5593,13 +5602,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.28.2" = { + "apollo-2.28.3" = { name = "apollo"; packageName = "apollo"; - version = "2.28.2"; + version = "2.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.28.2.tgz"; - sha512 = "UcQIj6+MKcCSEH6la0G1SinIV8+Q3AM9x8Oryq9YXRcwjJqnOYdq1qPpmmTG+SlR9Lfxpo8Sv+e16QuSBFVQNg=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.28.3.tgz"; + sha512 = "+X1RqODYOz1VPO0a/6tZpZiFQr7K6z0ZSm7H9oT9PmuZ9TMC27mwOh2N0i1p+OP+6JORKh8lHmjMvle+doZ82A=="; }; }; "apollo-cache-1.3.5" = { @@ -5638,49 +5647,49 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.37.2" = { + "apollo-codegen-core-0.37.3" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.37.2"; + version = "0.37.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.2.tgz"; - sha512 = "Cf4+mWf92nd0PlruwoLrHpS1/eRF2M2qaq/NBGyJlLFhwALrMlM63cqMuJ/Q2dWwAB7ecQLKgZdUkv4jisyimQ=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.3.tgz"; + sha512 = "/DwAhOOFzl57GdBfRGNnqIAcfZAXpsgFIeWYqlu3I/eIucGBCFWo9CEW1TcNwkZzYGAmSE8tURwPgt7dtnhFpg=="; }; }; - "apollo-codegen-flow-0.35.2" = { + "apollo-codegen-flow-0.35.3" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.35.2"; + version = "0.35.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.2.tgz"; - sha512 = "B8Vo0bViAENNNQ+2uAwxnLYsdU0URyQwEpTQDXfV07JLQrm3ebNQqoLeDz2Xacknuh11QtQNexOmM02Q/dfjvw=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.3.tgz"; + sha512 = "npDt9PEJiw/ygKUsKxaDGHCnjQUANPlg/F9piIbQ71jwBjNNoNSXrRaRiD5632MfcTvEuBvanElEX3AO2sA1gw=="; }; }; - "apollo-codegen-scala-0.36.2" = { + "apollo-codegen-scala-0.36.3" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.36.2"; + version = "0.36.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.2.tgz"; - sha512 = "423HUZo3i1SHBIvH+lusi8fXCRvQWjo+UoRRzzIxiALKDhLAWxgdNADXn0B1jcWJNnyNhfaw58Bh3PtGtFbDnA=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.3.tgz"; + sha512 = "KOmcP/0RiqSGY03fXdF87IzQ1RSsApbno3/M8KRVF2yhf+4X3GQXQRpXejHMt4DxnnfPBOn7MqwtP/cDMJIiyw=="; }; }; - "apollo-codegen-swift-0.37.2" = { + "apollo-codegen-swift-0.37.3" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.37.2"; + version = "0.37.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.2.tgz"; - sha512 = "sa4huF3fnjMwf93CsOc2vaIwQbolZzELq2o9F3uX6ZNJhiE1oywF64fI5jLuw4adQSe9vX5RI5CbQiKeFoh0xA=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.3.tgz"; + sha512 = "0BpwtSE+IP12C7OdoScsOWUgxbcuThgwVRsxybBNugUcmddF5sCdGiRbdm+oKvX1vErsG+XimwmIuZnBPWv6ew=="; }; }; - "apollo-codegen-typescript-0.37.2" = { + "apollo-codegen-typescript-0.37.3" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.37.2"; + version = "0.37.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.2.tgz"; - sha512 = "Y837GfKEKVusLj+1DKjHaLcKKyLAGsddNqZRFhXDFAQ4G5Mmrrrn2BzNTYKLoeyDEiBW3dle32Pzyc8UpHbURQ=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.3.tgz"; + sha512 = "tuf/AQTFcNrngQrT4q4WKRdiuPbglyR1m3L58g/nNevoO0cRmF6koIix4NB5sO05LgF8XJmd2zHvInUI5v33Ig=="; }; }; "apollo-datasource-0.7.1" = { @@ -5692,13 +5701,13 @@ let sha512 = "h++/jQAY7GA+4TBM+7ezvctFmmGNLrAPf51KsagZj+NkT9qvxp585rdsuatynVbSl59toPK2EuVmc6ilmQHf+g=="; }; }; - "apollo-engine-reporting-2.0.0" = { + "apollo-engine-reporting-2.0.1" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.0.0.tgz"; - sha512 = "FvNwORsh3nxEfvQqd2xbd468a0q/R3kYar/Bk6YQdBX5qwqUhqmOcOSxLFk8Zb77HpwHij5CPpPWJb53TU1zcA=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.0.1.tgz"; + sha512 = "3OYYk7DqNuJ5xKYnyLy5O2n506jYSryim8WqzBTn9MRphRamwPFjHYQm+akPA60AubXrWnYa6A8euMAiQU0ttA=="; }; }; "apollo-engine-reporting-protobuf-0.5.1" = { @@ -5728,13 +5737,13 @@ let sha512 = "0qa7UOoq7E71kBYE7idi6mNQhHLVdMEDInWk6TNw3KsSWZE2/I68gARP84Mj+paFTO5NYuw1Dht66PVX76Cc2w=="; }; }; - "apollo-language-server-1.22.2" = { + "apollo-language-server-1.22.3" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.22.2.tgz"; - sha512 = "b+KgnjkJnXFRzaNHUb83+IVTw6H5V515DrALBCTlhxa1LmAnET1pm0vuWaFNl5O2fHYqgbtLNz/omipIkvd/5g=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.22.3.tgz"; + sha512 = "RurKlBUNE1RrvY4m93b5WS/DXInUEI47MlzuvholRqZSQovt2rQi81R0RvmS/l3d6y5TBfxbPFpT5RyHbdAntw=="; }; }; "apollo-link-1.2.14" = { @@ -5818,13 +5827,13 @@ let sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw=="; }; }; - "apollo-server-core-2.14.3" = { + "apollo-server-core-2.14.4" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.14.3"; + version = "2.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.14.3.tgz"; - sha512 = "A9RkWuHFZ04uEnXof5V02T7wfhUel7Hx9LpEN4N59mXTpb7ewW+cb0u+J+SP+Y4vDhVqaHCGoveRVKy6X2kLhw=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.14.4.tgz"; + sha512 = "aAfsvbJ2YrqAXDBgcBQocOmQJ5DkeOnEYQ6ADdkkDNU68V5yBRkAHLTOzPfbUlGHVrnOH8PT1FIVWwu5mBgkVA=="; }; }; "apollo-server-env-2.4.4" = { @@ -5845,13 +5854,13 @@ let sha512 = "7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg=="; }; }; - "apollo-server-express-2.14.3" = { + "apollo-server-express-2.14.4" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.14.3"; + version = "2.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.14.3.tgz"; - sha512 = "35PZXG6sQYB0YT+TBZ5KRxyWqknVnevuHyPG5XSAhMtWsVF2ySMzRPs6JdQTi0p2jlFTo5pt4P6FT3hRu0EFUw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.14.4.tgz"; + sha512 = "g0ml0NGmghvJhTiXMR0HqDD8eTz77zdgzDG2XoqNoRehtVIsZq8fmKTagVt9cUKCKKiBPUF+4tqAGD9lnprUdw=="; }; }; "apollo-server-plugin-base-0.9.0" = { @@ -6520,6 +6529,15 @@ let sha512 = "mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA=="; }; }; + "array.prototype.map-1.0.2" = { + name = "array.prototype.map"; + packageName = "array.prototype.map"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz"; + sha512 = "Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw=="; + }; + }; "arraybuffer.slice-0.0.6" = { name = "arraybuffer.slice"; packageName = "arraybuffer.slice"; @@ -6907,6 +6925,15 @@ let sha1 = "125dd09de95d3ea30a378adbed021092179b03c9"; }; }; + "async-write-2.1.0" = { + name = "async-write"; + packageName = "async-write"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-write/-/async-write-2.1.0.tgz"; + sha1 = "1e762817d849ce44bfac07925a42036787061b15"; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -7069,13 +7096,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.693.0" = { + "aws-sdk-2.696.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.693.0"; + version = "2.696.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.693.0.tgz"; - sha512 = "/0zy5IlE8wHrTXCxPYMSJGaqTKN1ulBBOSuWYeGxHU8pnTT6ZHpDdHlS83DHrVbsXnO/zq9prEf1nXRWlwgARw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.696.0.tgz"; + sha512 = "LpEZf0ozwVOARKiqXzJ5njXt9eQswRDCwLNK+iTeADGv1up5g7pwU23itOrSLeer3FHV6iueEr+CxEpjQhrEQw=="; }; }; "aws-sign2-0.6.0" = { @@ -9958,6 +9985,15 @@ let sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; }; }; + "chokidar-3.3.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz"; + sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg=="; + }; + }; "chokidar-3.4.0" = { name = "chokidar"; packageName = "chokidar"; @@ -12668,6 +12704,15 @@ let sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; }; }; + "cssfilter-0.0.10" = { + name = "cssfilter"; + packageName = "cssfilter"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz"; + sha1 = "c6d2672632a2e5c83e013e6864a42ce8defd20ae"; + }; + }; "cssnano-4.1.10" = { name = "cssnano"; packageName = "cssnano"; @@ -15251,13 +15296,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.466" = { + "electron-to-chromium-1.3.469" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.466"; + version = "1.3.469"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.466.tgz"; - sha512 = "eieqkoM2hCkZZRhETKyCouMziDV3l4XEKHRLuzcHG+HV+P7PeODU/z9HAmBgMQkzvHg2DoyQhfIDmmeguLZT/Q=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.469.tgz"; + sha512 = "O9JM6ZsFhS0uy0S2Y3G8EoNfqio3srdxCuwuJh8tKgQKa6rf7je/xQ3TIoiEaEtpf2/qFFLAGt/xB4MjuUZqRw=="; }; }; "elegant-spinner-1.0.1" = { @@ -15783,6 +15828,15 @@ let sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; }; }; + "es-array-method-boxes-properly-1.0.0" = { + name = "es-array-method-boxes-properly"; + packageName = "es-array-method-boxes-properly"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"; + sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; + }; + }; "es-get-iterator-1.1.0" = { name = "es-get-iterator"; packageName = "es-get-iterator"; @@ -18087,13 +18141,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.126.1" = { + "flow-parser-0.127.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.126.1"; + version = "0.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.126.1.tgz"; - sha512 = "HDQAPl2F8vuGgyVm/Zx4vmT9Ja/ACAVIWVA3FRIcNoklkWsWDv+2vv2oVLk/2n+jAzESmvA5nFc2ElayVFZN1A=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.127.0.tgz"; + sha512 = "T4T92hVeVtrkYYvU01L2KFANsA0TJQrgy46efIU/JBxDhVjxIdS7KzaBEsPJu7RPOM44FCR7wcFQg6rWtGGrLQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -18132,6 +18186,15 @@ let sha1 = "ae049a714386bb83e342657a82924b70364a90d6"; }; }; + "flumedb-2.1.4" = { + name = "flumedb"; + packageName = "flumedb"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/flumedb/-/flumedb-2.1.4.tgz"; + sha512 = "jqbUXWsIPxHFmDOTN5/I5khgHzGtEl8cSL3kC13CC/FudT57tfzg+jvCWeXtSty15X1w6QD86lw8RW7cERuqsg=="; + }; + }; "flumelog-offset-3.4.4" = { name = "flumelog-offset"; packageName = "flumelog-offset"; @@ -18159,6 +18222,15 @@ let sha512 = "Nl0gJOgrDGpJGZDkP6gvo6s1Q9WmRynbHUvI/JY3eQ81YgzUUa2FKLlfu6OHV5ho5NeXP+00F+0K1yBVaEgJOQ=="; }; }; + "flumeview-level-4.0.3" = { + name = "flumeview-level"; + packageName = "flumeview-level"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-4.0.3.tgz"; + sha512 = "lmSiImD7vNJ9pC9hB2j9hgx5WhleUZM5n69e2qUTGU4LCyvCbVuzn85pKfqdrKEAMuVjbb+jEPEErPJFNRj0SQ=="; + }; + }; "flumeview-links-1.0.1" = { name = "flumeview-links"; packageName = "flumeview-links"; @@ -18177,13 +18249,13 @@ let sha512 = "zDwy3WIbF5pKhwyK0wVtGdedU+1Xh2Dnrg06fJ0dIkAcQs8+u+CaoSBcnyp80i6XmzfzGCRkN0Fdve2b6f5XAA=="; }; }; - "flumeview-reduce-1.3.16" = { + "flumeview-reduce-1.3.17" = { name = "flumeview-reduce"; packageName = "flumeview-reduce"; - version = "1.3.16"; + version = "1.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.16.tgz"; - sha512 = "4ATidV3QARML74eNdi+HPzGa4JtSZfnQpW6QQArlKZ6NRkjax3EFLt42hK2VJyADxnVnsVInt/ItqJL/4G1/5g=="; + url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.17.tgz"; + sha512 = "Li09TntlRpN51GtFKllIh5nDdBcyDazvi5a/yvbdUCS9xAFb8OA6H6uu32W9gG+4GyvfUi9AsOyN8RQ8OcREQA=="; }; }; "flush-write-stream-1.1.1" = { @@ -20113,13 +20185,13 @@ let sha512 = "efoimZ4F2wF2OwZJzPq2KdPjQs1K+UgJSfsHoHBBA0TwveGyQ/0kS3lUphhJg/JXIrZociuRkfjrk8JC4iPPJQ=="; }; }; - "graphql-extensions-0.12.2" = { + "graphql-extensions-0.12.3" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.2.tgz"; - sha512 = "vFaZua5aLiCOOzxfY5qzHZ6S52BCqW7VVOwzvV52Wb5edRm3dn6u+1MR9yYyEqUHSf8LvdhEojYlOkKiaQ4ghA=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.3.tgz"; + sha512 = "W7iT0kzlwTiZU7fXfw9IgWnsqVj7EFLd0/wVcZZRAbR8L3f4+YsGls0oxKdsrvYBnbG347BXKQmIyo6GTEk4XA=="; }; }; "graphql-subscriptions-1.1.0" = { @@ -21365,6 +21437,15 @@ let sha512 = "CbG3io8gUSIxNNSgq+XMjgpTMzAeVRipxVXjuGrDhH5M1a2kZ03w20s8FCLR1NjnnJj10KbvabvckmtQcYNb9g=="; }; }; + "http-status-1.4.2" = { + name = "http-status"; + packageName = "http-status"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-status/-/http-status-1.4.2.tgz"; + sha512 = "mBnIohUwRw9NyXMEMMv8/GANnzEYUj0Y8d3uL01zDWFkxUjYyZ6rgCaAI2zZ1Wb34Oqtbx/nFZolPRDc8Xlm5A=="; + }; + }; "http2-client-1.3.3" = { name = "http2-client"; packageName = "http2-client"; @@ -23966,6 +24047,24 @@ let sha512 = "RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q=="; }; }; + "iterate-iterator-1.0.1" = { + name = "iterate-iterator"; + packageName = "iterate-iterator"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz"; + sha512 = "3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw=="; + }; + }; + "iterate-value-1.0.2" = { + name = "iterate-value"; + packageName = "iterate-value"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz"; + sha512 = "A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ=="; + }; + }; "iterators-0.1.0" = { name = "iterators"; packageName = "iterators"; @@ -24173,13 +24272,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.17.1" = { + "jquery.terminal-2.17.2" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.17.1"; + version = "2.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.17.1.tgz"; - sha512 = "f+fqKLf0y6ZEhOLGlGCjlDdALPcf0APPd7pDAtDdUZ12Y6fWh0st1Y7RnygJRHpYkEYC3mRC+oogA03XqMH7YQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.17.2.tgz"; + sha512 = "FHs9cS0phsXFXI1waqK/kY9TnyiWmQp65NFu/vMZky1Tef4zIYD3D5qZcBhBkXhAbIFA+fPfmMUUgGKBQWtKlQ=="; }; }; "js-base64-2.5.2" = { @@ -25506,6 +25605,15 @@ let sha512 = "wcak5OQeA4rURGacqS62R/xNHjCYnJSQDBOlm4KNUGJVE9bWv2B04TclqReYejN+oD65PzD4FsqeWoI5wNC5Lg=="; }; }; + "level-6.0.1" = { + name = "level"; + packageName = "level"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level/-/level-6.0.1.tgz"; + sha512 = "psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw=="; + }; + }; "level-codec-6.2.0" = { name = "level-codec"; packageName = "level-codec"; @@ -25560,6 +25668,15 @@ let sha512 = "PeGjZsyMG4O89KHiez1zoMJxStnkM+oBIqgACjoo5PJqFiSUUm3GNod/KcbqN5ktyZa8jkG7I1T0P2u6HN9lIg=="; }; }; + "level-js-5.0.2" = { + name = "level-js"; + packageName = "level-js"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/level-js/-/level-js-5.0.2.tgz"; + sha512 = "SnBIDo2pdO5VXh02ZmtAyPP6/+6YTJg2ibLtl9C34pWvmtMEmRTWpra+qO/hifkUtBTOtfx6S9vLDjBsBK4gRg=="; + }; + }; "level-packager-5.1.1" = { name = "level-packager"; packageName = "level-packager"; @@ -29367,6 +29484,15 @@ let sha512 = "+GgHNg8xRhMXfEbv81iDtrVeTcWt0kWmTEY1XQK14dICTXnWJnT0dxdlPspwqF3keKMVPXwayEsk1DI0AA/jdA=="; }; }; + "monotonic-timestamp-0.0.9" = { + name = "monotonic-timestamp"; + packageName = "monotonic-timestamp"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/monotonic-timestamp/-/monotonic-timestamp-0.0.9.tgz"; + sha1 = "5ba5adc7aac85e1d7ce77be847161ed246b39603"; + }; + }; "moo-0.5.1" = { name = "moo"; packageName = "moo"; @@ -35225,6 +35351,15 @@ let sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; }; }; + "promise.allsettled-1.0.2" = { + name = "promise.allsettled"; + packageName = "promise.allsettled"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz"; + sha512 = "UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg=="; + }; + }; "promised-temp-0.1.0" = { name = "promised-temp"; packageName = "promised-temp"; @@ -37088,6 +37223,15 @@ let sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; + "readdirp-3.3.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz"; + sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ=="; + }; + }; "readdirp-3.4.0" = { name = "readdirp"; packageName = "readdirp"; @@ -38438,13 +38582,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.15.0" = { + "rollup-2.16.0" = { name = "rollup"; packageName = "rollup"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.15.0.tgz"; - sha512 = "HAk4kyXiV5sdNDnbKWk5zBPnkX/DAgx09Kbp8rRIRDVsTUVN3vnSowR7ZHkV6/lAiE6c2TQ8HtYb72aCPGW4Jw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.16.0.tgz"; + sha512 = "95NglykUQAhl+mTFZqVvGUWDoGHV4/XanOZBbR7LOwTKODde5yFNHfVDZEnERBMuQViDuYaxOlFW87i1GQMihA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -39365,6 +39509,15 @@ let sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; }; }; + "serialize-javascript-3.0.0" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz"; + sha512 = "skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw=="; + }; + }; "serialize-javascript-3.1.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; @@ -40229,13 +40382,13 @@ let sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-docker-plugin-3.10.0" = { + "snyk-docker-plugin-3.12.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.10.0.tgz"; - sha512 = "0OIIqBOq76wBZ/09oB+L+5CdyNXEeDAgLH92TRydEj5iuJwjddAfzWtoqeCIeh3d09DidsHBRP8mMhXKAht7Sg=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.12.0.tgz"; + sha512 = "Nv8ez1bykJFtM1OEkNPh6dRg11xHQg4ybTW8A6OC9IaLrWxkH/wrUfmRqhDnrJyzcDhF10CnyQX7KdUnsA7PwA=="; }; }; "snyk-go-parser-1.4.1" = { @@ -41237,6 +41390,15 @@ let sha512 = "J3fsWb5nS6PqObZLW2tclEz/bkRQ5pcF9goXanYGVsoH71F6W4f5sOnck9szeubI8srNaiL9pa0kPRv/lojHiw=="; }; }; + "ssb-db-20.1.0" = { + name = "ssb-db"; + packageName = "ssb-db"; + version = "20.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-db/-/ssb-db-20.1.0.tgz"; + sha512 = "oN5bBdnuOv6ZA6DRBeB5iH08VvGEHq5yfHNdtvaOv3IDj6RYSJMd0Z6qOwR9qlNgxtaD/fDo21nxaNcs5Hn/WQ=="; + }; + }; "ssb-ebt-5.6.7" = { name = "ssb-ebt"; packageName = "ssb-ebt"; @@ -41408,13 +41570,13 @@ let sha512 = "iRXjeI0sbRbgMwaKg+poqhHSH7GvUVgJ+8ysi8q7Hjj4wHkczLGAOyVjnyhjF+ErPDFn9kXN+46joneKqSgEDg=="; }; }; - "ssb-ooo-1.3.2" = { + "ssb-ooo-1.3.3" = { name = "ssb-ooo"; packageName = "ssb-ooo"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ooo/-/ssb-ooo-1.3.2.tgz"; - sha512 = "JBH0cDaqQ/WRZMfoyn/fNLDrbrs5w2xnSno/VUDWGhc+SX+3/h6zFK7VvCjdzEATlZ/D7VRkXMYrOedSIVIKwA=="; + url = "https://registry.npmjs.org/ssb-ooo/-/ssb-ooo-1.3.3.tgz"; + sha512 = "6yI5XBpBHkwFdAELpKwlf1C1V32Z0/AKEJYsoU7lk+Eh88blv8LKydo4a1DnjMiPy4ywn4lRU5oayQaPE5MRtQ=="; }; }; "ssb-plugins-1.0.4" = { @@ -41444,13 +41606,13 @@ let sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118"; }; }; - "ssb-query-2.4.3" = { + "ssb-query-2.4.4" = { name = "ssb-query"; packageName = "ssb-query"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.4.3.tgz"; - sha512 = "Ktuk6Bl3s70gueDH7FBXzI8KHsf+h+n82J6Id33NTwP80u5iSDV5vXK2f7/He/cmP3uUVUI5ogJda7ShmrDIug=="; + url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.4.4.tgz"; + sha512 = "t81fskbvFzeXausdJ/TDGjqh8iyClhJy8B9JLgOAmt6D67IFDlkUPgVYF2ITqP4NIkqsLAj/jgX1KV32ntxaNg=="; }; }; "ssb-ref-2.13.9" = { @@ -41480,6 +41642,15 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; + "ssb-validate-4.1.0" = { + name = "ssb-validate"; + packageName = "ssb-validate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.0.tgz"; + sha512 = "GszJGLXZdnWSAP5f1evXwRct7qY0T/LFXR41eHIh/N63Z7kKBfBcIMd6mbQ5DgpU+sVHwdhXXloYXoMPZHiJDA=="; + }; + }; "ssb-ws-6.2.3" = { name = "ssb-ws"; packageName = "ssb-ws"; @@ -48276,6 +48447,15 @@ let sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; + "workerpool-6.0.0" = { + name = "workerpool"; + packageName = "workerpool"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz"; + sha512 = "fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA=="; + }; + }; "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -48862,6 +49042,15 @@ let sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; }; }; + "xss-1.0.7" = { + name = "xss"; + packageName = "xss"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/xss/-/xss-1.0.7.tgz"; + sha512 = "A9v7tblGvxu8TWXQC9rlpW96a+LN1lyw6wyhpTmmGW+FwRMactchBR3ROKSi33UPCUcUHSu8s9YP6F+K3Mw//w=="; + }; + }; "xstream-11.12.0" = { name = "xstream"; packageName = "xstream"; @@ -49462,17 +49651,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.1.7"; + version = "9.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.7.tgz"; - sha512 = "NhsIa725S/U/n7nDxp6ForusdYHEXF4aSIvsFRdoK6vbQ889c5e1Rdj+T5EWXLmpQZxeprSKhLI2alNX0nVhhQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.8.tgz"; + sha512 = "yfF7glPo3Xm7fTJVln1bFZVXqHu8wkIGZRZGb6lsJa+QH4ePxHgn+dNYXho0MYpGUnhY7xOBW4MJzjS7E+1y5Q=="; }; dependencies = [ - sources."@angular-devkit/architect-0.901.7" - sources."@angular-devkit/core-9.1.7" - sources."@angular-devkit/schematics-9.1.7" - sources."@schematics/angular-9.1.7" - sources."@schematics/update-0.901.7" + sources."@angular-devkit/architect-0.901.8" + sources."@angular-devkit/core-9.1.8" + sources."@angular-devkit/schematics-9.1.8" + sources."@schematics/angular-9.1.8" + sources."@schematics/update-0.901.8" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -50314,10 +50503,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.4.1"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.4.1.tgz"; - sha512 = "X9K0EZFipqnckuzaUa2MzCtxPzazy4CwCJN0OTeXwc6I3q8f0M3H/5BuJM7cGPBn9CHDQTsiR1x7b2t3IKw7Vg=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.4.4.tgz"; + sha512 = "52pXlikVdBiPlZqEBx+vFQCrTmPrP3aLLxE0Wue00yJacPXt8ph6cb1PhCwYQAY1N9ROQstVJlsrm3GOXpCfyw=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -50332,7 +50521,7 @@ in sources."@apollographql/graphql-language-service-parser-2.0.2" sources."@apollographql/graphql-language-service-types-2.0.2" sources."@apollographql/graphql-language-service-utils-2.0.2" - sources."@apollographql/graphql-playground-html-1.6.24" + sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.1" (sources."@babel/core-7.10.2" // { dependencies = [ @@ -50488,14 +50677,14 @@ in sources."@types/serve-static-1.13.4" sources."@types/ws-7.2.5" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-4.4.1" - (sources."@vue/cli-ui-4.4.1" // { + sources."@vue/cli-shared-utils-4.4.4" + (sources."@vue/cli-ui-4.4.4" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.4.1" - sources."@vue/cli-ui-addon-widgets-4.4.1" + sources."@vue/cli-ui-addon-webpack-4.4.4" + sources."@vue/cli-ui-addon-widgets-4.4.4" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -50519,7 +50708,7 @@ in sources."normalize-path-2.1.1" ]; }) - (sources."apollo-2.28.2" // { + (sources."apollo-2.28.3" // { dependencies = [ sources."strip-ansi-5.2.0" ]; @@ -50528,18 +50717,18 @@ in sources."apollo-cache-control-0.11.0" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.37.2" // { + (sources."apollo-codegen-core-0.37.3" // { dependencies = [ sources."recast-0.19.1" sources."source-map-0.6.1" ]; }) - sources."apollo-codegen-flow-0.35.2" - sources."apollo-codegen-scala-0.36.2" - sources."apollo-codegen-swift-0.37.2" - sources."apollo-codegen-typescript-0.37.2" + sources."apollo-codegen-flow-0.35.3" + sources."apollo-codegen-scala-0.36.3" + sources."apollo-codegen-swift-0.37.3" + sources."apollo-codegen-typescript-0.37.3" sources."apollo-datasource-0.7.1" - (sources."apollo-engine-reporting-2.0.0" // { + (sources."apollo-engine-reporting-2.0.1" // { dependencies = [ sources."uuid-8.1.0" ]; @@ -50547,7 +50736,7 @@ in sources."apollo-engine-reporting-protobuf-0.5.1" sources."apollo-env-0.6.5" sources."apollo-graphql-0.4.5" - sources."apollo-language-server-1.22.2" + sources."apollo-language-server-1.22.3" sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -50557,10 +50746,10 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" sources."apollo-server-caching-0.5.1" - sources."apollo-server-core-2.14.3" + sources."apollo-server-core-2.14.4" sources."apollo-server-env-2.4.4" sources."apollo-server-errors-2.4.1" - sources."apollo-server-express-2.14.3" + sources."apollo-server-express-2.14.4" sources."apollo-server-plugin-base-0.9.0" sources."apollo-server-types-0.5.0" sources."apollo-tracing-0.11.0" @@ -50782,6 +50971,7 @@ in sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" sources."css-what-2.1.3" + sources."cssfilter-0.0.10" sources."csv-parser-1.12.1" sources."dashdash-1.14.1" sources."date-fns-1.30.1" @@ -50940,7 +51130,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.126.1" + sources."flow-parser-0.127.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -51004,7 +51194,7 @@ in sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.12.2" + sources."graphql-extensions-0.12.3" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.3" sources."graphql-tools-4.0.8" @@ -51775,6 +51965,7 @@ in sources."xdg-basedir-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" + sources."xss-1.0.7" sources."xtend-4.0.2" sources."yallist-2.1.2" (sources."yaml-front-matter-3.4.1" // { @@ -52457,7 +52648,7 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.1.1" (sources."asn1.js-4.10.1" // { @@ -53165,10 +53356,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.7.14"; + version = "1.7.15"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.14.tgz"; - sha512 = "LOq7zTp2mb2omi1Pc0r1PEK2N+bwuPYpSfszm78Rsvvht9cU+o/YuC0HagG4VZ7iwuiy9VRvpNz218sMZJqm7Q=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.15.tgz"; + sha512 = "R2h5x0j9FLlGZLEMlEnvoIors0b10yC2eBYkyYlwEFavWZn9DXwpnL3r2p6VUKNY02pwEyTGY0L5ffnPFZsUWA=="; }; buildInputs = globalBuildInputs; meta = { @@ -53183,14 +53374,15 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-0.7.0.tgz"; - sha512 = "ntDgRtLshBtxUuUXkkxH2S+xUWZW86ptrLO0pe74MzeS6m/Z744QvwSor+abHUTHO370nrUEUtGaQDUEh9p2BA=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-0.8.0.tgz"; + sha512 = "PMMybjPvAT+gGZDRaTmq1rIe59JsG9WRWWzVlT3gRo/Zp5Xwg2ho424m65ubGgre/UU23D9LVH9FLZDU4NH2Gg=="; }; dependencies = [ sources."isexe-2.0.0" - sources."tslib-1.13.0" + sources."node-fetch-2.6.0" + sources."tslib-2.0.0" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -53482,7 +53674,7 @@ in sources."@typescript-eslint/experimental-utils-3.2.0" sources."@typescript-eslint/parser-3.2.0" sources."@typescript-eslint/typescript-estree-3.2.0" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" sources."ajv-keywords-3.4.1" @@ -53640,7 +53832,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.466" + sources."electron-to-chromium-1.3.469" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -54679,7 +54871,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.466" + sources."electron-to-chromium-1.3.469" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -55299,7 +55491,7 @@ in ]; }) sources."abbrev-1.1.1" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" (sources."aggregate-error-3.0.1" // { dependencies = [ @@ -58674,10 +58866,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.28.4"; + version = "6.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.28.4.tgz"; - sha512 = "KgKHW1PDfOOMzbldVhySG4sLFrllEFLvqNO/Is0F15sSho11lOjAb2MoKOB/bypJQ7DgrxR/O9zMVFxvEI6Vdg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.29.1.tgz"; + sha512 = "p/4ZAjzx0C6wVPnqHBqFZXwa2HI40mg3pchl3kW8utLg3G0ILA5H1ypXB62S1uyPuuNXgq3GdiEj8C12aa15nQ=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -58686,7 +58878,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.693.0" + sources."aws-sdk-2.696.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."base64-js-1.3.1" @@ -58715,6 +58907,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" + sources."http-status-1.4.2" sources."ieee754-1.1.13" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -59200,7 +59393,7 @@ in ]; }) sources."@types/color-name-1.1.1" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { @@ -59376,7 +59569,7 @@ in ]; }) sources."@types/color-name-1.1.1" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { @@ -62904,7 +63097,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."jquery-3.5.1" - sources."jquery.terminal-2.17.1" + sources."jquery.terminal-2.17.2" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -63795,7 +63988,7 @@ in sources."@yarnpkg/lockfile-1.1.0" sources."abab-2.0.3" sources."abbrev-1.1.1" - sources."acorn-7.2.0" + sources."acorn-7.3.1" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.1" @@ -65159,10 +65352,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.0.9"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.0.9.tgz"; - sha512 = "dUA5z7Lo7G4FRSe1ZAXqOINEEWxmCjDBbfRBmU/wYlSMwxUQJP/tEEP90yJt3Uqo03s9rCgVnxtlfq+uDhxSPg=="; + url = "https://registry.npmjs.org/karma/-/karma-5.1.0.tgz"; + sha512 = "I3aPbkuIbwuBo6wSog97P5WnnhCgUTsWTu/bEw1vZVQFbXmKO3PK+cfFhZioOgVtJAuQxoyauGNjnwXNHMCxbw=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -65824,8 +66017,8 @@ in sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@octokit/auth-token-2.4.1" - (sources."@octokit/endpoint-6.0.2" // { + sources."@octokit/auth-token-2.4.2" + (sources."@octokit/endpoint-6.0.3" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" @@ -65844,9 +66037,13 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.4" // { + (sources."@octokit/request-5.4.5" // { dependencies = [ - sources."@octokit/request-error-2.0.1" + (sources."@octokit/request-error-2.0.1" // { + dependencies = [ + sources."@octokit/types-4.1.10" + ]; + }) sources."is-plain-object-3.0.0" sources."isobject-4.0.0" sources."universal-user-agent-5.0.0" @@ -65858,7 +66055,7 @@ in ]; }) sources."@octokit/rest-16.43.1" - sources."@octokit/types-4.1.10" + sources."@octokit/types-5.0.0" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" @@ -67852,7 +68049,7 @@ in sources."@xtuc/long-4.2.2" sources."JSONStream-1.3.5" sources."ace.improved-0.2.1" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.1.1" sources."ajv-6.12.2" @@ -68128,7 +68325,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.466" + sources."electron-to-chromium-1.3.469" (sources."elliptic-6.5.2" // { dependencies = [ sources."bn.js-4.11.9" @@ -69753,17 +69950,18 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "7.2.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; - sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.0.1.tgz"; + sha512 = "vefaXfdYI8+Yo8nPZQQi0QO2o+5q9UIMX1jZ1XMmK3+4+CQjc7+B0hPdUeglXiTlr8IHMVRo63IhO9Mzt6fxOg=="; }; dependencies = [ - sources."ansi-colors-3.2.3" + sources."ansi-colors-4.1.1" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" + sources."array.prototype.map-1.0.2" sources."balanced-match-1.0.0" sources."binary-extensions-2.0.0" sources."brace-expansion-1.1.11" @@ -69775,7 +69973,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."chokidar-3.3.0" + sources."chokidar-3.3.1" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -69789,20 +69987,22 @@ in sources."debug-3.2.6" sources."decamelize-1.2.0" sources."define-properties-1.1.3" - sources."diff-3.5.0" + sources."diff-4.0.2" sources."emoji-regex-7.0.3" sources."es-abstract-1.17.5" + sources."es-array-method-boxes-properly-1.0.0" + sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."fill-range-7.0.1" - sources."find-up-3.0.0" + sources."find-up-4.1.0" sources."flat-4.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."glob-7.1.3" + sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."growl-1.10.5" sources."has-1.0.3" @@ -69811,6 +70011,7 @@ in sources."he-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" sources."is-callable-1.2.0" @@ -69818,35 +70019,38 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" + sources."is-map-2.0.1" sources."is-number-7.0.0" sources."is-regex-1.1.0" + sources."is-set-2.0.1" + sources."is-string-1.0.5" sources."is-symbol-1.0.3" + sources."isarray-2.0.5" sources."isexe-2.0.0" + sources."iterate-iterator-1.0.1" + sources."iterate-value-1.0.2" sources."js-yaml-3.13.1" - sources."locate-path-3.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.15" sources."log-symbols-3.0.0" sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" - sources."ms-2.1.1" - sources."node-environment-flags-1.0.6" + sources."ms-2.1.2" sources."normalize-path-3.0.0" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" - sources."readdirp-3.2.0" + sources."promise.allsettled-1.0.2" + sources."readdirp-3.3.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."semver-5.7.1" + sources."serialize-javascript-3.0.0" sources."set-blocking-2.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" @@ -69855,12 +70059,17 @@ in sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."strip-ansi-4.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-6.0.0" + sources."strip-json-comments-3.0.1" + (sources."supports-color-7.1.0" // { + dependencies = [ + sources."has-flag-4.0.0" + ]; + }) sources."to-regex-range-5.0.1" - sources."which-1.3.1" + sources."which-2.0.2" sources."which-module-2.0.0" sources."wide-align-1.1.3" + sources."workerpool-6.0.0" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -69873,6 +70082,10 @@ in (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -72113,7 +72326,7 @@ in sources."@parcel/workers-1.11.0" sources."@types/q-1.5.4" sources."abab-2.0.3" - sources."acorn-7.2.0" + sources."acorn-7.3.1" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.1" @@ -72362,7 +72575,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.466" + sources."electron-to-chromium-1.3.469" (sources."elliptic-6.5.2" // { dependencies = [ sources."bn.js-4.11.9" @@ -73969,10 +74182,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.1.6"; + version = "5.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.1.6.tgz"; - sha512 = "BMY+RH2ggxY27pSlO5RtGAtTUcUfFVetQZHJdZURWu9tankNO0iDuqSx4w9iBGdIm9+Gd5eQqNYylqTksu2ueA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.1.8.tgz"; + sha512 = "DsyoyFo60MByj8rZEFH6a/ZKz0NQbg5tdKCIgjMlvA2kyNKt0d+XW2eaYjqw6ILGuy2k857yRPZfgJgV0Xgpjg=="; }; buildInputs = globalBuildInputs; meta = { @@ -74150,10 +74363,10 @@ in pscid = nodeEnv.buildNodePackage { name = "pscid"; packageName = "pscid"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/pscid/-/pscid-2.9.1.tgz"; - sha512 = "K/v6B+pLyKi3PxthFbNwpWxVvIMIAFWgwo3SewjPnylBaSx9xGLxTrMneKHMf3whOMJlXMD/lrXdGJ0paYfRGQ=="; + url = "https://registry.npmjs.org/pscid/-/pscid-2.9.2.tgz"; + sha512 = "xK6xfd8AhzJIddcpwveQjFEH+7ODr4gVM84rsvXwP6/167quMbt4VB2pcMf051gew1iwFgK90L301CcW+UD7Cg=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -74194,7 +74407,7 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.1.1" (sources."asn1.js-4.10.1" // { @@ -74648,10 +74861,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.15.0.tgz"; - sha512 = "HAk4kyXiV5sdNDnbKWk5zBPnkX/DAgx09Kbp8rRIRDVsTUVN3vnSowR7ZHkV6/lAiE6c2TQ8HtYb72aCPGW4Jw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.16.0.tgz"; + sha512 = "95NglykUQAhl+mTFZqVvGUWDoGHV4/XanOZBbR7LOwTKODde5yFNHfVDZEnERBMuQViDuYaxOlFW87i1GQMihA=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -74705,7 +74918,7 @@ in sources."semver-7.3.2" ]; }) - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."agent-base-4.3.0" sources."ajv-6.12.2" @@ -74973,7 +75186,7 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."rollup-2.15.0" + sources."rollup-2.16.0" sources."run-async-2.4.1" (sources."rxjs-6.5.5" // { dependencies = [ @@ -75404,7 +75617,7 @@ in ]; }) sources."@serverless/template-1.1.3" - sources."@serverless/utils-china-0.1.13" + sources."@serverless/utils-china-0.1.14" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" (sources."@tencent-sdk/capi-0.2.15-alpha.0" // { @@ -75480,7 +75693,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.693.0" // { + (sources."aws-sdk-2.696.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -77101,10 +77314,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.338.0"; + version = "1.339.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.338.0.tgz"; - sha512 = "kygisp/bsNVLnATEdHeb3ASQS58b8DKOju9BcVNC3OpUi0Ajjiqy5o7RdfNPfCzp9lYglLT9grIM59zJuC2sFg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.339.2.tgz"; + sha512 = "BpXMOZX/jj/4fHOq2gfSlAPE9+DNe/WEqNCbQ68uy1U9NA1tucGJf3B376NofsgXCYIrJ0tw5Mjf1yfq7F4Vxw=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -77451,7 +77664,7 @@ in sources."debug-4.2.0" ]; }) - (sources."snyk-docker-plugin-3.10.0" // { + (sources."snyk-docker-plugin-3.12.0" // { dependencies = [ sources."debug-4.2.0" ]; @@ -77911,10 +78124,10 @@ in ssb-server = nodeEnv.buildNodePackage { name = "ssb-server"; packageName = "ssb-server"; - version = "16.0.0"; + version = "16.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-server/-/ssb-server-16.0.0.tgz"; - sha512 = "pmAXsxC5OIzwciT1IcTNXI36qMWJJr7zLjq6Hft8fsijaw3NMh5eyGq72UMbeHIdaTPESmtg7Y2cuVuPhv3vrA=="; + url = "https://registry.npmjs.org/ssb-server/-/ssb-server-16.0.1.tgz"; + sha512 = "cast7wQRxqUSiRVyFoaTtymeukwSh5nlfDj5ShHmdnh0qmfi4uQnvPuBA5BBgC3WEtI/ozgNjAc1/vqJFgILig=="; }; dependencies = [ sources."abstract-leveldown-6.0.3" @@ -77935,6 +78148,7 @@ in sources."assign-symbols-1.0.0" sources."async-each-1.0.3" sources."async-single-1.0.5" + sources."async-write-2.1.0" sources."atob-2.1.2" (sources."atomic-file-2.0.1" // { dependencies = [ @@ -78093,26 +78307,36 @@ in sources."level-codec-6.2.0" ]; }) + sources."flumedb-2.1.4" sources."flumelog-offset-3.4.4" (sources."flumeview-hashtable-1.1.1" // { dependencies = [ sources."atomic-file-1.1.5" ]; }) - sources."flumeview-level-3.0.14" + (sources."flumeview-level-4.0.3" // { + dependencies = [ + sources."abstract-leveldown-6.2.3" + sources."level-6.0.1" + sources."level-js-5.0.2" + sources."mkdirp-1.0.4" + ]; + }) (sources."flumeview-links-1.0.1" // { dependencies = [ sources."deep-equal-2.0.3" + sources."flumeview-level-3.0.14" sources."isarray-2.0.5" sources."map-filter-reduce-3.2.2" ]; }) (sources."flumeview-query-7.2.2" // { dependencies = [ + sources."flumeview-level-3.0.14" sources."map-filter-reduce-3.2.2" ]; }) - sources."flumeview-reduce-1.3.16" + sources."flumeview-reduce-1.3.17" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."for-own-0.1.5" @@ -78288,6 +78512,7 @@ in ]; }) sources."mkdirp-0.5.5" + sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" sources."ms-2.1.2" sources."multiblob-1.13.7" @@ -78590,6 +78815,12 @@ in sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" sources."ssb-config-3.4.4" + (sources."ssb-db-20.1.0" // { + dependencies = [ + sources."glob-7.1.6" + sources."rimraf-3.0.2" + ]; + }) sources."ssb-ebt-5.6.7" sources."ssb-friends-4.1.4" (sources."ssb-gossip-1.1.1" // { @@ -78606,7 +78837,7 @@ in sources."ssb-msgs-5.2.0" sources."ssb-no-auth-1.0.0" sources."ssb-onion-1.0.0" - (sources."ssb-ooo-1.3.2" // { + (sources."ssb-ooo-1.3.3" // { dependencies = [ sources."flumecodec-0.0.1" sources."level-codec-6.2.0" @@ -78614,10 +78845,11 @@ in }) sources."ssb-plugins-1.0.4" sources."ssb-private1-1.0.1" - sources."ssb-query-2.4.3" + sources."ssb-query-2.4.4" sources."ssb-ref-2.13.9" sources."ssb-replicate-1.3.2" sources."ssb-unix-socket-1.0.0" + sources."ssb-validate-4.1.0" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -78820,7 +79052,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.693.0" // { + (sources."aws-sdk-2.696.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -83286,7 +83518,7 @@ in }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."debug-4.2.0" sources."eslint-scope-5.1.0" sources."espree-6.2.1" @@ -84384,7 +84616,7 @@ in sources."eslint-visitor-keys-1.1.0" (sources."espree-6.2.1" // { dependencies = [ - sources."acorn-7.2.0" + sources."acorn-7.3.1" ]; }) sources."esprima-4.0.1" diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 43bf5415ce01..e9d4deefb459 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-06-01"; + rev = "2020-06-08"; version = "unstable-${rev}"; - sha256 = "0chm47mrd4hybhvzn4cndq2ck0mj948mm181p1i1j1w0ms7zk1fg"; - cargoSha256 = "0yaz50f7hirlcs8bxc5dh170lch9l1gscwayan71k3pz23wkvlzs"; + sha256 = "0ywwsb717d1rwcy2yij58sj123pan0fb80sbsiqqprcln0aaspip"; + cargoSha256 = "1c6rmrhx7q4qcanr26yzlwc2rp1hh55m80jn56hy6hfcvwcdaij4"; }; rust-analyzer = callPackage ./wrapper.nix {} { From 906b72919107560424bc79fae7cb21abd8c4f50f Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Sat, 13 Jun 2020 08:49:24 +0200 Subject: [PATCH 18/79] vscode, vscodium: add update.sh script --- pkgs/applications/editors/vscode/update.sh | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 pkgs/applications/editors/vscode/update.sh diff --git a/pkgs/applications/editors/vscode/update.sh b/pkgs/applications/editors/vscode/update.sh new file mode 100755 index 000000000000..7453cc9c89c8 --- /dev/null +++ b/pkgs/applications/editors/vscode/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +command -v grep >/dev/null 2>&1 || { echo >&2 "[grep] is required, but not installed. Aborting."; exit 1; } +command -v awk >/dev/null 2>&1 || { echo >&2 "[awk] is required, but not installed. Aborting."; exit 1; } +command -v sed >/dev/null 2>&1 || { echo >&2 "[sed] is required, but not installed. Aborting."; exit 1; } +command -v curl >/dev/null 2>&1 || { echo >&2 "[curl] is required, but not installed. Aborting."; exit 1; } +command -v nix-prefetch-url >/dev/null 2>&1 || { echo >&2 "[nix-prefetch-url] is required, but not installed. Aborting."; exit 1; } + +ROOT="$(dirname "$(readlink -f "$0")")" +if [ ! -f "$ROOT/vscode.nix" ]; then + echo "ERROR: cannot find vscode.nix in $ROOT" + exit 1 +fi +if [ ! -f "$ROOT/vscodium.nix" ]; then + echo "ERROR: cannot find vscodium.nix in $ROOT" + exit 1 +fi + +# VSCode + +VSCODE_VER=$(curl -s -L "https://code.visualstudio.com/Download" | grep "is now available" | awk -F'' '{print $1}' | awk -F'>' '{print $NF}') +VSCODE_VER=$(curl -s -L "https://code.visualstudio.com/updates/v${VSCODE_VER/./_}" | grep "Downloads:" | awk -F'code.visualstudio.com/' '{print $2}' | awk -F'/' '{print $1}') +sed -i "s/version = \".*\"/version = \"${VSCODE_VER}\"/" "$ROOT/vscode.nix" + +VSCODE_LINUX_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-x64/stable" +VSCODE_LINUX_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_URL}) +sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/" "$ROOT/vscode.nix" + +VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/darwin/stable" +VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL}) +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix" + +# VSCodium + +VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}') +sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL}) +sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-${VSCODIUM_VER}.zip" +VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL}) +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" \ No newline at end of file From 05e16d2886e90d799b5076099142b68def21cf6e Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Sat, 13 Jun 2020 08:56:51 +0200 Subject: [PATCH 19/79] vscode, vscodium: use nix-shell to install dependencies --- pkgs/applications/editors/vscode/update.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vscode/update.sh b/pkgs/applications/editors/vscode/update.sh index 7453cc9c89c8..d573fdf04aaf 100755 --- a/pkgs/applications/editors/vscode/update.sh +++ b/pkgs/applications/editors/vscode/update.sh @@ -1,10 +1,5 @@ -#!/usr/bin/env bash - -command -v grep >/dev/null 2>&1 || { echo >&2 "[grep] is required, but not installed. Aborting."; exit 1; } -command -v awk >/dev/null 2>&1 || { echo >&2 "[awk] is required, but not installed. Aborting."; exit 1; } -command -v sed >/dev/null 2>&1 || { echo >&2 "[sed] is required, but not installed. Aborting."; exit 1; } -command -v curl >/dev/null 2>&1 || { echo >&2 "[curl] is required, but not installed. Aborting."; exit 1; } -command -v nix-prefetch-url >/dev/null 2>&1 || { echo >&2 "[nix-prefetch-url] is required, but not installed. Aborting."; exit 1; } +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused gawk ROOT="$(dirname "$(readlink -f "$0")")" if [ ! -f "$ROOT/vscode.nix" ]; then From 1c61d8707ac8ecf76a656255ee5bb6df978894dd Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sat, 13 Jun 2020 11:52:46 +0000 Subject: [PATCH 20/79] openjdk: added myself as maintainer --- pkgs/development/compilers/openjdk/11.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index ef496f5f7c52..f29de168633d 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -135,7 +135,7 @@ let homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo asbachb ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; }; From 890485a2bd8ab4318048e24987d91986a4758ed3 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sat, 13 Jun 2020 11:51:57 +0000 Subject: [PATCH 21/79] openjdk: 11.0.6 -> 11.0.7 --- pkgs/development/compilers/openjdk/11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index f29de168633d..9edb70074c7d 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -10,7 +10,7 @@ let major = "11"; - update = ".0.6"; + update = ".0.7"; build = "ga"; openjdk = stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1w6n0cnz9izpjb3sc870q7a0jz85a6c7fiszymxin10cnsajkzir"; + sha256 = "14daacng9ndxf4kmvsn7nracwfiwwmw5rha8rkk3723pfk9g8q7p"; }; nativeBuildInputs = [ pkgconfig autoconf ]; From 660973d8239797a63a7de91478c9126dee707ca1 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Sun, 14 Jun 2020 01:54:03 +0200 Subject: [PATCH 22/79] nextcloud: 18.0.4 -> 18.0.6 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 9a7cc077508f..048de16ceed3 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -33,7 +33,7 @@ in { }; nextcloud18 = generic { - version = "18.0.4"; - sha256 = "0aa3f4xbkzacfw0h9aic0ywk5mqlwka83qaszizj8lmk68kf3n7s"; + version = "18.0.6"; + sha256 = "1chmkg31jc1nr53y8r886mmd2jzb78094mrx7ggcfpjfkkv8b89s"; }; } From 8dc2ec290a8f66c07b03cf231799bed2c838a477 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 04:42:03 +0000 Subject: [PATCH 23/79] adoptopenjdk-icedtea-web: 1.8.3 -> 1.8.4 --- .../compilers/adoptopenjdk-icedtea-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index 72ed184357c1..b62b9c95ef6a 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "AdoptOpenJDK"; repo = "IcedTea-Web"; rev = "icedtea-web-${version}"; - sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; + sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; From 03690ba290ef3f4612d022d3651bbaa6d6879621 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Thu, 11 Jun 2020 12:34:51 +0200 Subject: [PATCH 24/79] sane-backends: 1.0.28 -> 1.0.30 --- pkgs/applications/graphics/sane/backends/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 6aba42d33e63..ad2681d25fe5 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "1.0.28"; + version = "1.0.30"; src = fetchurl { - url = "https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/sane-backends-${version}.tar.gz"; - sha256 = "00yy8q9hqdf0zjxxl4d8njr9zf0hhi3a9ib23ikc2anqf8zhy9ii"; + url = "https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-${version}.tar.gz"; + sha256 = "18vryaycps3zpjzxh0wjgg8nv2f4pdvcfxxmdfj28qbzqjlrcp9z"; }; }) From dd25ff3b8add157af1b2eaa899d44545223782e7 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 9 Jun 2020 22:09:45 +0200 Subject: [PATCH 25/79] routinator: 0.7.0 -> 0.7.1 --- pkgs/servers/routinator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 46416c982760..1174d0802ae8 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "1qbaibmbiw3pffi0cm6d06k1gra4acgxr97gj7f1ckvql5rni4h0"; + sha256 = "12fgvalv12v8690pxmsdg179r170d4mc1kynsb25fm0zggy838jn"; }; - cargoSha256 = "138h99l3vv34higbqj59fa88w7c63c80g3rw07n9j2f834cvr901"; + cargoSha256 = "01118mnb5gm0xqi2c8jj3fk8y55jnnyg9zgn2g4xn7f3i8dcczka"; meta = with stdenv.lib; { description = "An RPKI Validator written in Rust"; From a136ba726a90e6e64e6619376bc8b65130ab1559 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 14:45:15 +0000 Subject: [PATCH 26/79] cinnamon.cinnamon-translations: 4.4.2 -> 4.6.0 --- pkgs/desktops/cinnamon/cinnamon-translations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index b2a3acd07229..ce630999147d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "4.4.2"; + version = "4.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1n1nkapcgxmbv0l8hrx5cf588pi4ifx12xbz46lq4p1ijrlfivba"; + sha256 = "04rlgcbz02n9kj1w12xa56b7f4x10y6g91hsl70zmag568mdclzz"; }; nativeBuildInputs = [ From 813bd1ae837a30a57b08ae69c9d6edade5eea9d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 14:50:26 +0000 Subject: [PATCH 27/79] container-linux-config-transpiler: 0.7.0 -> 0.9.0 --- .../tools/container-linux-config-transpiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index 005c5d55b79d..b5200e22cad8 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "ct"; - version = "0.7.0"; + version = "0.9.0"; goPackagePath = "github.com/coreos/container-linux-config-transpiler"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "coreos"; repo = "container-linux-config-transpiler"; rev = "v${version}"; - sha256="058zjk9yqgdli55gc6y48455il6wjpslyz2r2ckk2ki9c5qc8b7c"; + sha256="1w6nvgrl5qp3ci9igflk9dlk3020psv5m4f3p57f3qcx9vrcl4lw"; }; buildFlagsArray = '' From 3e0fca9635d5691b52204751722240bf02eac76d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 16:25:12 +0000 Subject: [PATCH 28/79] clipgrab: 3.8.11 -> 3.8.12 --- pkgs/applications/video/clipgrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index fc752f1bd1fd..2eda7fe1dab3 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.8.11"; + version = "3.8.12"; src = fetchurl { - sha256 = "0jpfdmyzjasq4x1xvk7b1cmhhq6fz6ydvvbwz2wclph367x496xk"; + sha256 = "1nnph6sn4mpdj20hngwr57ripmdp60w3vrn89s8ssy7cjv500ngd"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; From 72d867a120523c9a2a72d524357a06652deed465 Mon Sep 17 00:00:00 2001 From: Daniel Duan Date: Mon, 15 Jun 2020 21:06:09 -0700 Subject: [PATCH 29/79] tre-command: 0.2.3 -> 0.3.1 Also, change `pname` to match the actual desired name. Avoid name conflict with the other (older) package named `tre`. --- pkgs/tools/system/tre-command/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index bc0fa7ea988d..b420126a95e6 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -1,17 +1,17 @@ { rustPlatform, fetchFromGitHub, stdenv }: rustPlatform.buildRustPackage rec { - pname = "tre"; - version = "0.2.3"; + pname = "tre-command"; + version = "0.3.1"; src = fetchFromGitHub { owner = "dduan"; repo = "tre"; rev = "v${version}"; - sha256 = "1fazw2wn738iknbv54gv7qll7d4q2gy9bq1s3f3cv21cdv6bqral"; + sha256 = "1fm3fszy7fd0dgf5dwm35nb0ym0waw92iyx128lr2vlbyzln6ija"; }; - cargoSha256 = "16bvnwgjf3kj99d77j1pkldbasxfwy55sj9sv9vf2z6llfmzfabd"; + cargoSha256 = "0sk4dn5rrqhkaxm76y1d7rsjsw6pdjdhb2xv7qqrlivfk6y5k31x"; meta = with stdenv.lib; { description = "Tree command, improved"; From 0f5aa1901509d79b62e0fa4925261e67e08de523 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 16:09:18 +0000 Subject: [PATCH 30/79] monetdb: 11.35.19 -> 11.37.7 --- pkgs/servers/sql/monetdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 5a58a52210af..ec232b864637 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -3,7 +3,7 @@ }: let - version = "11.35.19"; + version = "11.37.7"; in stdenv.mkDerivation { pname = "monetdb"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "1qfgsv1k23sn6jl7jbxmfh7w7hyzmh8r1cddl4kksqrw41q6h82q"; + sha256 = "00z6c7z4f9ww43574nz32b06rw5ln5fy3hlml32h2wrwsg0cj5jh"; }; postPatch = '' From 3d6107d4237cbf993c1b91630d925ad154268c95 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Mon, 15 Jun 2020 16:30:26 +0200 Subject: [PATCH 31/79] factorio{,-headless}-experimental: 0.18.30 -> 0.18.32 --- pkgs/games/factorio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index fde3d31716eb..3b47cb40ad0f 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -53,11 +53,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; - experimental = bdist { sha256 = "0dm2s8iz7247i3j8cl5f4i3kipnmn5514gm21p7b4ahj6fhpc7pf"; version = "0.18.30"; withAuth = true; }; + experimental = bdist { sha256 = "1h0gv7cdn999hm2fl93kq6g98bzd1x3c8afq8v0a04dqjarjgr86"; version = "0.18.32"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; - experimental = bdist { sha256 = "1c5jiqva2z58lghm6bhvjdj2n61xk8b8ss2hx80qsywgh3nqafr3"; version = "0.18.30"; }; + experimental = bdist { sha256 = "017ggrsnhwyfgx99q0wjagafjvk5pb6lcxl72y37gig72bfcapab"; version = "0.18.32"; }; }; demo = { stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; }; From 9daa1838d3d06fda9a5aee03738e677d7a5837ba Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Wed, 17 Jun 2020 18:59:35 +0200 Subject: [PATCH 32/79] fish: replace use of tr with string split This shaves about 4ms off fish start time. Before (profiled with 'fish --profile prof.txt -c fish_prompt'): 225 4636 ----> set -l __nix_profile_paths (echo $NIX_PROFILES | /nix/store/m5ajgnzp2512na31brwfmydwk3l1gawb-coreutils-8.31/bin/tr ' ' '\n')[-1..1] 4411 4411 -----> echo $NIX_PROFILES | /nix/store/m5ajgnzp2512na31brwfmydwk3l1gawb-coreutils-8.31/bin/tr ' ' '\n' After: 190 248 ----> set -l __nix_profile_paths (string split ' ' $NIX_PROFILES)[-1..1] --- pkgs/shells/fish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 11d9e48008fa..57c52a411d38 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -79,7 +79,7 @@ let # additional profiles are expected in order of precedence, which means the reverse of the # NIX_PROFILES variable (same as config.environment.profiles) - set -l __nix_profile_paths (echo $NIX_PROFILES | ${coreutils}/bin/tr ' ' '\n')[-1..1] + set -l __nix_profile_paths (string split ' ' $NIX_PROFILES)[-1..1] set __extra_completionsdir \ $__nix_profile_paths"/etc/fish/completions" \ From 84e25cf478d8f81070659a30f5181b0e11a028ff Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Wed, 17 Jun 2020 18:59:56 +0200 Subject: [PATCH 33/79] fish: use -p to prepend profile directories --- pkgs/shells/fish/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 57c52a411d38..a6ce7bf6d23a 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -81,18 +81,15 @@ let # NIX_PROFILES variable (same as config.environment.profiles) set -l __nix_profile_paths (string split ' ' $NIX_PROFILES)[-1..1] - set __extra_completionsdir \ + set -p __extra_completionsdir \ $__nix_profile_paths"/etc/fish/completions" \ - $__nix_profile_paths"/share/fish/vendor_completions.d" \ - $__extra_completionsdir - set __extra_functionsdir \ + $__nix_profile_paths"/share/fish/vendor_completions.d" + set -p __extra_functionsdir \ $__nix_profile_paths"/etc/fish/functions" \ - $__nix_profile_paths"/share/fish/vendor_functions.d" \ - $__extra_functionsdir - set __extra_confdir \ + $__nix_profile_paths"/share/fish/vendor_functions.d" + set -p __extra_confdir \ $__nix_profile_paths"/etc/fish/conf.d" \ - $__nix_profile_paths"/share/fish/vendor_conf.d" \ - $__extra_confdir + $__nix_profile_paths"/share/fish/vendor_conf.d" end ''; From 35040cfafdba3a08d68e6cd23169e6617c5e7a77 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 14 Jun 2020 01:30:18 +0200 Subject: [PATCH 34/79] rmlint: fix running rmlint --gui rmlint has a `--gui` option which is writing a python "bootstrap" script in `/tmp`. It currently can't find its own python modules, as we don't prefix `PYTHONPATH` to point to it. Also, there's some other runtime dependencies, mostly due to using gtk from python(3), which also needs to be preprended to `PYTHONPATH`. The `rmlint` GUI components also execute `rmlint` again with `--version` to determine some features, for which we need to prefix `PATH` with `$out/bin`. --- pkgs/tools/misc/rmlint/default.nix | 53 ++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 2ea1668409a5..936c78b695d1 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,6 +1,22 @@ -{ stdenv, fetchFromGitHub -, gettext, pkgconfig, scons -, glib, json-glib, libelf, sphinx, utillinux }: +{ stdenv +, cairo +, fetchFromGitHub +, gettext +, glib +, gobject-introspection +, gtksourceview3 +, json-glib +, libelf +, makeWrapper +, pango +, pkgconfig +, polkit +, python3 +, scons +, sphinx +, utillinux +, wrapGAppsHook +, withGui ? false }: with stdenv.lib; stdenv.mkDerivation rec { @@ -17,14 +33,39 @@ stdenv.mkDerivation rec { CFLAGS="-I${stdenv.lib.getDev utillinux}/include"; nativeBuildInputs = [ - pkgconfig sphinx gettext scons + pkgconfig + sphinx + gettext + scons + ] ++ stdenv.lib.optionals withGui [ + makeWrapper + wrapGAppsHook ]; buildInputs = [ - glib json-glib libelf utillinux + glib + json-glib + libelf + utillinux + ] ++ stdenv.lib.optionals withGui [ + cairo + gobject-introspection + gtksourceview3 + pango + polkit + python3 + python3.pkgs.pygobject3 ]; - prefixKey = "--prefix="; + # this doesn't seem to support configureFlags, and appends $out afterwards, + # so add the --without-gui in front of it + prefixKey = stdenv.lib.optionalString (!withGui) " --without-gui " + "--prefix="; + + # in GUI mode, this shells out to itself, and tries to import python modules + postInstall = stdenv.lib.optionalString withGui '' + gappsWrapperArgs+=(--prefix PATH : "$out/bin") + gappsWrapperArgs+=(--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3}):$(toPythonPath ${python3.pkgs.pycairo})") + ''; meta = { description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; From 4044d81d5cea617e58ec9682f9cc447dde326850 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 17 Jun 2020 16:19:01 -0400 Subject: [PATCH 35/79] IPFS NixOS module: Socket unit file more precise The systemd socket unit files now more precisely track the IPFS configuration, by including any multaddr they can make a `ListenStream` for. (The daemon doesn't currently support anything which would use `ListDatagram`, so we don't need to worry about that.) The tests use some of these features. --- .../services/network-filesystems/ipfs.nix | 30 +++++++++++++++---- nixos/tests/ipfs.nix | 11 +++++-- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index a3bd40135d19..7d18410ff0a4 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -12,6 +12,19 @@ let (optionalString (cfg.defaultMode == "norouting") "--routing=none") ] ++ cfg.extraFlags); + splitMulitaddr = addrRaw: lib.tail (lib.splitString "/" addrRaw); + + multiaddrToListenStream = addrRaw: let + addr = splitMulitaddr addrRaw; + s = builtins.elemAt addr; + in if s 0 == "ip4" && s 2 == "tcp" + then "${s 1}:${s 3}" + else if s 0 == "ip6" && s 2 == "tcp" + then "[${s 1}]:${s 3}" + else if s 0 == "unix" + then "/${lib.concatStringsSep "/" (lib.tail addr)}" + else null; # not valid for listen stream, skip + in { ###### interface @@ -80,7 +93,10 @@ in { swarmAddress = mkOption { type = types.listOf types.str; - default = [ "/ip4/0.0.0.0/tcp/4001" "/ip6/::/tcp/4001" ]; + default = [ + "/ip4/0.0.0.0/tcp/4001" + "/ip6/::/tcp/4001" + ]; description = "Where IPFS listens for incoming p2p connections"; }; @@ -250,14 +266,18 @@ in { systemd.sockets.ipfs-gateway = { wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = [ "" ] - ++ lib.optional (cfg.gatewayAddress == opt.gatewayAddress.default) [ "127.0.0.1:8080" "[::1]:8080" ]; + socketConfig.ListenStream = let + fromCfg = multiaddrToListenStream cfg.gatewayAddress; + in [ "" ] ++ lib.optional (fromCfg != null) fromCfg; }; systemd.sockets.ipfs-api = { wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = [ "" "%t/ipfs.sock" ] - ++ lib.optional (cfg.apiAddress == opt.apiAddress.default) [ "127.0.0.1:5001" "[::1]:5001" ]; + # We also include "%t/ipfs.sock" because tere is no way to put the "%t" + # in the multiaddr. + socketConfig.ListenStream = let + fromCfg = multiaddrToListenStream cfg.apiAddress; + in [ "" "%t/ipfs.sock" ] ++ lib.optional (fromCfg != null) fromCfg; }; }; diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index 82234f969226..9c0ff5306e06 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -7,21 +7,28 @@ import ./make-test-python.nix ({ pkgs, ...} : { nodes.machine = { ... }: { services.ipfs = { enable = true; + # Also will add a unix domain socket socket API address, see module. + startWhenNeeded = true; apiAddress = "/ip4/127.0.0.1/tcp/2324"; }; }; testScript = '' start_all() - machine.wait_for_unit("ipfs") - machine.wait_until_succeeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id") + # IPv4 activation + + machine.succeed("ipfs --api /ip4/127.0.0.1/tcp/2324 id") ipfs_hash = machine.succeed( "echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | awk '{ print $2 }'" ) machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord") + # Unix domain socket activation + + machine.stop_job("ipfs") + ipfs_hash = machine.succeed( "echo fnord2 | ipfs --api /unix/run/ipfs.sock add | awk '{ print $2 }'" ) From 110d6a8b987844024a621443be4fb285d92e904e Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 17 Jun 2020 20:43:56 -0700 Subject: [PATCH 36/79] platformio: 4.3.1 -> 4.3.4 --- pkgs/development/arduino/platformio/core.nix | 4 ++-- .../arduino/platformio/use-local-spdx-license-list.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 0d333a49d37a..d83013dbbde5 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -51,14 +51,14 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "4.3.1"; + version = "4.3.4"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "1dxnjy60zpkgyrbvbf6b9qi6m37gm8gwjmxwfj30npr1y7rvxwrw"; + sha256 = "0vf2j79319ypr4yrdmx84853igkb188sjfvlxgw06rlsvsm3kacq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch index 16294a4d6cd6..953eb3c92893 100644 --- a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch @@ -8,7 +8,7 @@ index be49b3ee..d1390a88 100644 def load_spdx_licenses(): - r = requests.get( - "https://raw.githubusercontent.com/spdx/license-list-data" -- "/v3.8/json/licenses.json" +- "/v3.9/json/licenses.json" - ) - r.raise_for_status() - return r.json() From 9b2cb88855366f4de3a7e51dc8803cba9966f5cf Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Thu, 18 Jun 2020 01:03:58 -0400 Subject: [PATCH 37/79] wine-staging: 5.5 -> 5.10 Keep up to date with latest staging developments. --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 964e08674ca6..dd3cae339ca1 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.5"; + version = "5.10"; url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "1z7mvl6fgk7cg8vmy157r8azcz89srnckbzvsc6cva7a1fdi7qx0"; + sha256 = "0g9k094biyjc0ng3vnncdr1psf0ykn36nqirrqdzc5y82s9a1alv"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0wcj73xcxsk5897m5fg14cjir2md167m09jjjv9z9n6157bfr9fw"; + sha256 = "1nnj52g0kp7i38qw85sp5qsf7gph1hh3ywibrdfpjmjpyj30v7sw"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 98dda1a838751d02ccb9a9c283627fcc02e34d0a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 18 Jun 2020 05:41:56 +0000 Subject: [PATCH 38/79] zoom-us: 5.0.418682.0603 -> 5.1.412382.0614 Add @doronbehar as maintainer, and update list of files to install. --- .../networking/instant-messengers/zoom-us/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 7f5cf65e0937..e82fbc7bebce 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.0.418682.0603"; + version = "5.1.412382.0614"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1vlba3jgp3dr16n5g29l0dpdd054d8h6lkwk3a6346shvd46mpja"; + sha256 = "07xb3v5i08wq0a3my9id91gizsxj5ppqvxmcbdy04j7yn4i1jm9x"; }; }; @@ -60,7 +60,6 @@ in mkDerivation { "zcacert.pem" "zoom" "zoom.sh" - "zoomlinux" "zopen" ]; in '' @@ -126,7 +125,7 @@ in mkDerivation { description = "zoom.us video conferencing application"; license = stdenv.lib.licenses.unfree; platforms = builtins.attrNames srcs; - maintainers = with stdenv.lib.maintainers; [ danbst tadfisher ]; + maintainers = with stdenv.lib.maintainers; [ danbst tadfisher doronbehar ]; }; } From 9e7da183828cf83efc794ddde40ff5ead7fc6631 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 31 Mar 2020 15:57:40 +0800 Subject: [PATCH 39/79] swiftshader: init at 2020-06-17 --- .../libraries/swiftshader/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/libraries/swiftshader/default.nix diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix new file mode 100644 index 000000000000..3965f46bd8d8 --- /dev/null +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext }: + +stdenv.mkDerivation rec { + pname = "swiftshader"; + version = "2020-06-17"; + + src = fetchgit { + url = "https://swiftshader.googlesource.com/SwiftShader"; + rev = "763957e6b4fc1aa360ab19c4109b8b26686783e8"; + sha256 = "0sdh48swx0qyq2nfkv1nggs14am0qc7z239qrxb69p2ddqm76g1s"; + }; + + nativeBuildInputs = [ cmake python3 jq ]; + buildInputs = [ libX11 libXext ]; + + # Make sure we include the drivers and icd files in the output as the cmake + # generated install command only puts in the spirv-tools stuff. + installPhase = '' + runHook preInstall + + # + # Vulkan driver + # + vk_so_path="$out/lib/libvk_swiftshader.so" + mkdir -p "$(dirname "$vk_so_path")" + mv Linux/libvk_swiftshader.so "$vk_so_path" + + vk_icd_json="$out/share/vulkan/icd.d/vk_swiftshader_icd.json" + mkdir -p "$(dirname "$vk_icd_json")" + jq ".ICD.library_path = \"$vk_so_path\"" "$vk_icd_json" + + # + # GL driver + # + gl_so_path="$out/lib/libEGL.so" + mkdir -p "$(dirname "$gl_so_path")" + mv Linux/libEGL.so "$gl_so_path" + + gl_icd_json="$out/share/glvnd/egl_vendor.d/swiftshader.json" + mkdir -p "$(dirname "$gl_icd_json")" + cat >"$gl_icd_json" < Date: Wed, 17 Jun 2020 11:13:44 +0200 Subject: [PATCH 40/79] prometheus-redis-exporter: init at 1.7.0 --- .../prometheus/redis-exporter-deps.nix | 390 ++++++++++++++++++ .../monitoring/prometheus/redis-exporter.nix | 32 ++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 423 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/redis-exporter-deps.nix create mode 100644 pkgs/servers/monitoring/prometheus/redis-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/redis-exporter-deps.nix new file mode 100644 index 000000000000..33747715fbef --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/redis-exporter-deps.nix @@ -0,0 +1,390 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a751"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "c3de453c63f4"; + sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.1"; + sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; + }; + } + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v2.1.1"; + sha256 = "0rl5rs8546zj1vzggv38w93wx0b5dvav7yy5hzxa8kw7iikv1cgr"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.9.0"; + sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.4.0"; + sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.4.0"; + sha256 = "1fjvl5n77abxz5qsd4mgyvjq19x43c5bfvmq62mq3m5plx6zksc8"; + }; + } + { + goPackagePath = "github.com/gomodule/redigo"; + fetch = { + type = "git"; + url = "https://github.com/gomodule/redigo"; + rev = "v1.8.2"; + sha256 = "0wp37175n4lgkq234px9vx0c7mdx8sx3d45zky73az8zbabirwga"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.4.0"; + sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "v1.0.0"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.9"; + sha256 = "0pkn2maymgl9v6vmq9q1si8xr5bbl88n6981y0lx09px6qxb29qx"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.3"; + sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v1.6.0"; + sha256 = "0wwkx69in9dy5kzd3z6rrqf5by8cwl9r7r17fswcpx9rl3g61x1l"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "v0.2.0"; + sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.9.1"; + sha256 = "12pyywb02p7d30ccm41mwn69qsgqnsgv1w9jlqrrln2f1svnbqch"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "v0.0.11"; + sha256 = "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.6.0"; + sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.5.1"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d28f0bde5980"; + sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "1957bb5e6d1f"; + sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; + }; + } + { + goPackagePath = "google.golang.org/protobuf"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/protobuf"; + rev = "v1.21.0"; + sha256 = "12bwln8z1lf9105gdp6ip0rx741i4yfz1520gxnp8861lh9wcl63"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "41f04d3bba15"; + sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.5"; + sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix new file mode 100644 index 000000000000..13172bdde0df --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "redis_exporter"; + version = "1.7.0"; + + goPackagePath = "github.com/oliver006/redis_exporter"; + + src = fetchFromGitHub { + owner = "oliver006"; + repo = "redis_exporter"; + rev = "v${version}"; + sha256 = "0rwaxpylividyxz0snfgck32kvpgjkhg20bmdnlp35cdzxcxi8m1"; + }; + + goDeps = ./redis-exporter-deps.nix; + + buildFlagsArray = '' + -ldflags= + -X main.BuildVersion=${version} + -X main.BuildCommitSha=unknown + -X main.BuildDate=unknown + ''; + + meta = with stdenv.lib; { + description = "Prometheus exporter for Redis metrics"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ srhb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b75778322fe..69207598fa2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16198,6 +16198,7 @@ in prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; + prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; From 9740f61b318e1797615d010a8c2330279e8a20b6 Mon Sep 17 00:00:00 2001 From: Erik Skytthe Date: Wed, 17 Jun 2020 12:10:03 +0200 Subject: [PATCH 41/79] maintainers: add eskytthe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b75cb49467a0..0c895f629645 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2448,6 +2448,12 @@ githubId = 7432848; name = "Daniel Albert"; }; + eskytthe = { + email = "eskytthe@gmail.com"; + github = "eskytthe"; + githubId = 2544204; + name = "Erik Skytthe"; + }; Esteth = { email = "adam.copp@gmail.com"; name = "Adam Copp"; From ac3a50122bb33ee72a0a243673bf2c619ec86486 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 17 Jun 2020 14:06:50 +0200 Subject: [PATCH 42/79] prometheus-redis-exporter: add eskytthe to maintainers --- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 13172bdde0df..ea15fecc8ef0 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -26,7 +26,7 @@ buildGoPackage rec { description = "Prometheus exporter for Redis metrics"; inherit (src.meta) homepage; license = licenses.mit; - maintainers = with maintainers; [ srhb ]; + maintainers = with maintainers; [ eskytthe srhb ]; platforms = platforms.unix; }; } From 344e64a4d970a180fc0bc1054cb5fd503dc1daa8 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 18 Jun 2020 07:46:52 +0200 Subject: [PATCH 43/79] nixos/prometheus-redis-exporter: init --- .../monitoring/prometheus/exporters.nix | 1 + .../monitoring/prometheus/exporters/redis.nix | 19 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 14 ++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/redis.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 0318acae50f7..29f402b212fe 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -39,6 +39,7 @@ let "node" "postfix" "postgres" + "redis" "rspamd" "snmp" "surfboard" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/redis.nix b/nixos/modules/services/monitoring/prometheus/exporters/redis.nix new file mode 100644 index 000000000000..befbcb21f766 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/redis.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.redis; +in +{ + port = 9121; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-redis-exporter}/bin/redis_exporter \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 4dbd64312224..75c4ca12db24 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -475,6 +475,20 @@ let ''; }; + redis = { + exporterConfig = { + enable = true; + }; + metricProvider.services.redis.enable = true; + exporterTest = '' + wait_for_unit("redis.service") + wait_for_unit("prometheus-redis-exporter.service") + wait_for_open_port(6379) + wait_for_open_port(9121) + wait_until_succeeds("curl -sSf localhost:9121/metrics | grep -q 'redis_up 1'") + ''; + }; + rspamd = { exporterConfig = { enable = true; From bb7b4cdfcb60d547d010114beb626311777cc3da Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 18 Jun 2020 04:20:00 -0500 Subject: [PATCH 44/79] nodejs-12_x: 12.18.0 -> 12.18.1 Changelog: https://github.com/nodejs/node/releases/tag/v12.18.1 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index c28657c3bb1d..214292afbbe1 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.18.0"; - sha256 = "0gxi0cxkiylxr4spm3vg6n9w3x82770xaazhax8pydkqlcv8cs6l"; + version = "12.18.1"; + sha256 = "0yjwd8yilm85wkginvhhchcikjsl8g3l3qagbg0l2y1hg8f0anfa"; } From 79987057c4bb8364941e1ed9a95f2b5724bb9c83 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Thu, 18 Jun 2020 17:27:27 +0800 Subject: [PATCH 45/79] exfat: fix cross compilation --- pkgs/os-specific/linux/exfat/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index e66ac4d65ab9..59f9c709e5fa 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "ARCH=${stdenv.hostPlatform.platform.kernelArch}" + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; installPhase = '' From 5c35515adf0bc10803cd7eaa88d96c8cec2ddf94 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 18 Jun 2020 15:07:42 +1000 Subject: [PATCH 46/79] buildah: 1.14.9 -> 1.15.0 https://github.com/containers/buildah/releases/tag/v1.15.0 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index d033fe52e6c2..3b1e0aaa00f6 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.14.9"; + version = "1.15.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "1vp59xp374wr7sbx89aikz4rv8fdg0a40v06saryxww9iqyvk8wp"; + sha256 = "0nhqw8s8m819mhb0kpji0if8ji9cmkcb821zab7h65azk0p8qh20"; }; outputs = [ "out" "man" ]; From e4fd4b2a71bca8bf5d682399b238d192dd4ee6b7 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Wed, 17 Jun 2020 10:34:09 +0200 Subject: [PATCH 47/79] devdocs-desktop: init at 0.7.1 Also added ymarkus to maintainers list. --- maintainers/maintainer-list.nix | 6 +++ .../misc/devdocs-desktop/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 51 insertions(+) create mode 100644 pkgs/applications/misc/devdocs-desktop/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cb3a7ee592b0..47ef2cc1f6ce 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8915,6 +8915,12 @@ githubId = 474343; name = "Xavier Zwirtz"; }; + ymarkus = { + name = "Yannick Markus"; + email = "nixpkgs@ymarkus.dev"; + github = "ymarkus"; + githubId = 62380378; + }; ymeister = { name = "Yuri Meister"; email = "47071325+ymeister@users.noreply.github.com"; diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix new file mode 100644 index 000000000000..7c1726961339 --- /dev/null +++ b/pkgs/applications/misc/devdocs-desktop/default.nix @@ -0,0 +1,43 @@ +{ stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: + +let + version = "0.7.1"; + pname = "devdocs-desktop"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/egoist/devdocs-desktop/releases/download/v${version}/DevDocs-${version}.AppImage"; + sha256 = "5bba99a34c90a65eff67aface0b7446cbf43d620a1c195f27e7bb33ab6d3d0c2"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in appimageTools.wrapType2 rec { + inherit name src; + + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/devdocs.desktop $out/share/applications/devdocs.desktop + install -m 444 -D ${appimageContents}/devdocs.png $out/share/icons/hicolor/0x0/apps/devdocs.png + substituteInPlace $out/share/applications/devdocs.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with stdenv.lib; { + description = "A full-featured desktop app for DevDocs.io"; + longDescription = '' + DevDocs.io combines multiple API documentations in a fast, organized, and searchable interface. This is an unofficial desktop app for it. + ''; + homepage = "https://github.com/egoist/devdocs-desktop"; + downloadPage = "https://github.com/egoist/devdocs-desktop/releases"; + license = licenses.mit; + maintainers = with maintainers; [ ymarkus ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18c9cf0165bc..c161f34e175d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1656,6 +1656,8 @@ in desync = callPackage ../applications/networking/sync/desync { }; + devdocs-desktop = callPackage ../applications/misc/devdocs-desktop { }; + devmem2 = callPackage ../os-specific/linux/devmem2 { }; dbus-broker = callPackage ../os-specific/linux/dbus-broker { }; From 6211720e3bfa49c33bad4fa5713a8de1e4327eb3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 18 Jun 2020 20:10:07 +1000 Subject: [PATCH 48/79] fuse-overlayfs: 1.0.0 -> 1.1.0 https://github.com/containers/fuse-overlayfs/releases/tag/v1.1.0 --- pkgs/tools/filesystems/fuse-overlayfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index f21f19eb7251..46f6bb404ae9 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "0h1ay2l7zyiqplh8whanw68mcfri79lc03wjjrhqji5ddwznv6fa"; + sha256 = "0dv62kyc8hvwb4gkhyxzwagp87nv0mr1612dz6q835is1vqav134"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 71c0dbd5a4963c1fc24dc3a20628cfc3ac95b033 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 18 Jun 2020 19:13:04 +0800 Subject: [PATCH 49/79] cargo-insta: init at 0.16.0 --- .../tools/rust/cargo-insta/cargo-lock.patch | 780 ++++++++++++++++++ .../tools/rust/cargo-insta/default.nix | 27 + .../cargo-insta/ignore-rustfmt-test.patch | 10 + pkgs/top-level/all-packages.nix | 1 + 4 files changed, 818 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-insta/cargo-lock.patch create mode 100644 pkgs/development/tools/rust/cargo-insta/default.nix create mode 100644 pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch diff --git a/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch b/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch new file mode 100644 index 000000000000..96f7d9ffb660 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch @@ -0,0 +1,780 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -0,0 +1,777 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "addr2line" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler32" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.49" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" ++dependencies = [ ++ "addr2line", ++ "cfg-if", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "base64" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" ++dependencies = [ ++ "byteorder", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "block-buffer" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" ++dependencies = [ ++ "block-padding", ++ "byte-tools", ++ "byteorder", ++ "generic-array", ++] ++ ++[[package]] ++name = "block-padding" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" ++dependencies = [ ++ "byte-tools", ++] ++ ++[[package]] ++name = "bstr" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "byte-tools" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++ ++[[package]] ++name = "cargo-insta" ++version = "0.16.0" ++dependencies = [ ++ "clap", ++ "console", ++ "difference", ++ "glob", ++ "insta", ++ "proc-macro2", ++ "serde", ++ "serde_json", ++ "structopt", ++ "syn", ++ "walkdir", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "clap" ++version = "2.33.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "clicolors-control" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" ++dependencies = [ ++ "atty", ++ "lazy_static", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "console" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2586208b33573b7f76ccfbe5adb076394c88deaf81b84d7213969805b0a952a7" ++dependencies = [ ++ "clicolors-control", ++ "encode_unicode", ++ "lazy_static", ++ "libc", ++ "regex", ++ "terminal_size", ++ "termios", ++ "unicode-width", ++ "winapi", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" ++dependencies = [ ++ "autocfg", ++ "cfg-if", ++ "lazy_static", ++] ++ ++[[package]] ++name = "difference" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" ++ ++[[package]] ++name = "digest" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "dtoa" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" ++ ++[[package]] ++name = "encode_unicode" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" ++ ++[[package]] ++name = "fake-simd" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "generic-array" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" ++dependencies = [ ++ "typenum", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.21.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" ++ ++[[package]] ++name = "glob" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++ ++[[package]] ++name = "globset" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120" ++dependencies = [ ++ "aho-corasick", ++ "bstr", ++ "fnv", ++ "log", ++ "regex", ++] ++ ++[[package]] ++name = "globwalk" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "178270263374052c40502e9f607134947de75302c1348d1a0e31db67c1691446" ++dependencies = [ ++ "bitflags", ++ "ignore", ++ "walkdir", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" ++dependencies = [ ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "ignore" ++version = "0.4.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22dcbf2a4a289528dbef21686354904e1c694ac642610a9bff9e7df730d9ec72" ++dependencies = [ ++ "crossbeam-utils", ++ "globset", ++ "lazy_static", ++ "log", ++ "memchr", ++ "regex", ++ "same-file", ++ "thread_local", ++ "walkdir", ++ "winapi-util", ++] ++ ++[[package]] ++name = "insta" ++version = "0.16.0" ++dependencies = [ ++ "backtrace", ++ "console", ++ "difference", ++ "globwalk", ++ "lazy_static", ++ "pest", ++ "pest_derive", ++ "ron", ++ "serde", ++ "serde_json", ++ "serde_yaml", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" ++ ++[[package]] ++name = "linked-hash-map" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "maplit" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" ++ ++[[package]] ++name = "memchr" ++version = "2.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" ++dependencies = [ ++ "adler32", ++] ++ ++[[package]] ++name = "object" ++version = "0.20.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" ++ ++[[package]] ++name = "opaque-debug" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" ++ ++[[package]] ++name = "pest" ++version = "2.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" ++dependencies = [ ++ "ucd-trie", ++] ++ ++[[package]] ++name = "pest_derive" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" ++dependencies = [ ++ "pest", ++ "pest_generator", ++] ++ ++[[package]] ++name = "pest_generator" ++version = "2.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" ++dependencies = [ ++ "pest", ++ "pest_meta", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pest_meta" ++version = "2.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" ++dependencies = [ ++ "maplit", ++ "pest", ++ "sha-1", ++] ++ ++[[package]] ++name = "proc-macro-error" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "syn-mid", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "regex" ++version = "1.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" ++ ++[[package]] ++name = "ron" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5" ++dependencies = [ ++ "base64", ++ "bitflags", ++ "serde", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "serde" ++version = "1.0.112" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "736aac72d1eafe8e5962d1d1c3d99b0df526015ba40915cb3c49d042e92ec243" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.112" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bf0343ce212ac0d3d6afd9391ac8e9c9efe06b533c8d33f660f6390cc4093f57" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec2c5d7e739bc07a3e73381a39d61fdb5f671c60c1df26a130690665803d8226" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "serde_yaml" ++version = "0.8.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" ++dependencies = [ ++ "dtoa", ++ "linked-hash-map", ++ "serde", ++ "yaml-rust", ++] ++ ++[[package]] ++name = "sha-1" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" ++dependencies = [ ++ "block-buffer", ++ "digest", ++ "fake-simd", ++ "opaque-debug", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "structopt" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" ++dependencies = [ ++ "clap", ++ "lazy_static", ++ "structopt-derive", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" ++dependencies = [ ++ "heck", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "syn-mid" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "terminal_size" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8038f95fc7a6f351163f4b964af631bd26c9e828f7db085f2a84aca56f70d13b" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "termios" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" ++ ++[[package]] ++name = "ucd-trie" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "version_check" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" ++dependencies = [ ++ "same-file", ++ "winapi", ++ "winapi-util", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "yaml-rust" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" ++dependencies = [ ++ "linked-hash-map", ++] diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix new file mode 100644 index 000000000000..3b21fbf153cb --- /dev/null +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub, runCommand }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-insta"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "mitsuhiko"; + repo = "insta"; + rev = version; + sha256 = "1lcbdzh139lhmpz3pyik8nbgrbfc42z9ydz2hkg2lzjdpfdsz3ag"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "0qjzbcaznnmb0p0r23s82jjbfs5mhhkacg26lf8fq4vvlkr1hsqf"; + + patches = [ ./ignore-rustfmt-test.patch ]; + + cargoBuildFlags = [ "-p cargo-insta" ]; + + meta = with lib; { + description = "A Cargo subcommand for snapshot testing"; + homepage = "https://github.com/mitsuhiko/insta"; + license = licenses.asl20; + maintainers = with lib.maintainers; [ oxalica ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch b/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch new file mode 100644 index 000000000000..6c38158d5964 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch @@ -0,0 +1,10 @@ +--- a/src/runtime.rs ++++ b/src/runtime.rs +@@ -85,6 +85,7 @@ fn format_rust_expression(value: &str) -> Cow<'_, str> { + } + + #[test] ++#[ignore] + fn test_format_rust_expression() { + use crate::assert_snapshot; + assert_snapshot!(format_rust_expression("vec![1,2,3]"), @"vec![1, 2, 3]"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b75778322fe..46bb13bdf1d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9225,6 +9225,7 @@ in cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security; }; From 2e7e277b893e9368772714d50b8fb0c700becd1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 18 Jun 2020 08:17:12 -0300 Subject: [PATCH 50/79] matcha-gtk-theme: 2020-05-24 -> 2020-06-18 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index f0617e56d789..5edc2990c025 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-05-24"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "186ypnkyaqjw671ny363xmixw6zdvrgj9xvmsrdgr8i0h3z8qwr8"; + sha256 = "1hgwlzyfxl8yw93r0vsnvi51a4k5bn5qw1axhldy5l928qhmd5x7"; }; buildInputs = [ gdk-pixbuf librsvg ]; From 5af8ad3e6d2e0e2e63534d1a95eb44669e64b3a5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jun 2020 07:49:48 -0400 Subject: [PATCH 51/79] linux: 5.4.46 -> 5.4.47 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 1c5bfad41681..a2fbbbe37349 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.46"; + version = "5.4.47"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "13hvnfdcbcb9a21zizq8d90mc8maxz03zmzsj6iqsjd2y7r4y1rh"; + sha256 = "0v4d86yci4lq82nb1fgf0g3j0348v6q6m77czpm4b3cs7lwrs2wp"; }; } // (args.argsOverride or {})) From 0d0b50436cbc7fc2b30b4b01e9b3cc457ba30288 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jun 2020 07:50:05 -0400 Subject: [PATCH 52/79] linux: 5.6.18 -> 5.6.19 --- pkgs/os-specific/linux/kernel/linux-5.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index bf245442ecef..478cdf71bf44 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.18"; + version = "5.6.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0cpiyzr62sv2yz0mla7skalb04pnr4nlkpi1zfcfzyjf1gjz8h8h"; + sha256 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2"; }; } // (args.argsOverride or {})) From 4f7e011f874e121a7e1a2059b38f9143cca9fce7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jun 2020 07:50:12 -0400 Subject: [PATCH 53/79] linux: 5.7.2 -> 5.7.3 --- pkgs/os-specific/linux/kernel/linux-5.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index c7f1389f1128..0f04abfec8fd 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.2"; + version = "5.7.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "02brxm78n0kg4mh48acvjsr7mpvaqd279ycyaixaflid1s1awrb0"; + sha256 = "1sgwdcyn9105lfgg25q41yj30sy9cqfdm8m4dmka8gzllxxyq407"; }; } // (args.argsOverride or {})) From 9de1c659e4c8b2fbf9440daedb7d313fedc66193 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jun 2020 07:52:03 -0400 Subject: [PATCH 54/79] oh-my-zsh: 2020-06-17 -> 2020-06-18 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 6896904ec9a4..37374900a4ec 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-06-17"; + version = "2020-06-18"; pname = "oh-my-zsh"; - rev = "d47447a5e63715ae6ab6c2f46924dc8766c8e746"; + rev = "5ffc0d036c587741fd25092e7809dad2b00b3677"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1hfinbmwwinvqnv3ldcja8gqh9n6ll6749055vk8icdixa9jwcyl"; + sha256 = "04a9zg3l824wywk0qcm0pc4n4522cqljyix7kh3frc4psqnhh8qr"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From d1966f086021fdbd708da37be775e066d298b522 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jun 2020 07:53:56 -0400 Subject: [PATCH 55/79] jenkins: 2.222.4 -> 2.235.1 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3631b4494a4d..d9d7b490cf14 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.222.4"; + version = "2.235.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0z64w5rv1x9kpjxcb05if9pk0abl9nlbijh2i3nlja97j0dp55bc"; + sha256 = "0pb7dy95ygvyb25hm6akf40f5gr5wa2njad7ncglrpmz14xfnxb3"; }; buildCommand = '' From 94e7fdf439adb286670ce8b89d0b0e02d55d275f Mon Sep 17 00:00:00 2001 From: Thom Leggett Date: Tue, 16 Jun 2020 17:15:59 +0100 Subject: [PATCH 56/79] open-vm-tools: fix build https://github.com/vmware/open-vm-tools/pull/438 Fixes #90544 --- .../virtualization/open-vm-tools/default.nix | 10 +++++++--- .../open-vm-tools/find_gdk_pixbuf_xlib.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 84f74ef6dd03..46d91884fcd3 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which, + pkgconfig, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { @@ -21,9 +21,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] - ++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + + patches = [ + ./recognize_nixos.patch + ./find_gdk_pixbuf_xlib.patch #See https://github.com/vmware/open-vm-tools/pull/438 + ]; - patches = [ ./recognize_nixos.patch ]; postPatch = '' # Build bugfix for 10.1.0, stolen from Arch PKGBUILD mkdir -p common-agent/etc/config diff --git a/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch b/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch new file mode 100644 index 000000000000..6606c50e77d9 --- /dev/null +++ b/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch @@ -0,0 +1,12 @@ +diff --git a/lib/appUtil/Makefile.am b/lib/appUtil/Makefile.am +index a0d8e391..899cd4e9 100644 +--- a/lib/appUtil/Makefile.am ++++ b/lib/appUtil/Makefile.am +@@ -21,4 +21,6 @@ libAppUtil_la_SOURCES = + libAppUtil_la_SOURCES += appUtil.c + libAppUtil_la_SOURCES += appUtilX11.c + +-AM_CFLAGS = @GTK_CPPFLAGS@ ++AM_CFLAGS = ++AM_CFLAGS += @GTK_CPPFLAGS@ ++AM_CFLAGS += @GDK_PIXBUF_XLIB2_CPPFLAGS@ From 030fd3ca0cbb8463e5dc1ebd57bb1867f5fbe91c Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 18 Jun 2020 20:49:20 +0800 Subject: [PATCH 57/79] cargo-insta: strip unused variable --- pkgs/development/tools/rust/cargo-insta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 3b21fbf153cb..e621fa9b9724 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, runCommand }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-insta"; From 46db244d2d3e2da47672fdd1239e1ba1f3c4523d Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Thu, 18 Jun 2020 07:10:54 -0700 Subject: [PATCH 58/79] go-swagger: init at 0.24.0 (#90682) * go-swagger: init at 0.24.0 * Apply suggestions from code review Co-authored-by: Jon Co-authored-by: Jon --- pkgs/development/tools/go-swagger/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/go-swagger/default.nix diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix new file mode 100644 index 000000000000..e2a0402348a1 --- /dev/null +++ b/pkgs/development/tools/go-swagger/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "go-swagger"; + version = "0.24.0"; + + src = fetchFromGitHub { + owner = "go-swagger"; + repo = pname; + rev = "v${version}"; + sha256 = "051av25vnrcpvj9w6mqalwk7byw52m2dlh1m56y30xvm0ybbnayn"; + }; + + vendorSha256 = "020z4izc8i4yhbbr8h2fn8bqbis9q9yfcrjnixd6rsiayw1brh4p"; + + subPackages = [ "cmd/swagger" ]; + + meta = with lib; { + description = "Golang implementation of Swagger 2.0, representation of your RESTful API"; + homepage = "https://github.com/go-swagger/go-swagger"; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abf0f03575b2..6ed191d2abb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26294,6 +26294,8 @@ in sqsh = callPackage ../development/tools/sqsh { }; + go-swagger = callPackage ../development/tools/go-swagger { }; + jx = callPackage ../applications/networking/cluster/jx {}; prow = callPackage ../applications/networking/cluster/prow { }; From 33d79f110d999596bd08726d812e752edcdbf8dc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Jun 2020 12:45:19 +0200 Subject: [PATCH 59/79] nixos/openldap: fix eval Fixes error: The option value `meta.maintainers' in `nixos/modules/services/databases/openldap.nix' is not of type `list of maintainers'. --- nixos/modules/services/databases/openldap.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 8c2851c37ac2..9b4d9a98b745 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -232,7 +232,7 @@ in }; meta = { - maintainers = lib.maintainers.mic92; + maintainers = [ lib.maintainers.mic92 ]; }; From 51dad859473009630a053b4b0d0d5d76f280af7d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Jun 2020 16:17:56 +0200 Subject: [PATCH 60/79] nixos/hamster: fix eval Fixes error: The option value `meta.maintainers' in `nixos/modules/programs/hamster.nix' is not of type `list of maintainers'. --- nixos/modules/programs/hamster.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/hamster.nix b/nixos/modules/programs/hamster.nix index ddf26a22fb53..b2f4a82b260e 100644 --- a/nixos/modules/programs/hamster.nix +++ b/nixos/modules/programs/hamster.nix @@ -3,7 +3,7 @@ with lib; { - meta.maintainers = maintainers.fabianhauser; + meta.maintainers = pkgs.hamster.meta.maintainers; options.programs.hamster.enable = mkEnableOption "Whether to enable hamster time tracking."; From 9538bf50aebdfb235932568f2e7b385e4571fef2 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 18 Jun 2020 16:32:43 +0200 Subject: [PATCH 61/79] nixos/buildbot-master: support reporters, migrate away from status Since Buildbot 0.9.0, status targets were deprecated and ignored. There's a very small line on startup explaining that, and status simply isn't reported. Avoid others the same headaches, and do it right in the NixOS module. As there might have been changes in the way reporters are organized, and configuration might need to be migrated remove the old option, and not just provide an alias. --- .../continuous-integration/buildbot/master.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 0185f490b0c2..e1950b91382b 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -25,7 +25,7 @@ let change_source = [ ${concatStringsSep "," cfg.changeSource} ], schedulers = [ ${concatStringsSep "," cfg.schedulers} ], builders = [ ${concatStringsSep "," cfg.builders} ], - status = [ ${concatStringsSep "," cfg.status} ], + services = [ ${concatStringsSep "," cfg.reporters} ], ) for step in [ ${concatStringsSep "," cfg.factorySteps} ]: factory.addStep(step) @@ -119,10 +119,10 @@ in { default = [ "worker.Worker('example-worker', 'pass')" ]; }; - status = mkOption { + reporters = mkOption { default = []; type = types.listOf types.str; - description = "List of status notification endpoints."; + description = "List of reporter objects used to present build status to various users."; }; user = mkOption { @@ -276,6 +276,10 @@ in { imports = [ (mkRenamedOptionModule [ "services" "buildbot-master" "bpPort" ] [ "services" "buildbot-master" "pbPort" ]) + (mkRemovedOptionModule [ "services" "buildbot-master" "status" ] '' + Since Buildbot 0.9.0, status targets are deprecated and ignored. + Review your configuration and migrate to reporters (available at services.buildbot-master.reporters). + '') ]; meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; From f5a57c6c40d69f600fcb4e46d2adaa0affc56f9d Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 21 Apr 2020 13:56:52 +0200 Subject: [PATCH 62/79] mailman-web: remove django version checks and override This is nonsense! Postorius and Hyperkitty don't even support 1.11 anymore. --- pkgs/servers/mail/mailman/web.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index f770f2e4489d..53fdf851cfe8 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,6 +1,5 @@ { buildPythonPackage, lib, fetchgit, isPy3k , git, makeWrapper, sassc, hyperkitty, postorius, whoosh -, django }: buildPythonPackage rec { @@ -17,8 +16,13 @@ buildPythonPackage rec { # This is just so people installing from pip also get uwsgi # installed, AFAICT. + + # Django is depended on transitively by hyperkitty and postorius, + # and mailman_web has overly restrictive version bounds on it, so + # let's remove it. postPatch = '' sed -i '/^ uwsgi$/d' setup.cfg + sed -i '/^ Django/d' setup.cfg ''; nativeBuildInputs = [ git makeWrapper ]; @@ -36,7 +40,5 @@ buildPythonPackage rec { description = "Django project for Mailman 3 web interface"; license = licenses.gpl3; maintainers = with maintainers; [ peti qyliss ]; - # mailman-web requires django < 2.2 - broken = versionOlder "2.2" django.version; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a0bb8018efe..42cc71cda63e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15830,11 +15830,7 @@ in mailman-rss = callPackage ../development/python-modules/mailman-rss { }; - mailman-web = with (python3.override { - packageOverrides = self: super: { - django = self.django_1_11; - }; - }).pkgs; toPythonApplication mailman-web; + mailman-web = with python3.pkgs; toPythonApplication mailman-web; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; From b478e0043c53964c99cc9a145c155a673af3c7d8 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 15 Apr 2020 14:02:59 +0200 Subject: [PATCH 63/79] nixos/mailman: refactor - Add serve.enable option, which configures uwsgi and nginx to serve the mailman-web application; - Configure services to log to the journal, where possible. Mailman Core does not provide any options for this, but will now log to /var/log/mailman; - Use a unified python environment for all components, with an extraPackages option to allow use of postgres support and similar; - Configure mailman's postfix module such that it can generate the domain and lmtp maps; - Fix formatting for option examples; - Provide a mailman-web user to run the uwsgi service by default - Refactor Hyperkitty's periodic jobs to reduce repetition in the expressions; - Remove service dependencies not related to functionality included in the module, such as httpd -- these should be configured in user config when used; - Move static files root to /var/lib/mailman-web-static by default. This avoids permission issues when a static file web server attempts to access /var/lib/mailman which is private to mailman. The location can still be changed by setting services.mailman.webSettings.STATIC_ROOT; - Remove the webRoot option, which seems to have been included by accident, being an unsuitable directory for serving via HTTP. - Rename mailman-web.service to mailman-web-setup.service, since it doesn't actually serve mailman-web. There is now a mailman-uwsgi.service if serve.enable is set to true. --- nixos/modules/services/mail/mailman.nix | 389 +++++++++++++----------- 1 file changed, 206 insertions(+), 183 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index f5e78b182933..4167b2ca85f1 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -6,6 +6,11 @@ let cfg = config.services.mailman; + pythonEnv = pkgs.python3.withPackages (ps: + [ps.mailman ps.mailman-web] + ++ lib.optional cfg.hyperkitty.enable ps.mailman-hyperkitty + ++ cfg.extraPythonPackages); + # This deliberately doesn't use recursiveUpdate so users can # override the defaults. settings = { @@ -13,12 +18,28 @@ let SERVER_EMAIL = cfg.siteOwner; ALLOWED_HOSTS = [ "localhost" "127.0.0.1" ] ++ cfg.webHosts; COMPRESS_OFFLINE = true; - STATIC_ROOT = "/var/lib/mailman-web/static"; + STATIC_ROOT = "/var/lib/mailman-web-static"; MEDIA_ROOT = "/var/lib/mailman-web/media"; + LOGGING = { + version = 1; + disable_existing_loggers = true; + handlers.console.class = "logging.StreamHandler"; + loggers.django = { + handlers = [ "console" ]; + level = "INFO"; + }; + }; } // cfg.webSettings; settingsJSON = pkgs.writeText "settings.json" (builtins.toJSON settings); + # TODO: Should this be RFC42-ised so that users can set additional options without modifying the module? + mtaConfig = pkgs.writeText "mailman-postfix.cfg" '' + [postfix] + postmap_command: ${pkgs.postfix}/bin/postmap + transport_file_type: hash + ''; + mailmanCfg = '' [mailman] site_owner: ${cfg.siteOwner} @@ -29,11 +50,14 @@ let var_dir: /var/lib/mailman queue_dir: $var_dir/queue template_dir: $var_dir/templates - log_dir: $var_dir/log + log_dir: /var/log/mailman lock_dir: $var_dir/lock etc_dir: /etc ext_dir: $etc_dir/mailman.d pid_file: /run/mailman/master.pid + + [mta] + configuration: ${mtaConfig} '' + optionalString cfg.hyperkitty.enable '' [archiver.hyperkitty] @@ -84,7 +108,7 @@ in { type = types.package; default = pkgs.mailman; defaultText = "pkgs.mailman"; - example = "pkgs.mailman.override { archivers = []; }"; + example = literalExample "pkgs.mailman.override { archivers = []; }"; description = "Mailman package to use"; }; @@ -98,18 +122,6 @@ in { ''; }; - webRoot = mkOption { - type = types.path; - default = "${pkgs.mailman-web}/${pkgs.python3.sitePackages}"; - defaultText = "\${pkgs.mailman-web}/\${pkgs.python3.sitePackages}"; - description = '' - The web root for the Hyperkity + Postorius apps provided by Mailman. - This variable can be set, of course, but it mainly exists so that site - admins can refer to it in their own hand-written web server - configuration files. - ''; - }; - webHosts = mkOption { type = types.listOf types.str; default = []; @@ -124,7 +136,7 @@ in { webUser = mkOption { type = types.str; - default = config.services.httpd.user; + default = "mailman-web"; description = '' User to run mailman-web as ''; @@ -138,6 +150,16 @@ in { ''; }; + serve = { + enable = mkEnableOption "Automatic nginx and uwsgi setup for mailman-web"; + }; + + extraPythonPackages = mkOption { + description = "Packages to add to the python environment used by mailman and mailman-web"; + type = types.listOf types.package; + default = []; + }; + hyperkitty = { enable = mkEnableOption "the Hyperkitty archiver for Mailman"; @@ -183,7 +205,17 @@ in { (requirePostfixHash [ "config" "local_recipient_maps" ] "postfix_lmtp") ]; - users.users.mailman = { description = "GNU Mailman"; isSystemUser = true; }; + users.users.mailman = { + description = "GNU Mailman"; + isSystemUser = true; + group = "mailman"; + }; + users.users.mailman-web = lib.mkIf (cfg.webUser == "mailman-web") { + description = "GNU Mailman web interface"; + isSystemUser = true; + group = "mailman"; + }; + users.groups.mailman = {}; environment.etc."mailman.cfg".text = mailmanCfg; @@ -205,7 +237,28 @@ in { globals().update(json.load(f)) ''; - environment.systemPackages = [ cfg.package ] ++ (with pkgs; [ mailman-web ]); + services.nginx = mkIf cfg.serve.enable { + enable = mkDefault true; + virtualHosts."${lib.head cfg.webHosts}" = { + serverAliases = cfg.webHosts; + locations = { + "/".extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;"; + "/static/".alias = settings.STATIC_ROOT + "/"; + }; + }; + }; + + environment.systemPackages = [ (pkgs.buildEnv { + name = "mailman-tools"; + # We don't want to pollute the system PATH with a python + # interpreter etc. so let's pick only the stuff we actually + # want from pythonEnv + pathsToLink = ["/bin"]; + paths = [pythonEnv]; + postBuild = '' + find $out/bin/ -mindepth 1 -not -name "mailman*" -delete + ''; + }) ]; services.postfix = { recipientDelimiter = "+"; # bake recipient addresses in mail envelopes via VERP @@ -214,181 +267,151 @@ in { }; }; - systemd.services.mailman = { - description = "GNU Mailman Master Process"; - after = [ "network.target" ]; - restartTriggers = [ config.environment.etc."mailman.cfg".source ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/mailman start"; - ExecStop = "${cfg.package}/bin/mailman stop"; - User = "mailman"; - Type = "forking"; - RuntimeDirectory = "mailman"; - PIDFile = "/run/mailman/master.pid"; - }; + systemd.sockets.mailman-uwsgi = lib.mkIf cfg.serve.enable { + wantedBy = ["sockets.target"]; + before = ["nginx.service"]; + socketConfig.ListenStream = "/run/mailman-web.socket"; }; - - systemd.services.mailman-settings = { - description = "Generate settings files (including secrets) for Mailman"; - before = [ "mailman.service" "mailman-web.service" "hyperkitty.service" "httpd.service" "uwsgi.service" ]; - requiredBy = [ "mailman.service" "mailman-web.service" "hyperkitty.service" "httpd.service" "uwsgi.service" ]; - path = with pkgs; [ jq ]; - script = '' - mailmanDir=/var/lib/mailman - mailmanWebDir=/var/lib/mailman-web - - mailmanCfg=$mailmanDir/mailman-hyperkitty.cfg - mailmanWebCfg=$mailmanWebDir/settings_local.json - - install -m 0700 -o mailman -g nogroup -d $mailmanDir - install -m 0700 -o ${cfg.webUser} -g nogroup -d $mailmanWebDir - - if [ ! -e $mailmanWebCfg ]; then - hyperkittyApiKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64) - secretKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64) - - mailmanWebCfgTmp=$(mktemp) - jq -n '.MAILMAN_ARCHIVER_KEY=$archiver_key | .SECRET_KEY=$secret_key' \ - --arg archiver_key "$hyperkittyApiKey" \ - --arg secret_key "$secretKey" \ - >"$mailmanWebCfgTmp" - chown ${cfg.webUser} "$mailmanWebCfgTmp" - mv -n "$mailmanWebCfgTmp" $mailmanWebCfg - fi - - hyperkittyApiKey="$(jq -r .MAILMAN_ARCHIVER_KEY $mailmanWebCfg)" - mailmanCfgTmp=$(mktemp) - sed "s/@API_KEY@/$hyperkittyApiKey/g" ${mailmanHyperkittyCfg} >"$mailmanCfgTmp" - chown mailman "$mailmanCfgTmp" - mv "$mailmanCfgTmp" $mailmanCfg - ''; - serviceConfig = { - Type = "oneshot"; - # RemainAfterExit makes restartIfChanged work for this service, so - # downstream services will get updated automatically when things like - # services.mailman.hyperkitty.baseUrl change. Otherwise users have to - # restart things manually, which is confusing. - RemainAfterExit = "yes"; + systemd.services = { + mailman = { + description = "GNU Mailman Master Process"; + after = [ "network.target" ]; + restartTriggers = [ config.environment.etc."mailman.cfg".source ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pythonEnv}/bin/mailman start"; + ExecStop = "${pythonEnv}/bin/mailman stop"; + User = "mailman"; + Group = "mailman"; + Type = "forking"; + RuntimeDirectory = "mailman"; + LogsDirectory = "mailman"; + PIDFile = "/run/mailman/master.pid"; + }; }; - }; - systemd.services.mailman-web = { - description = "Init Postorius DB"; - before = [ "httpd.service" "uwsgi.service" ]; - requiredBy = [ "httpd.service" "uwsgi.service" ]; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - script = '' - ${pkgs.mailman-web}/bin/mailman-web migrate - rm -rf static - ${pkgs.mailman-web}/bin/mailman-web collectstatic - ${pkgs.mailman-web}/bin/mailman-web compress - ''; - serviceConfig = { - User = cfg.webUser; - Type = "oneshot"; - # Similar to mailman-settings.service, this makes restartTriggers work - # properly for this service. - RemainAfterExit = "yes"; - WorkingDirectory = "/var/lib/mailman-web"; + mailman-settings = { + description = "Generate settings files (including secrets) for Mailman"; + before = [ "mailman.service" "mailman-web-setup.service" "mailman-uwsgi.service" "hyperkitty.service" ]; + requiredBy = [ "mailman.service" "mailman-web-setup.service" "mailman-uwsgi.service" "hyperkitty.service" ]; + path = with pkgs; [ jq ]; + script = '' + mailmanDir=/var/lib/mailman + mailmanWebDir=/var/lib/mailman-web + + mailmanCfg=$mailmanDir/mailman-hyperkitty.cfg + mailmanWebCfg=$mailmanWebDir/settings_local.json + + install -m 0775 -o mailman -g mailman -d /var/lib/mailman-web-static + install -m 0770 -o mailman -g mailman -d $mailmanDir + install -m 0770 -o ${cfg.webUser} -g mailman -d $mailmanWebDir + + if [ ! -e $mailmanWebCfg ]; then + hyperkittyApiKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64) + secretKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64) + + mailmanWebCfgTmp=$(mktemp) + jq -n '.MAILMAN_ARCHIVER_KEY=$archiver_key | .SECRET_KEY=$secret_key' \ + --arg archiver_key "$hyperkittyApiKey" \ + --arg secret_key "$secretKey" \ + >"$mailmanWebCfgTmp" + chown root:mailman "$mailmanWebCfgTmp" + chmod 440 "$mailmanWebCfgTmp" + mv -n "$mailmanWebCfgTmp" "$mailmanWebCfg" + fi + + hyperkittyApiKey="$(jq -r .MAILMAN_ARCHIVER_KEY "$mailmanWebCfg")" + mailmanCfgTmp=$(mktemp) + sed "s/@API_KEY@/$hyperkittyApiKey/g" ${mailmanHyperkittyCfg} >"$mailmanCfgTmp" + chown mailman:mailman "$mailmanCfgTmp" + mv "$mailmanCfgTmp" "$mailmanCfg" + ''; }; - }; - systemd.services.mailman-daily = { - description = "Trigger daily Mailman events"; - startAt = "daily"; - restartTriggers = [ config.environment.etc."mailman.cfg".source ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/mailman digests --send"; - User = "mailman"; + mailman-web-setup = { + description = "Prepare mailman-web files and database"; + before = [ "uwsgi.service" "mailman-uwsgi.service" ]; + requiredBy = [ "mailman-uwsgi.service" ]; + restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; + script = '' + find "${settings.STATIC_ROOT}/" -mindepth 1 -delete + ${pythonEnv}/bin/mailman-web migrate + ${pythonEnv}/bin/mailman-web collectstatic + ${pythonEnv}/bin/mailman-web compress + ''; + serviceConfig = { + User = cfg.webUser; + Group = "mailman"; + Type = "oneshot"; + WorkingDirectory = "/var/lib/mailman-web"; + }; }; - }; - systemd.services.hyperkitty = { - inherit (cfg.hyperkitty) enable; - description = "GNU Hyperkitty QCluster Process"; - after = [ "network.target" ]; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - wantedBy = [ "mailman.service" "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web qcluster"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; + mailman-uwsgi = mkIf cfg.serve.enable (let + uwsgiConfig.uwsgi = { + type = "normal"; + plugins = ["python3"]; + home = pythonEnv; + module = "mailman_web.wsgi"; + }; + uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig); + in { + wantedBy = ["multi-user.target"]; + requires = ["mailman-uwsgi.socket" "mailman-web-setup.service"]; + restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; + serviceConfig = { + # Since the mailman-web settings.py obstinately creates a logs + # dir in the cwd, change to the (writable) runtime directory before + # starting uwsgi. + ExecStart = "${pkgs.coreutils}/bin/env -C $RUNTIME_DIRECTORY ${pkgs.uwsgi.override { plugins = ["python3"]; }}/bin/uwsgi --json ${uwsgiConfigFile}"; + User = cfg.webUser; + Group = "mailman"; + RuntimeDirectory = "mailman-uwsgi"; + }; + }); + + mailman-daily = { + description = "Trigger daily Mailman events"; + startAt = "daily"; + restartTriggers = [ config.environment.etc."mailman.cfg".source ]; + serviceConfig = { + ExecStart = "${pythonEnv}/bin/mailman digests --send"; + User = "mailman"; + Group = "mailman"; + }; }; - }; - systemd.services.hyperkitty-minutely = { - inherit (cfg.hyperkitty) enable; - description = "Trigger minutely Hyperkitty events"; - startAt = "minutely"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs minutely"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; + hyperkitty = lib.mkIf cfg.hyperkitty.enable { + description = "GNU Hyperkitty QCluster Process"; + after = [ "network.target" ]; + restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; + wantedBy = [ "mailman.service" "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pythonEnv}/bin/mailman-web qcluster"; + User = cfg.webUser; + Group = "mailman"; + WorkingDirectory = "/var/lib/mailman-web"; + }; }; - }; - - systemd.services.hyperkitty-quarter-hourly = { - inherit (cfg.hyperkitty) enable; - description = "Trigger quarter-hourly Hyperkitty events"; - startAt = "*:00/15"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs quarter_hourly"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; - }; - }; - - systemd.services.hyperkitty-hourly = { - inherit (cfg.hyperkitty) enable; - description = "Trigger hourly Hyperkitty events"; - startAt = "hourly"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs hourly"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; - }; - }; - - systemd.services.hyperkitty-daily = { - inherit (cfg.hyperkitty) enable; - description = "Trigger daily Hyperkitty events"; - startAt = "daily"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs daily"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; - }; - }; - - systemd.services.hyperkitty-weekly = { - inherit (cfg.hyperkitty) enable; - description = "Trigger weekly Hyperkitty events"; - startAt = "weekly"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs weekly"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; - }; - }; - - systemd.services.hyperkitty-yearly = { - inherit (cfg.hyperkitty) enable; - description = "Trigger yearly Hyperkitty events"; - startAt = "yearly"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs yearly"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; - }; - }; - + } // flip lib.mapAttrs' { + "minutely" = "minutely"; + "quarter_hourly" = "*:00/15"; + "hourly" = "hourly"; + "daily" = "daily"; + "weekly" = "weekly"; + "yearly" = "yearly"; + } (name: startAt: + lib.nameValuePair "hyperkitty-${name}" (lib.mkIf cfg.hyperkitty.enable { + description = "Trigger ${name} Hyperkitty events"; + inherit startAt; + restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; + serviceConfig = { + ExecStart = "${pythonEnv}/bin/mailman-web runjobs minutely"; + User = cfg.webUser; + Group = "mailman"; + WorkingDirectory = "/var/lib/mailman-web"; + }; + })); }; } From 32c556b039c6d262cd2ccedcb4fb92c2c08e89dc Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 27 Apr 2020 18:03:44 +0200 Subject: [PATCH 64/79] nixos/mailman: document, add maintainers --- nixos/modules/services/mail/mailman.nix | 5 +++ nixos/modules/services/mail/mailman.xml | 59 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 nixos/modules/services/mail/mailman.xml diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 4167b2ca85f1..69ae4263b61c 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -414,4 +414,9 @@ in { })); }; + meta = { + maintainers = with lib.maintainers; [ lheckemann ]; + doc = ./mailman.xml; + }; + } diff --git a/nixos/modules/services/mail/mailman.xml b/nixos/modules/services/mail/mailman.xml new file mode 100644 index 000000000000..cbe50ed0b917 --- /dev/null +++ b/nixos/modules/services/mail/mailman.xml @@ -0,0 +1,59 @@ + + Mailman + + Mailman is free + software for managing electronic mail discussion and e-newsletter + lists. Mailman and its web interface can be configured using the + corresponding NixOS module. Note that this service is best used with + an existing, securely configured Postfix setup, as it does not automatically configure this. + + +
+ Basic usage + + For a basic configuration, the following settings are suggested: + { config, ... }: { + services.postfix = { + enable = true; + relayDomains = ["hash:/var/lib/mailman/data/postfix_domains"]; + sslCert = config.security.acme.certs."lists.example.org".directory + "/full.pem"; + sslKey = config.security.acme.certs."lists.example.org".directory + "/key.pem"; + config = { + transport_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; + local_recipient_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; + }; + }; + services.mailman = { + enable = true; + serve.enable = true; + hyperkitty.enable = true; + webHosts = ["lists.example.org"]; + siteOwner = "mailman@example.org"; + }; + services.nginx.virtualHosts."lists.example.org".enableACME = true; + networking.firewall.allowedTCPPorts = [ 25 80 443 ]; +} + + + DNS records will also be required: + + AAAA and A records pointing to the host in question, in order for browsers to be able to discover the address of the web server; + An MX record pointing to a domain name at which the host is reachable, in order for other mail servers to be able to deliver emails to the mailing lists it hosts. + + + + After this has been done and appropriate DNS records have been + set up, the Postorius mailing list manager and the Hyperkitty + archive browser will be available at + https://lists.example.org/. Note that this setup is not + sufficient to deliver emails to most email providers nor to + avoid spam -- a number of additional measures for authenticating + incoming and outgoing mails, such as SPF, DMARC and DKIM are + necessary, but outside the scope of the Mailman module. + +
+ From 1b8af3e1ae75df048fbdfb3acf6842f13de3e38f Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 30 Apr 2020 08:18:52 +0200 Subject: [PATCH 65/79] nixos/mailman: fix clearing static files --- nixos/modules/services/mail/mailman.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 69ae4263b61c..7f9a7cc072ee 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -334,7 +334,7 @@ in { requiredBy = [ "mailman-uwsgi.service" ]; restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; script = '' - find "${settings.STATIC_ROOT}/" -mindepth 1 -delete + [[ -e "${settings.STATIC_ROOT}" ]] && find "${settings.STATIC_ROOT}/" -mindepth 1 -delete ${pythonEnv}/bin/mailman-web migrate ${pythonEnv}/bin/mailman-web collectstatic ${pythonEnv}/bin/mailman-web compress From 3dbbc786f51eb3f74fc75b1d179b3c447e315ecc Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 22 May 2020 16:52:10 +0200 Subject: [PATCH 66/79] nixos/mailman: RFC42-ise --- nixos/modules/services/mail/mailman.nix | 67 ++++++++++++++----------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 7f9a7cc072ee..a604f32b3371 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -13,7 +13,7 @@ let # This deliberately doesn't use recursiveUpdate so users can # override the defaults. - settings = { + webSettings = { DEFAULT_FROM_EMAIL = cfg.siteOwner; SERVER_EMAIL = cfg.siteOwner; ALLOWED_HOSTS = [ "localhost" "127.0.0.1" ] ++ cfg.webHosts; @@ -31,7 +31,7 @@ let }; } // cfg.webSettings; - settingsJSON = pkgs.writeText "settings.json" (builtins.toJSON settings); + webSettingsJSON = pkgs.writeText "settings.json" (builtins.toJSON webSettings); # TODO: Should this be RFC42-ised so that users can set additional options without modifying the module? mtaConfig = pkgs.writeText "mailman-postfix.cfg" '' @@ -40,31 +40,7 @@ let transport_file_type: hash ''; - mailmanCfg = '' - [mailman] - site_owner: ${cfg.siteOwner} - layout: fhs - - [paths.fhs] - bin_dir: ${pkgs.python3Packages.mailman}/bin - var_dir: /var/lib/mailman - queue_dir: $var_dir/queue - template_dir: $var_dir/templates - log_dir: /var/log/mailman - lock_dir: $var_dir/lock - etc_dir: /etc - ext_dir: $etc_dir/mailman.d - pid_file: /run/mailman/master.pid - - [mta] - configuration: ${mtaConfig} - '' + optionalString cfg.hyperkitty.enable '' - - [archiver.hyperkitty] - class: mailman_hyperkitty.Archiver - enable: yes - configuration: /var/lib/mailman/mailman-hyperkitty.cfg - ''; + mailmanCfg = lib.generators.toINI {} cfg.settings; mailmanHyperkittyCfg = pkgs.writeText "mailman-hyperkitty.cfg" '' [general] @@ -160,6 +136,12 @@ in { default = []; }; + settings = mkOption { + description = "Settings for mailman.cfg"; + type = types.attrsOf (types.attrsOf types.str); + default = {}; + }; + hyperkitty = { enable = mkEnableOption "the Hyperkitty archiver for Mailman"; @@ -180,6 +162,31 @@ in { config = mkIf cfg.enable { + services.mailman.settings = { + mailman.site_owner = lib.mkDefault cfg.siteOwner; + mailman.layout = "fhs"; + + "paths.fhs" = { + bin_dir = "${pkgs.python3Packages.mailman}/bin"; + var_dir = "/var/lib/mailman"; + queue_dir = "$var_dir/queue"; + template_dir = "$var_dir/templates"; + log_dir = "/var/log/mailman"; + lock_dir = "$var_dir/lock"; + etc_dir = "/etc"; + ext_dir = "$etc_dir/mailman.d"; + pid_file = "/run/mailman/master.pid"; + }; + + mta.configuration = lib.mkDefault "${mtaConfig}"; + + "archiver.hyperkitty" = lib.mkIf cfg.hyperkitty.enable { + class = "mailman_hyperkitty.Archiver"; + enable = "yes"; + configuration = "/var/lib/mailman/mailman-hyperkitty.cfg"; + }; + }; + assertions = let inherit (config.services) postfix; @@ -230,7 +237,7 @@ in { import json - with open('${settingsJSON}') as f: + with open('${webSettingsJSON}') as f: globals().update(json.load(f)) with open('/var/lib/mailman-web/settings_local.json') as f: @@ -243,7 +250,7 @@ in { serverAliases = cfg.webHosts; locations = { "/".extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;"; - "/static/".alias = settings.STATIC_ROOT + "/"; + "/static/".alias = webSettings.STATIC_ROOT + "/"; }; }; }; @@ -334,7 +341,7 @@ in { requiredBy = [ "mailman-uwsgi.service" ]; restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; script = '' - [[ -e "${settings.STATIC_ROOT}" ]] && find "${settings.STATIC_ROOT}/" -mindepth 1 -delete + [[ -e "${webSettings.STATIC_ROOT}" ]] && find "${webSettings.STATIC_ROOT}/" -mindepth 1 -delete ${pythonEnv}/bin/mailman-web migrate ${pythonEnv}/bin/mailman-web collectstatic ${pythonEnv}/bin/mailman-web compress From 176bc68a699ad62156c6d727babe07fe0fe1294d Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 22 May 2020 14:12:43 +0200 Subject: [PATCH 67/79] mailman: log to journal --- nixos/modules/services/mail/mailman.nix | 6 +++++- pkgs/servers/mail/mailman/default.nix | 16 ++++++++++++++-- pkgs/servers/mail/mailman/log-stderr.patch | 13 +++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 pkgs/servers/mail/mailman/log-stderr.patch diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index a604f32b3371..3744214ca49f 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -185,7 +185,11 @@ in { enable = "yes"; configuration = "/var/lib/mailman/mailman-hyperkitty.cfg"; }; - }; + } // (let + loggerNames = ["root" "archiver" "bounce" "config" "database" "debug" "error" "fromusenet" "http" "locks" "mischief" "plugins" "runner" "smtp"]; + loggerSectionNames = map (n: "logging.${n}") loggerNames; + in lib.genAttrs loggerSectionNames(name: { handler = "stderr"; }) + ); assertions = let inherit (config.services) postfix; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 37b4d29eeb16..879fd19adb0a 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, alembic, aiosmtpd, dnspython +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources , zope_component, lynx, postfix, authheaders, gunicorn @@ -20,7 +20,19 @@ buildPythonPackage rec { zope_component authheaders gunicorn ]; - patchPhase = '' + patches = [ + (fetchpatch { + url = https://gitlab.com/mailman/mailman/-/commit/4b206e2a5267a0e17f345fd7b2d957122ba57566.patch; + sha256 = "06axmrn74p81wvcki36c7gfj5fp5q15zxz2yl3lrvijic7hbs4n2"; + }) + (fetchpatch { + url = https://gitlab.com/mailman/mailman/-/commit/9613154f3c04fa2383fbf017031ef263c291418d.patch; + sha256 = "0vyw87s857vfxbf7kihwb6w094xyxmxbi1bpdqi3ybjamjycp55r"; + }) + ./log-stderr.patch + ]; + + postPatch = '' substituteInPlace src/mailman/config/postfix.cfg \ --replace /usr/sbin/postmap ${postfix}/bin/postmap substituteInPlace src/mailman/config/schema.cfg \ diff --git a/pkgs/servers/mail/mailman/log-stderr.patch b/pkgs/servers/mail/mailman/log-stderr.patch new file mode 100644 index 000000000000..2edbe1f18313 --- /dev/null +++ b/pkgs/servers/mail/mailman/log-stderr.patch @@ -0,0 +1,13 @@ +diff --git a/src/mailman/core/logging.py b/src/mailman/core/logging.py +index f8f87279f..7ff13b003 100644 +--- a/src/mailman/core/logging.py ++++ b/src/mailman/core/logging.py +@@ -142,6 +142,8 @@ def _init_logger(propagate, sub_name, log, logger_config): + address, facility = _get_syslog_params(logger_config) + handler = logging.handlers.SysLogHandler( + address=address, facility=facility) ++ elif logger_config.handler == 'stderr': ++ handler = logging.StreamHandler(sys.stderr) + else: + path_str = logger_config.path + path_abs = os.path.normpath(os.path.join(config.LOG_DIR, path_str)) From d5cc8fb892da85550375bc533e0db5470dd34396 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 26 May 2020 10:36:01 +0200 Subject: [PATCH 68/79] nixos/mailman: fix search index location --- nixos/modules/services/mail/mailman.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 3744214ca49f..5c61cfbebf6c 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -29,6 +29,10 @@ let level = "INFO"; }; }; + HAYSTACK_CONNECTIONS.default = { + ENGINE = "haystack.backends.whoosh_backend.WhooshEngine"; + PATH = "/var/lib/mailman-web/fulltext-index"; + }; } // cfg.webSettings; webSettingsJSON = pkgs.writeText "settings.json" (builtins.toJSON webSettings); From b713e97c304f3cdb567b62f90fd6c794da01bf47 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 18 Jun 2020 17:45:35 +0200 Subject: [PATCH 69/79] tdesktop: 2.1.11 -> 2.1.12 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index d4493355951f..eacd5ece8b88 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.1.11"; + version = "2.1.12"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1sd6nrcjg5gpq6ynvwnz8f4jz8flknybx6b0pfxqrqqpzy7wjl5m"; + sha256 = "1b9kgib9dxjcfnw2zdbqd12ikcswkl35nwy9m47x5jvy3glxg6m8"; }; postPatch = '' From 5b3eac040b090f756885bb95733aca0ce98a3c80 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 18 Jun 2020 19:49:27 +0300 Subject: [PATCH 70/79] openmw-tes3mp: fix build after #80624 (#91045) --- pkgs/games/openmw/tes3mp.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 59bdc6901078..df332c0e5bf3 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper }: +{ stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper, mygui }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy @@ -28,6 +28,17 @@ let rev = "24aae91d9ddad38cdb3b0e0a13af59f142803e94"; sha256 = "1rfmxxr9ircfagdpbdrzl26msdhx1i3g974cblbv69078cradfh3"; }; + # https://github.com/TES3MP/openmw-tes3mp/issues/555 + mygui_ = mygui.overrideAttrs (oldAttrs: rec { + version = "3.2.2"; + + src = fetchFromGitHub { + owner = "MyGUI"; + repo = "mygui"; + rev = "MyGUI${version}"; + sha256 = "1wk7jmwm55rhlqqcyvqsxdmwvl70bysl9azh4kd9n57qlmgk3zmw"; + }; + }); in openmw.overrideAttrs (oldAttrs: rec { version = "2019-11-19"; name = "openmw-tes3mp-${version}"; @@ -41,7 +52,7 @@ in openmw.overrideAttrs (oldAttrs: rec { }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; - buildInputs = oldAttrs.buildInputs ++ [ luajit ]; + buildInputs = [ luajit mygui_ ] ++ oldAttrs.buildInputs; cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DBUILD_OPENCS=OFF" @@ -50,7 +61,7 @@ in openmw.overrideAttrs (oldAttrs: rec { "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" ]; - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95175 + # https://github.com/TES3MP/openmw-tes3mp/issues/552 patches = [ ./tes3mp.patch ]; From 9f2d920c35a5e00eae8db302dd16c64075af255d Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 18 Jun 2020 19:07:13 +0200 Subject: [PATCH 71/79] mudlet: 4.3 -> 4.9.1 --- pkgs/games/mudlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 75d16586a39f..b73af4515d3c 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -6,14 +6,14 @@ let in stdenv.mkDerivation rec { pname = "mudlet"; - version = "4.3"; + version = "4.9.1"; src = fetchFromGitHub { owner = "Mudlet"; repo = "Mudlet"; rev = "Mudlet-${version}"; fetchSubmodules = true; - sha256 = "0qqdmivfwf9jmv5yx90z1fj99nlhnq762lfw6bcxgv74y4l4b4c0"; + sha256 = "0i022qcmlq4xwl2yh4xd5qdc0ag52605qmqqz6bim0h8f3dp8cx1"; }; nativeBuildInputs = [ cmake wrapQtAppsHook git qttools which ]; From 69199b0b210343be5273dbb7186ab6d109c096fe Mon Sep 17 00:00:00 2001 From: Raimon Grau Date: Thu, 18 Jun 2020 21:12:13 +0100 Subject: [PATCH 72/79] oil: 0.8.pre4 -> 0.8.pre6 --- pkgs/shells/oil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 019a66c77eb7..bce76b4cc825 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.pre4"; + version = "0.8.pre6"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "07kj86hrvlz9f1gh3qv4hdaz3qnb4a2qf0dnxhd2r0qilrkjanxh"; + sha256 = "1gbc74in78lbkciz7wzjplrm185wn6fz57n66xmazayivqmpvgfm"; }; postPatch = '' From df3a188b466b812065314694202f55d336681e03 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 18 Jun 2020 12:50:22 -0400 Subject: [PATCH 73/79] root5: 5.34.36 -> 5.34.38 Fixes: https://nvd.nist.gov/vuln/detail/CVE-2017-1000203 --- pkgs/applications/science/misc/root/5.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index fd06d721ebd1..58cc8f8f59ef 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lzma, gsl_1 +, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl_1, xxHash , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { pname = "root"; - version = "5.34.36"; + version = "5.34.38"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "1kbx1jxc0i5xfghpybk8927a0wamxyayij9c74zlqm0595gqx1pw"; + sha256 = "1ln448lszw4d6jmbdphkr2plwxxlhmjkla48vmmq750xc1lxlfrc"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl_1 ] + buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -20,12 +20,6 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers_root5.patch - (fetchpatch { - name = "enable_new_gcc.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/enable_new_gcc.patch?h=root5&id=91c50876081a0af36f84ec4f0f9dba869107fa4f"; - sha256 = "1rnp0xlw0yqi7mjs4w145njd79i8kkir1qik7zwicdik9axf8ygm"; - }) - # prevents rootcint from looking in /usr/includes and such ./purify_include_paths_root5.patch From 78453e6ba67a547ce9f0be9d96cd1c27790460d0 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 18 Jun 2020 23:12:18 +0200 Subject: [PATCH 74/79] nixos/fontconfig: Move deprecated ultimate removals to relevant module This was a mistake in https://github.com/NixOS/nixpkgs/pull/61570, this does not belong to prometheus --- nixos/modules/config/fonts/fontconfig.nix | 9 ++++++++- .../modules/services/monitoring/prometheus/exporters.nix | 9 --------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 6ac64b0ec9c6..ac2a024eaa89 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -278,7 +278,14 @@ in (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") - ]; + ] ++ lib.forEach [ "enable" "substitutions" "preset" ] + (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] '' + The fonts.fontconfig.ultimate module and configuration is obsolete. + The repository has since been archived and activity has ceased. + https://github.com/bohoomil/fontconfig-ultimate/issues/171. + No action should be needed for font configuration, as the fonts.fontconfig + module is already used by default. + ''); options = { diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index f9ad1457fc85..c584fcc89454 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -168,15 +168,6 @@ in (opt: lib.mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] '' The prometheus exporters are now configured using `services.prometheus.exporters'. See the 18.03 release notes for more information. - '' )) - - ++ (lib.forEach [ "enable" "substitutions" "preset" ] - (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] '' - The fonts.fontconfig.ultimate module and configuration is obsolete. - The repository has since been archived and activity has ceased. - https://github.com/bohoomil/fontconfig-ultimate/issues/171. - No action should be needed for font configuration, as the fonts.fontconfig - module is already used by default. '' )); options.services.prometheus.exporters = mkOption { From 1c9e02b9116836f1f070e64b5fbf1a089e812af3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 19 Jun 2020 00:02:51 +0200 Subject: [PATCH 75/79] nixos/systemd: allow str in systemd.services..path Turns out, #75510 was too restrictive. We also need to allow str here, as some modules set this to "/run/wrappers" to bring `/run/wrappers/bin` into $PATH of a unit. --- nixos/modules/system/boot/systemd-unit-options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 62398f27d088..c6dbb96951ae 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -233,7 +233,7 @@ in rec { path = mkOption { default = []; - type = with types; listOf package; + type = with types; listOf (oneOf [ package str ]); apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}"; description = '' Packages added to the service's PATH From 508a1322200c92db25423e4dd10a8649691a2b83 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 19 Jun 2020 00:18:40 +0200 Subject: [PATCH 76/79] =?UTF-8?q?rpm-ostree:=202020.1=20=E2=86=92=202020.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/coreos/rpm-ostree/releases/tag/v2020.2 --- pkgs/tools/misc/rpm-ostree/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 41e59162905a..e04d37ba3c6b 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -32,7 +32,7 @@ , python , json_c , zchunk -, libmodulemd_1 +, libmodulemd , utillinux , sqlite , cppunit @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2020.1"; + version = "2020.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1xgfppq4fqqvg3cs327bckjpiz6rrn3bbbhg3q5p4j2bzsq89xiz"; + sha256 = "nuEBEVFqr9J+Nf98GZkvNNYOtpMUjKzYrzCc1T2cR3A="; }; nativeBuildInputs = [ @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { # required by vendored libdnf json_c zchunk - libmodulemd_1 + libmodulemd utillinux # for smartcols.pc sqlite cppunit From 6f22db6df12ccf0c04e7245f817f9d94404bbb34 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 19 Jun 2020 00:24:08 +0200 Subject: [PATCH 77/79] libmodulemd_1: drop rpm-ostree now uses 2.0 --- pkgs/development/libraries/libmodulemd/1.nix | 21 -------------- .../libmodulemd/dont-check-docs.patch | 29 ------------------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 51 deletions(-) delete mode 100644 pkgs/development/libraries/libmodulemd/1.nix delete mode 100644 pkgs/development/libraries/libmodulemd/dont-check-docs.patch diff --git a/pkgs/development/libraries/libmodulemd/1.nix b/pkgs/development/libraries/libmodulemd/1.nix deleted file mode 100644 index 174296375e08..000000000000 --- a/pkgs/development/libraries/libmodulemd/1.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ libmodulemd, fetchurl }: - -libmodulemd.overrideAttrs(old: rec { - name = "libmodulemd-${version}"; - version = "1.8.15"; - - # Removes py output since there's no overrides here - outputs = [ "out" "devdoc" ]; - - patches = [ - # Checks for glib docs in glib's prefix - # but they're installed to another - ./dont-check-docs.patch - ]; - - src = fetchurl { - url = "https://github.com/fedora-modularity/libmodulemd/releases/download/${name}/modulemd-${version}.tar.xz"; - sha256 = "0gz8p3qzji3cx0r57sy3gn4dhigg4k7pcxj3lmjcjn13vxh5rm7z"; - }; - -}) diff --git a/pkgs/development/libraries/libmodulemd/dont-check-docs.patch b/pkgs/development/libraries/libmodulemd/dont-check-docs.patch deleted file mode 100644 index 38ad5683692b..000000000000 --- a/pkgs/development/libraries/libmodulemd/dont-check-docs.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/meson.build b/meson.build -index 155c9e7..9125372 100644 ---- a/meson.build -+++ b/meson.build -@@ -60,15 +60,15 @@ sh = find_program('sh') - sed = find_program('sed') - test = find_program('test') - --ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) --if ret.returncode() != 0 -- error('Missing documentation for GLib.') --endif -- --ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) --if ret.returncode() != 0 -- error('Missing documentation for GObject.') --endif -+# ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) -+# if ret.returncode() != 0 -+# error('Missing documentation for GLib.') -+# endif -+ -+# ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) -+# if ret.returncode() != 0 -+# error('Missing documentation for GObject.') -+# endif - - python_name = get_option('python_name') - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f240b65393aa..894ee71ae50a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13587,7 +13587,6 @@ in libvdpau = callPackage ../development/libraries/libvdpau { }; libmodulemd = callPackage ../development/libraries/libmodulemd { }; - libmodulemd_1 = callPackage ../development/libraries/libmodulemd/1.nix { }; libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; From 1d4dc149dfabecfcf660d0c8bf4e40544849331b Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Thu, 18 Jun 2020 19:49:00 -0400 Subject: [PATCH 78/79] nixos/systemd-boot: fix incorrect string formatting Currently, this always writes "default nixos-generation-%d.conf" without replacing the "%d" in the string. Python .format() is not equivalent to "%" --- .../system/boot/loader/systemd-boot/systemd-boot-builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index d8baed65c6df..97e824fe629c 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -47,9 +47,9 @@ def write_loader_conf(profile, generation): if "@timeout@" != "": f.write("timeout @timeout@\n") if profile: - f.write("default nixos-%s-generation-%d.conf\n".format(profile, generation)) + f.write("default nixos-%s-generation-%d.conf\n" % (profile, generation)) else: - f.write("default nixos-generation-%d.conf\n".format(generation)) + f.write("default nixos-generation-%d.conf\n" % (generation)) if not @editor@: f.write("editor 0\n"); f.write("console-mode @consoleMode@\n"); From be22631154c9b92400472713092fb8b3cc722efb Mon Sep 17 00:00:00 2001 From: Paul Myjavec Date: Fri, 19 Jun 2020 14:30:34 +0900 Subject: [PATCH 79/79] circleci-cli: 0.1.7971 -> 0.1.8302 (#91013) --- pkgs/development/tools/misc/circleci-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 8c87e1642df3..5b641a3ec5c0 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.7971"; + version = "0.1.8302"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0nrmdql3h9jnfgmp8898c9v07f5h5r9dvabaqhk98r6a77g3rr98"; + sha256 = "1rq1x6893n4siljn2jizrnz8b8qlic1y087gikh5p5140zpcbhnx"; }; vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; @@ -34,4 +34,4 @@ buildGoModule rec { license = licenses.mit; homepage = "https://circleci.com/"; }; -} \ No newline at end of file +}